ocp build/logs permission

remove unused comments, add improve OpenshiftBuildServiceIntegrationTest tests

Signed-off-by: Oleksandr Krutko <[email protected]>

revert to initial version of file quickstarts/maven/spring-boot/pom.xml

Signed-off-by: Oleksandr Krutko <[email protected]>

Author: arsenalzp

jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/openshift/OpenshiftBuildService.java

@@ -466,7 +466,7 @@ private void waitForOpenShiftBuildToComplete(OpenShiftClient client, Build build
         // Don't query for logs directly, Watch over the build pod:
         waitUntilPodIsReady(buildName + "-build", 120, log);
         log.info("Waiting for build " + buildName + " to complete...");
-        try (LogWatch logWatch = client.pods().inNamespace(applicableOpenShiftNamespace).withName(buildName + "-build").watchLog()) {
+        try (LogWatch logWatch = client.builds().inNamespace(applicableOpenShiftNamespace).withName(buildName).watchLog()) {  
             KubernetesHelper.printLogsAsync(logWatch, line -> log.info("[[s]]%s", line))
               .whenComplete((v, t) -> {
                   if (t != null) {

jkube-kit/config/service/src/test/java/org/eclipse/jkube/kit/config/service/openshift/OpenshiftBuildServiceIntegrationTest.java

@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Properties;
 
 import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
@@ -47,6 +48,7 @@
 import org.eclipse.jkube.kit.config.service.BuildServiceConfig;
 import org.eclipse.jkube.kit.config.service.JKubeServiceException;
 import org.eclipse.jkube.kit.config.service.JKubeServiceHub;
+import org.eclipse.jkube.kit.config.resource.MetaDataConfig;
 
 import com.google.common.collect.ImmutableMap;
 import io.fabric8.kubernetes.api.model.KubernetesList;
@@ -109,6 +111,10 @@ class OpenshiftBuildServiceIntegrationTest {
   private BuildServiceConfig.BuildServiceConfigBuilder dockerImageConfig;
 
   private ResourceConfig resourceConfig;
+  
+  private MetaDataConfig labels;
+  
+  private Properties props;
 
   @BeforeEach
   void init(@TempDir Path temporaryFolder) throws Exception {
@@ -126,8 +132,12 @@ void init(@TempDir Path temporaryFolder) throws Exception {
     jKubeBuildTarArchiver = mockConstruction(JKubeBuildTarArchiver.class, (mock, ctx) ->
         when(mock.createArchive(any(File.class), any(BuildDirs.class), eq(ArchiveCompression.none)))
         .thenReturn(emptyDockerBuildTar));
-
-    resourceConfig = ResourceConfig.builder().namespace("ns1").build();
+    
+    props = new Properties();
+    props.setProperty("buildName", projectName);
+    
+    labels = MetaDataConfig.builder().all(props).pod(props).build();
+    resourceConfig = ResourceConfig.builder().namespace("ns1").labels(labels).build();
 
     jKubeServiceHub = mock(JKubeServiceHub.class, RETURNS_DEEP_STUBS);
     when(jKubeServiceHub.getClient()).thenReturn(client);
@@ -552,6 +562,7 @@ private WebServerEventCollector prepareMockServer(
         .build();
 
     if (!buildConfigExists) {
+      mockServer.expect().get().withPath("/api/v1/namespaces/ns1/pods?labelSelector=openshift.io%2Fbuild.name").andReply(collector.record("build-config-check").andReturn(200, bc)).always();
       mockServer.expect().get().withPath("/apis/build.openshift.io/v1/namespaces/ns1/buildconfigs/" + resourceName + s2iBuildNameSuffix).andReply(collector.record("build-config-check").andReturn
           (404, "")).once();
       mockServer.expect().get().withPath("/apis/build.openshift.io/v1/namespaces/ns1/buildconfigs/" + resourceName + s2iBuildNameSuffix + "pullSecret").andReply(collector.record("build-config-check").andReturn
@@ -560,7 +571,7 @@ private WebServerEventCollector prepareMockServer(
       if (bcSecret != null) {
         mockServer.expect().post().withPath("/apis/build.openshift.io/v1/namespaces/ns1/buildconfigs").andReply(collector.record("new-build-config").andReturn(201, bcSecret)).once();
       }
-    } else {
+    } else {      
       mockServer.expect().patch().withPath("/apis/build.openshift.io/v1/namespaces/ns1/buildconfigs/" + resourceName + s2iBuildNameSuffix).andReply(collector.record("patch-build-config").andReturn
           (200, bc)).once();
       if (bcSecret != null) {
@@ -579,6 +590,7 @@ private WebServerEventCollector prepareMockServer(
     if (!imageStreamExists) {
       mockServer.expect().get().withPath("/apis/image.openshift.io/v1/namespaces/ns1/imagestreams/" + resourceName).andReturn(404, "").once();
     }
+    mockServer.expect().get().withPath("/api/v1/namespaces/ns1/pods?labelSelector=openshift.io%2Fbuild.name").andReply(collector.record("build-config-check").andReturn(200, bc)).always();
     mockServer.expect().get().withPath("/apis/image.openshift.io/v1/namespaces/ns1/imagestreams/" + resourceName).andReturn(200, imageStream).always();
 
     mockServer.expect().post().withPath("/apis/image.openshift.io/v1/namespaces/ns1/imagestreams").andReturn(201, imageStream).once();