[JENKINS-49707] If a KubernetesComputer disconnects, remove the KubernetesSlave

pom.xml

@@ -45,10 +45,12 @@
     <connectorHost />
     <jenkins.host.address />
     <java.level>8</java.level>
-    <jenkins.version>2.138.4</jenkins.version>
+    <jenkins.version>2.150.1</jenkins.version>
     <no-test-jar>false</no-test-jar>
     <surefire.rerunFailingTestsCount>1</surefire.rerunFailingTestsCount>
     <pipeline-model-definition.version>1.3.7</pipeline-model-definition.version>
+    <workflow-support-plugin.version>3.1</workflow-support-plugin.version>
+    <workflow-step-api-plugin.version>2.18</workflow-step-api-plugin.version>
   </properties>
 
   <dependencies>
@@ -94,7 +96,7 @@
     <dependency> <!-- OnceRetentionStrategy -->
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>durable-task</artifactId>
-      <version>1.28</version>
+      <version>1.29</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -104,7 +106,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-step-api</artifactId>
-      <version>2.17</version>
+      <version>${workflow-step-api-plugin.version}</version>
     </dependency>
     <dependency> <!-- DeclarativeAgent -->
       <groupId>org.jenkinsci.plugins</groupId>
@@ -129,26 +131,26 @@
     <dependency> <!-- StepConfigTester -->
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-step-api</artifactId>
-      <version>2.17</version>
+      <version>${workflow-step-api-plugin.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-support</artifactId>
-      <version>3.0</version>
+      <version>${workflow-support-plugin.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-durable-task-step</artifactId>
-      <version>2.27</version>
+      <version>2.31-SNAPSHOT</version> <!-- https://github.com/jenkinsci/workflow-durable-task-step-plugin/pull/104 -->
       <scope>test</scope>
     </dependency>
     <dependency> <!-- SemaphoreStep -->
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-support</artifactId>
-      <version>3.0</version>
+      <version>${workflow-support-plugin.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>

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

@@ -39,13 +39,15 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import com.google.common.base.Throwables;
+import hudson.model.Slave;
 
 import hudson.model.TaskListener;
 import hudson.slaves.JNLPLauncher;
 import hudson.slaves.SlaveComputer;
 
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import jenkins.model.Jenkins;
 
 /**
  * Launches on Kubernetes the specified {@link KubernetesComputer} instance.
@@ -159,4 +161,20 @@ public AllContainersRunningPodWatcher getWatcher() {
         return watcher;
     }
 
+    @Override
+    public void afterDisconnect(SlaveComputer computer, TaskListener listener) {
+        // TODO can this be done only if the pod is dead?
+        Slave node = computer.getNode();
+        if (node != null) {
+            try {
+                Jenkins.get().removeNode(node);
+                LOGGER.info(() -> "Removed disconnected agent " + node.getNodeName());
+            } catch (IOException x) {
+                LOGGER.log(Level.WARNING, x, () -> "Unable to remove Jenkins node " + node.getNodeName());
+            }
+        } else {
+            LOGGER.fine(() -> "Could not find disconnected agent " + computer.getName() + " to remove");
+        }
+    }
+
 }

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

@@ -50,6 +50,8 @@
 import org.jvnet.hudson.test.JenkinsRuleNonLocalhost;
 
 import hudson.model.Result;
+import org.jenkinsci.plugins.workflow.support.steps.ExecutorStepExecution;
+import org.jvnet.hudson.test.Issue;
 
 /**
  * @author Carlos Sanchez
@@ -334,4 +336,14 @@ public void runInPodWithRetention() throws Exception {
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         assertTrue(deletePods(cloud.connect(), getLabels(this, name), true));
     }
+
+    @Issue("JENKINS-49707")
+    @Test
+    public void terminatedPod() throws Exception {
+        r.waitForMessage("+ sleep", b);
+        deletePods(cloud.connect(), getLabels(this, name), false);
+        r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b));
+        r.waitForMessage(new ExecutorStepExecution.RemovedNodeCause().getShortDescription(), b);
+    }
+
 }

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

@@ -0,0 +1,9 @@
+podTemplate(label: 'runInPod', containers: [
+        containerTemplate(name: 'busybox', image: 'busybox', ttyEnabled: true, command: '/bin/cat'),
+    ]) {
+    node ('runInPod') {
+        container('busybox') {
+            sh 'sleep 9999999'
+        }
+    }
+}