Merge pull request #1275 from jglick/bumps

Author: Vlatombe

.github/dependabot.yml

@@ -5,12 +5,9 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: org.apache.commons:commons-lang3
-    versions:
-    - "> 3.8.1"
 - package-ecosystem: docker
   directory: '/src/main/resources/org/csanchez/jenkins/plugins/kubernetes'
+  # TODO https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore as needed to accept only *-jdk11
   schedule:
     interval: 'daily'
 - package-ecosystem: github-actions

README.md

@@ -151,7 +151,7 @@ Find more examples in the [examples dir](examples).
 The default jnlp agent image used can be customized by adding it to the template
 
 ```groovy
-containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:4.7-1', args: '${computer.jnlpmac} ${computer.name}'),
+containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent', args: '${computer.jnlpmac} ${computer.name}'),
 ```
 
 or with the yaml syntax. Pretty much any field from the [pod model](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/) can be specified through the yaml syntax.
@@ -162,7 +162,7 @@ kind: Pod
 spec:
   containers:
   - name: jnlp
-    image: 'jenkins/inbound-agent:4.7-1'
+    image: 'jenkins/inbound-agent'
     args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
 ```
 
@@ -911,24 +911,7 @@ However, if your Jenkins controller has HTTPS configured with self-signed certif
 To do that, you can extend the `jenkins/inbound-agent` image and add your certificate as follows:
 
 ```Dockerfile
-FROM jenkins/inbound-agent:jdk8
-
-USER root
-
-ADD cert.pem /tmp/cert.pem
-
-RUN keytool -noprompt -storepass changeit \
-  -keystore "$JAVA_HOME/jre/lib/security/cacerts" \
-  -import -file /tmp/cert.pem -alias jenkinsMaster && \
-  rm -f /tmp/cert.pem
-
-USER jenkins
-```
-
-Or, if you are using JDK 11:
-
-```Dockerfile
-FROM jenkins/inbound-agent:jdk11
+FROM jenkins/inbound-agent
 
 USER root
 

README_zh.md

@@ -76,7 +76,7 @@ podTemplate(label: label) {
 可以在模板中自定义 `jnlp` 节点镜像
 
 ```groovy
-containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent:4.3-4-alpine', args: '${computer.jnlpmac} ${computer.name}'),
+containerTemplate(name: 'jnlp', image: 'jenkins/inbound-agent', args: '${computer.jnlpmac} ${computer.name}'),
 ```
 
 或者使用 `yaml` 语法
@@ -87,7 +87,7 @@ kind: Pod
 spec:
   containers:
   - name: jnlp
-    image: 'jenkins/inbound-agent:4.3-4-alpine'
+    image: 'jenkins/inbound-agent'
     args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
 ```
 

examples/openshift-home-yaml.groovy

@@ -9,7 +9,7 @@ podTemplate(yaml:'''
               spec:
                 containers:
                 - name: jnlp
-                  image: jenkins/inbound-agent:4.7-1
+                  image: jenkins/inbound-agent
                   volumeMounts:
                   - name: home-volume
                     mountPath: /home/jenkins

kind.sh

@@ -4,18 +4,18 @@ set -euxo pipefail
 export PATH=$WSTMP:$PATH
 if [ \! -x $WSTMP/kind ]
 then
-    curl -Lo $WSTMP/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.11.1/kind-$(uname | tr '[:upper:]' '[:lower:]')-amd64
+    curl -sLo $WSTMP/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.17.0/kind-$(uname | tr '[:upper:]' '[:lower:]')-amd64
     chmod +x $WSTMP/kind
 fi
 if [ \! -x $WSTMP/kubectl ]
 then
-    curl -Lo $WSTMP/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.21.3/bin/$(uname | tr '[:upper:]' '[:lower:]')/amd64/kubectl
+    curl -sLo $WSTMP/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.25.4/bin/$(uname | tr '[:upper:]' '[:lower:]')/amd64/kubectl
     chmod +x $WSTMP/kubectl
 fi
 
 export cluster=ci$RANDOM
 export KUBECONFIG=$WSTMP/kubeconfig-$cluster
-kind create cluster --name $cluster --wait 5m --config kind.yaml
+kind create cluster --name $cluster --wait 5m
 function cleanup() {
     kind export logs --name $cluster $WSTMP/kindlogs || :
     kind delete cluster --name $cluster || :

kind.yaml

@@ -3,8 +3,8 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.51</version>
-    <relativePath />
+    <version>4.53</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.csanchez.jenkins.plugins</groupId>
@@ -45,7 +45,7 @@
     <connectorHost />
     <jenkins.host.address />
     <slaveAgentPort />
-    <jenkins.version>2.346.1</jenkins.version>
+    <jenkins.version>2.361.4</jenkins.version>
     <no-test-jar>false</no-test-jar>
     <useBeta>true</useBeta>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
@@ -104,7 +104,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-api</artifactId>
-      <version>1200.v8005c684b_a_c6</version> <!-- TODO until in BOM -->
     </dependency>
     <dependency> <!-- DeclarativeAgent -->
       <groupId>org.jenkinsci.plugins</groupId>
@@ -137,7 +136,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-durable-task-step</artifactId>
-      <version>1206.v8a_d5f86e336b</version> <!-- TODO until in BOM -->
     </dependency>
 
     <!-- for testing -->
@@ -225,7 +223,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>docker-workflow</artifactId>
-      <version>1.26</version>
+      <version>563.vd5d2e5c4007f</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -253,17 +251,11 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.346.x</artifactId>
-        <version>1643.v1cffef51df73</version>
+        <artifactId>bom-2.361.x</artifactId>
+        <version>1742.vb_70478c1b_25f</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <!-- Fix InjectedTest -->
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>docker-commons</artifactId>
-        <version>1.18</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

pom.xml

@@ -77,7 +77,6 @@
 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 static org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud.JNLP_NAME;
@@ -113,12 +112,7 @@ public class PodTemplateBuilder {
             String s = IOUtils.readFirstLine(dockerfileStream, StandardCharsets.UTF_8.toString());
             Matcher matcher = FROM_DIRECTIVE.matcher(s);
             if (matcher.matches()) {
-                String name = matcher.group(1);
-                if (JavaSpecificationVersion.forCurrentJVM().isNewerThanOrEqualTo(JavaSpecificationVersion.JAVA_11)) {
-                    defaultImageName = name + "-jdk11";
-                } else {
-                    defaultImageName = name + "-jdk8";
-                }
+                defaultImageName = matcher.group(1);
             } else {
                 throw new IllegalStateException("Dockerfile in plugin resources doesn't have the expected content");
             }

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

@@ -31,8 +31,6 @@
 import hudson.model.TaskListener;
 import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.SaveableListener;
-import hudson.security.ACL;
-import hudson.security.ACLContext;
 import hudson.slaves.ComputerListener;
 import hudson.slaves.EphemeralNode;
 import io.fabric8.kubernetes.api.model.ContainerStateTerminated;
@@ -59,6 +57,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
+import jenkins.util.Listeners;
 import jenkins.util.Timer;
 import org.csanchez.jenkins.plugins.kubernetes.KubernetesClientProvider;
 import org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud;
@@ -314,7 +313,7 @@ public void eventReceived(Action action, Pod pod) {
                 return;
             }
 
-            ExtensionList.lookup(Listener.class).forEach(listener -> { // TODO 2.324+ jenkins.util.Listeners
+            Listeners.notify(Listener.class, true, listener -> {
                 try {
                     listener.onEvent(action, optionalNode.get(), pod, terminationReasons.get(optionalNode.get().getNodeName()));
                 } catch (Exception x) {
@@ -420,9 +419,7 @@ public void onEvent(@NonNull Watcher.Action action, @NonNull KubernetesSlave nod
                     }
                 });
                 logLastLinesThenTerminateNode(node, pod, runListener);
-                try (ACLContext context = ACL.as(ACL.SYSTEM)) {
-                    PodUtils.cancelQueueItemFor(pod, "ContainerError");
-                }
+                PodUtils.cancelQueueItemFor(pod, "ContainerError");
             }
         }
     }
@@ -486,9 +483,7 @@ public void onEvent(@NonNull Watcher.Action action, @NonNull KubernetesSlave nod
                 }
             });
             terminationReasons.add("ImagePullBackOff");
-            try (ACLContext context = ACL.as(ACL.SYSTEM)) {
-                PodUtils.cancelQueueItemFor(pod, "ImagePullBackOff");
-            }
+            PodUtils.cancelQueueItemFor(pod, "ImagePullBackOff");
             node.terminate();
         }
     }

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/retention/Reaper.java

@@ -1 +1 @@
-FROM jenkins/inbound-agent:4.11-1
+FROM jenkins/inbound-agent:3077.vd69cf116da_6f-3-jdk11