Modify existing listener

Author: Mor Cohen

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

@@ -240,6 +240,9 @@ public void onEvent(@NonNull Action action, @NonNull KubernetesSlave node, @NonN
                     LOGGER.info(() -> ns + "/" + name + " Container " + c.getName() + " was just terminated, so removing the corresponding Jenkins agent");
                     runListener.getLogger().printf("%s/%s Container %s was terminated (Exit Code: %d, Reason: %s)%n", ns, name, c.getName(), t.getExitCode(), t.getReason());
                 });
+                try (ACLContext _ = ACL.as(ACL.SYSTEM)) {
+                    PodUtils.cancelQueueItemFor(pod, "ContainerError");
+                }
                 logLastLinesThenTerminateNode(node, pod, runListener);
             }
         }
@@ -298,27 +301,4 @@ public void onEvent(@NonNull Action action, @NonNull KubernetesSlave node, @NonN
             node.terminate();
         }
     }
-
-    @Extension
-    public static class TerminateAgentOnCreateContainerError implements Listener {
-
-        @Override
-        public void onEvent(@NonNull Action action, @NonNull KubernetesSlave node, @NonNull Pod pod) throws IOException, InterruptedException {
-            List<ContainerStatus> backOffContainers = PodUtils.getContainers(pod, cs -> {
-                ContainerStateWaiting waiting = cs.getState().getWaiting();
-                return waiting != null && waiting.getMessage() != null && waiting.getMessage().contains("container create failed");
-            });
-            if (backOffContainers.isEmpty()) {
-                return;
-            }
-            backOffContainers.forEach(cs -> {
-                TaskListener runListener = node.getTemplate().getListener();
-                runListener.error("Container creation error \""+cs.getName()+"\". Please check container's logs.");
-            });
-            try (ACLContext _ = ACL.as(ACL.SYSTEM)) {
-                PodUtils.cancelQueueItemFor(pod, "CreateContainerError");
-            }
-            node.terminate();
-        }
-    }
 }

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

@@ -183,7 +183,7 @@ public void declarativeWithNonexistentDockerImage() throws Exception {
     public void declarativeWithCreateContainerError() throws Exception {
         assertNotNull(createJobThenScheduleRun());
         r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b));
-        r.assertLogContains("ERROR: Container creation error", b);
+        r.assertLogContains("was terminated", b);
     }
 
     @Issue("JENKINS-61360")