Merge pull request #1475 from Vlatombe/JENKINS-70217

[JENKINS-70217] Default ContainerTemplate command and arg to empty string when using casc.
jenkinsci · Nov 24, 2023 · 7b3f77f · 7b3f77f
2 parents ad406fb + 30a6feb
commit 7b3f77f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java
@@ -46,9 +46,9 @@ public class ContainerTemplate extends AbstractDescribableImpl<ContainerTemplate
 
     private String workingDir;
 
-    private String command;
+    private String command = "";
 
-    private String args;
+    private String args = "";
 
     private boolean ttyEnabled;
 

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/casc/CasCTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/casc/CasCTest.java
@@ -64,7 +64,7 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule r, String confi
         assertThat(podTemplate.getYamlMergeStrategy(), isA(Merge.class));
         List<ContainerTemplate> containers = podTemplate.getContainers();
         assertNotNull(containers);
-        assertEquals(1, containers.size());
+        assertEquals(2, containers.size());
         ContainerTemplate container = containers.get(0);
         assertEquals("cat", container.getArgs());
         assertEquals("/bin/sh -c", container.getCommand());
@@ -78,6 +78,9 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule r, String confi
         assertEquals("maven",container.getName());
         assertTrue(container.isTtyEnabled());
         assertEquals("/src", container.getWorkingDir());
+        var containerTemplate = containers.get(1);
+        assertEquals("", containerTemplate.getCommand());
+        assertEquals("", containerTemplate.getArgs());
 
     }
 

diff --git a/src/test/resources/org/csanchez/jenkins/plugins/kubernetes/casc/configuration-as-code.yaml b/src/test/resources/org/csanchez/jenkins/plugins/kubernetes/casc/configuration-as-code.yaml
@@ -36,6 +36,8 @@ jenkins:
                 name: "maven"
                 ttyEnabled: true
                 workingDir: "/src"
+              - name: "maven-with-default-entrypoint"
+                image: "maven:3.6.3-jdk-8"
             hostNetwork: false
             label: "test"
             name: "test"