Set terminationGracePeriodSeconds to 0 to avoid waiting 30 seconds fo…

…r pod termination.
jenkinsci · Jan 17, 2020 · e5faa7f · e5faa7f
1 parent b9c2774
commit e5faa7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java
@@ -198,6 +198,7 @@ public Pod build() {
             builder.withNodeSelector(nodeSelector);
         }
 
+        builder.withTerminationGracePeriodSeconds(0L);
         builder.withContainers(containers.values().toArray(new Container[containers.size()]));
 
         Long runAsUser = template.getRunAsUserAsLong();

diff --git a/...est/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java b/...est/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java
@@ -116,7 +116,7 @@ public void configureCloud() throws Exception {
                 .withCommand("cat").withTty(true).withWorkingDir("/home/jenkins/agent1").build();
         String podName = "test-command-execution-" + RandomStringUtils.random(5, "bcdfghjklmnpqrstvwxz0123456789");
         pod = client.pods().create(new PodBuilder().withNewMetadata().withName(podName)
-                .withLabels(getLabels(this, name)).endMetadata().withNewSpec().withContainers(c, d).withNodeSelector(Collections.singletonMap("kubernetes.io/os", "linux")).endSpec().build());
+                .withLabels(getLabels(this, name)).endMetadata().withNewSpec().withContainers(c, d).withNodeSelector(Collections.singletonMap("kubernetes.io/os", "linux")).withTerminationGracePeriodSeconds(0L).endSpec().build());
 
         System.out.println("Created pod: " + pod.getMetadata().getName());
 

diff --git a/src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/cascadingDelete.groovy b/src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/cascadingDelete.groovy
@@ -62,6 +62,7 @@ spec:
                       labels:
                         app: cascading-delete
                     spec:
+                      terminationGracePeriodSeconds: 0
                       containers:
                       - name: ubuntu
                         image: ubuntu