Merge pull request #1474 from aubinmora/bugfix/cascading-deletion

Use background cascading deletion of DynamicPVC
jenkinsci · Nov 23, 2023 · ad406fb · ad406fb
2 parents fd176ec + 68bccfd
commit ad406fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/DynamicPVC.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/DynamicPVC.java
@@ -41,7 +41,6 @@ default PersistentVolumeClaim createPVC(KubernetesClient client, ObjectMeta podM
         OwnerReference ownerReference = new OwnerReferenceBuilder().
                 withApiVersion("v1").
                 withKind("Pod").
-                withBlockOwnerDeletion(true).
                 withController(true).
                 withName(podMetaData.getName()).
                 withUid(podMetaData.getUid()).build();

diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java
@@ -24,6 +24,7 @@
 
 package org.csanchez.jenkins.plugins.kubernetes.pipeline;
 
+import static org.awaitility.Awaitility.await;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.CONTAINER_ENV_VAR_FROM_SECRET_VALUE;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.POD_ENV_VAR_FROM_SECRET_VALUE;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.WINDOWS_1809_BUILD;
@@ -44,6 +45,7 @@
 
 import io.fabric8.kubernetes.api.model.StatusDetails;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -72,6 +74,7 @@
 import org.csanchez.jenkins.plugins.kubernetes.PodTemplateUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.jenkinsci.plugins.workflow.steps.durable_task.DurableTaskStep;
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
@@ -688,24 +691,27 @@ public void secretMaskingWindows() throws Exception {
 
     @Test
     public void dynamicPVCWorkspaceVolume() throws Exception {
-        try {
-            cloud.connect().persistentVolumeClaims().list();
-        } catch (KubernetesClientException x) {
-            // Error from server (Forbidden): persistentvolumeclaims is forbidden: User "system:serviceaccount:kubernetes-plugin-test:default" cannot list resource "persistentvolumeclaims" in API group "" in the namespace "kubernetes-plugin-test"
-            assumeNoException("was not permitted to list pvcs, so presumably cannot run test either", x);
-        }
+        assumePvcAccess();
+        var size = cloud.connect().persistentVolumeClaims().list().getItems().size();
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        await().until(() -> cloud.connect().persistentVolumeClaims().list().getItems(), hasSize(size));
     }
 
     @Test
     public void dynamicPVCVolume() throws Exception {
+        assumePvcAccess();
+        var size = cloud.connect().persistentVolumeClaims().list().getItems().size();
+        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        await().until(() -> cloud.connect().persistentVolumeClaims().list().getItems(), hasSize(size));
+    }
+
+    private void assumePvcAccess() throws KubernetesAuthException, IOException {
         try {
             cloud.connect().persistentVolumeClaims().list();
         } catch (KubernetesClientException x) {
             // Error from server (Forbidden): persistentvolumeclaims is forbidden: User "system:serviceaccount:kubernetes-plugin-test:default" cannot list resource "persistentvolumeclaims" in API group "" in the namespace "kubernetes-plugin-test"
             assumeNoException("was not permitted to list pvcs, so presumably cannot run test either", x);
         }
-        r.assertBuildStatusSuccess(r.waitForCompletion(b));
     }
 
     @Test