Merge branch 'master' into update-kubernetes-client-api-6.4.x

Author: Vlatombe

.github/renovate.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "labels": [
+    "dependencies"
+  ],
+  "packageRules": [
+    {
+      "description": "remoting agent uses non-standard versioning",
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["jenkins/inbound-agent"],
+      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>[^\\.-]*)(\\.(?<patch>\\d+))?(-(?<build>\\d+))?$"
+    }
+  ],
+  "enabledManagers": [
+    "dockerfile",
+    "docker-compose",
+    "kubernetes"
+  ],
+  "dockerfile": {
+    "fileMatch": [
+        ".*\\.dockerfile$",
+        ".*-dockerfile$",
+        "Dockerfile"
+    ]
+  },
+  "kubernetes": {
+    "fileMatch": [
+      ".*\\.ya?ml$"
+    ]
+  }
+}

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
   </extension>
 </extensions>

Jenkinsfile

@@ -42,12 +42,14 @@ stage('Tests') {
         }
     }
     branches['jdk11'] = {
-        node('maven-11') {
-            timeout(60) {
-                checkout scm
-                sh 'mvn -B -ntp -Dset.changelist -Dmaven.test.failure.ignore clean install'
-                infra.prepareToPublishIncrementals()
-                junit 'target/surefire-reports/*.xml'
+        retry(count: 3, conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()]) {
+            node('maven-11') {
+                timeout(60) {
+                    checkout scm
+                    sh 'mvn -B -ntp -Dset.changelist -Dmaven.test.failure.ignore clean install'
+                    infra.prepareToPublishIncrementals()
+                    junit 'target/surefire-reports/*.xml'
+                }
             }
         }
     }

docker-compose.yml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.53</version>
+    <version>4.54</version>
     <relativePath/>
   </parent>
 

pom.xml

@@ -310,8 +310,7 @@ protected void _terminate(TaskListener listener) throws IOException, Interrupted
         // Prior to termination, determine if we should delete the slave pod based on
         // the slave pod's current state and the pod retention policy.
         // Healthy slave pods should still have a JNLP agent running at this point.
-        Pod pod = client.pods().inNamespace(getNamespace()).withName(name).get();
-        boolean deletePod = getPodRetention(cloud).shouldDeletePod(cloud, pod);
+        boolean deletePod = getPodRetention(cloud).shouldDeletePod(cloud, () -> client.pods().inNamespace(getNamespace()).withName(name).get());
 
         Computer computer = toComputer();
         if (computer == null) {
@@ -367,6 +366,7 @@ private void deleteSlavePod(TaskListener listener, KubernetesClient client) thro
                     e.getMessage());
             LOGGER.log(Level.WARNING, msg, e);
             listener.error(msg);
+            // TODO should perhaps retry later, in case API server is just overloaded currently
             return;
         }
 

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

@@ -8,6 +8,7 @@
 
 import hudson.Extension;
 import io.fabric8.kubernetes.api.model.Pod;
+import java.util.function.Supplier;
 
 public class Always extends PodRetention implements Serializable {
 
@@ -19,7 +20,7 @@ public Always() {
     }
 
     @Override
-    public boolean shouldDeletePod(KubernetesCloud cloud, Pod pod) {
+    public boolean shouldDeletePod(KubernetesCloud cloud, Supplier<Pod> pod) {
         return false;
     }
 

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

@@ -10,6 +10,7 @@
 import hudson.model.Descriptor;
 import hudson.model.DescriptorVisibilityFilter;
 import io.fabric8.kubernetes.api.model.Pod;
+import java.util.function.Supplier;
 
 public class Default extends PodRetention implements Serializable {
 
@@ -21,7 +22,7 @@ public Default() {
     }
 
     @Override
-    public boolean shouldDeletePod(KubernetesCloud cloud, Pod pod) {
+    public boolean shouldDeletePod(KubernetesCloud cloud, Supplier<Pod> pod) {
         PodRetention parent = cloud.getPodRetention();
         if (!(parent instanceof Default)) {
             return parent.shouldDeletePod(cloud, pod);

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

@@ -8,6 +8,7 @@
 
 import hudson.Extension;
 import io.fabric8.kubernetes.api.model.Pod;
+import java.util.function.Supplier;
 
 public class Never extends PodRetention implements Serializable {
 
@@ -19,7 +20,7 @@ public Never() {
     }
 
     @Override
-    public boolean shouldDeletePod(KubernetesCloud cloud, Pod pod) {
+    public boolean shouldDeletePod(KubernetesCloud cloud, Supplier<Pod> pod) {
         return true;
     }
 

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

@@ -8,18 +8,29 @@
 
 import hudson.Extension;
 import io.fabric8.kubernetes.api.model.Pod;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class OnFailure extends PodRetention implements Serializable {
 
     private static final long serialVersionUID = 6424267627207206819L;
 
+    private static final Logger LOGGER = Logger.getLogger(OnFailure.class.getName());
+
     @DataBoundConstructor
     public OnFailure() {
 
     }
 
     @Override
-    public boolean shouldDeletePod(KubernetesCloud cloud, Pod pod) {
+    public boolean shouldDeletePod(KubernetesCloud cloud, Supplier<Pod> podS) {
+        Pod pod = null;
+        try {
+            pod = podS.get();
+        } catch (RuntimeException x) {
+            LOGGER.log(Level.WARNING, null, x);
+        }
         if (pod == null || pod.getStatus() == null) {
             return false;
         }