Merge pull request #1018 from Inform-Software/use-jdk11-image

Use jdk11 agent when Jenkins is running on jdk11
jenkinsci · Aug 23, 2021 · f70e44e · f70e44e
2 parents 8742870 + 502f3cc
commit f70e44e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java
@@ -71,7 +71,7 @@
 import io.fabric8.kubernetes.api.model.VolumeMount;
 import io.fabric8.kubernetes.api.model.VolumeMountBuilder;
 import io.fabric8.kubernetes.client.utils.Serialization;
-
+import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import jenkins.model.Jenkins;
 
 import javax.annotation.CheckForNull;
@@ -103,7 +103,7 @@ public class PodTemplateBuilder {
             .getProperty(PodTemplateStepExecution.class.getName() + ".dockerRegistryPrefix");
     @Restricted(NoExternalUse.class)
     static final String DEFAULT_JNLP_IMAGE = System
-            .getProperty(PodTemplateStepExecution.class.getName() + ".defaultImage", "jenkins/inbound-agent:4.3-4");
+            .getProperty(PodTemplateStepExecution.class.getName() + ".defaultImage", getDefaultImageName());
 
     static final String DEFAULT_JNLP_CONTAINER_MEMORY_REQUEST = System
             .getProperty(PodTemplateStepExecution.class.getName() + ".defaultContainer.defaultMemoryRequest", "256Mi");
@@ -137,6 +137,15 @@ public PodTemplateBuilder(PodTemplate template, KubernetesSlave agent) {
         this.cloud = agent.getKubernetesCloud();
     }
 
+    private static String getDefaultImageName() {
+      // TODO: Reverse logic after inbound-agent:4.9-1
+      String name = "jenkins/inbound-agent:4.3-4";
+      if (JavaSpecificationVersion.forCurrentJVM().isNewerThanOrEqualTo(JavaSpecificationVersion.JAVA_11)) {
+        name = name + "-jdk11";
+      }
+      return name;
+    }
+
     public PodTemplateBuilder withSlave(@Nonnull KubernetesSlave slave) {
         this.agent = slave;
         this.cloud = slave.getKubernetesCloud();