Merge pull request #161 from iocanel/misc

Step namespace should have priority over anything else.

Author: carlossg

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java

@@ -109,6 +109,7 @@ public PodTemplate(PodTemplate from) {
         this.setInstanceCap(from.getInstanceCap());
         this.setLabel(from.getLabel());
         this.setName(from.getName());
+        this.setNamespace(from.getNamespace());
         this.setInheritFrom(from.getInheritFrom());
         this.setNodeSelector(from.getNodeSelector());
         this.setServiceAccount(from.getServiceAccount());

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateStepExecution.java

@@ -84,10 +84,10 @@ public void stop(Throwable cause) throws Exception {
 
     private String checkNamespace(KubernetesCloud kubernetesCloud, NamespaceAction namespaceAction) {
         String namespace = null;
-        if (!Strings.isNullOrEmpty(namespaceAction.getNamespace())) {
-            namespace = namespaceAction.getNamespace();
-        } else if (!Strings.isNullOrEmpty(step.getNamespace())) {
+        if (!Strings.isNullOrEmpty(step.getNamespace())) {
             namespace = step.getNamespace();
+        } else if (!Strings.isNullOrEmpty(namespaceAction.getNamespace())) {
+            namespace = namespaceAction.getNamespace();
         } else if (!Strings.isNullOrEmpty(kubernetesCloud.getNamespace())) {
             namespace = kubernetesCloud.getNamespace();
         } else {

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java

@@ -204,6 +204,28 @@ public void runWithOverriddenNamespace() throws Exception {
         r.assertLogContains(overriddenNamespace, b);
     }
 
+    @Test
+    public void runWithOverriddenNamespace2() throws Exception {
+        configureCloud(r);
+        String overriddenNamespace = "kubernetes-plugin-overridden-namespace";
+        KubernetesClient client = cloud.connect();
+        // Run in our own testing namespace
+        client.namespaces().createOrReplace(
+                new NamespaceBuilder().withNewMetadata().withName("testns2").endMetadata()
+                        .build());
+
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "job with dir");
+        p.setDefinition(new CpsFlowDefinition(loadPipelineScript("runWithOverriddenNamespace2.groovy"), true));
+
+        WorkflowRun b = p.scheduleBuild2(0).waitForStart();
+        NamespaceAction namespaceAction = new NamespaceAction(b);
+        namespaceAction.push(overriddenNamespace);
+
+        assertNotNull(b);
+        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        r.assertLogContains("testns2", b);
+    }
+
     // @Test
     public void runInPodWithRestart() throws Exception {
         story.addStep(new Statement() {

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/runWithOverriddenNamespace2.groovy

@@ -0,0 +1,10 @@
+podTemplate(cloud: 'minikube', namespace: 'testns2', label: 'mypod', volumes: [emptyDirVolume(mountPath: '/my-mount')], containers: [
+        containerTemplate(name: 'jnlp', image: 'jenkinsci/jnlp-slave:2.62-alpine', args: '${computer.jnlpmac} ${computer.name}')
+]) {
+
+    node ('mypod') {
+        container(name: 'jnlp') {
+            sh "cat /var/run/secrets/kubernetes.io/serviceaccount/namespace"
+        }
+    }
+}