e2e: wait for the provisioner to clean up PV resources

test/pod_test.go

@@ -39,6 +39,8 @@ func (p *PodTestSuite) SetupSuite() {
  cmds := []string{
  fmt.Sprintf("kind create cluster --config=%s --wait=120s", testdataFile("kind-cluster.yaml")),
  fmt.Sprintf("kind load docker-image %s", p.config.IMAGE),
+ // We'll be replacing this, but applying particular labels to it.
+ "kubectl -n local-path-storage delete deployment local-path-provisioner --wait",
  }
  for _, cmd := range cmds {
  _, err = runCmd(

test/testdata/custom-path-pattern/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - storage-class.yaml
 - pod.yaml
 - pvc.yaml
@@ -11,4 +11,4 @@ commonLabels:
  app: local-path-provisioner
 images:
 - name: rancher/local-path-provisioner
- newTag: dev
+ newTag: dev

test/testdata/labelled-deploy/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../../deploy
+commonLabels:
+ system-component: "true"

test/testdata/multiple-storage-classes/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - storage-class-shared.yaml
 - pod.yaml
 - pvc.yaml

test/testdata/pod-with-default-local-volume/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod
 patches:
 - path: patch.yaml

test/testdata/pod-with-local-volume/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod-with-local-volume
 commonLabels:
  app: local-path-provisioner

test/testdata/pod-with-node-affinity/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod-with-node-affinity
 patches:
 - path: patch.yaml

test/testdata/pod-with-rwop-volume/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod-with-rwop-volume
 commonLabels:
  app: local-path-provisioner

test/testdata/pod-with-security-context/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod-with-security-context
 commonLabels:
  app: local-path-provisioner

test/testdata/pod-with-subpath/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod-with-subpath
 commonLabels:
  app: local-path-provisioner

test/testdata/pod/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../../deploy
+- ../labelled-deploy
 - ../../../examples/pod
 commonLabels:
  app: local-path-provisioner

test/util.go

@@ -76,14 +76,28 @@ func testdataFile(fields ...string) string {
 }
 
 func deleteKustomizeDeployment(t *testing.T, kustomizeDir string, envs []string) error {
- _, err := runCmd(
- t,
- "kustomize build | kubectl delete --timeout=180s -f -",
- testdataFile(kustomizeDir),
- envs,
- nil,
- )
- return err
+ cmds := []string{
+ // Begin by deleting everything except the provisioner.
+ // This gives the local-path provider a chance to kick in and kill the pv.
+ "kustomize build | kubectl delete --timeout=180s -f - -l 'system-component!=true'",
+ // Wait on the provisioner
+ "kubectl wait --for=delete pv --all",
+ // Clean up everything else
+ "kustomize build | kubectl delete --timeout=180s -f - -l 'system-component=true' --wait",
+ }
+ for _, cmd := range cmds {
+ _, err := runCmd(
+ t,
+ cmd,
+ testdataFile(kustomizeDir),
+ envs,
+ nil,
+ )
+ if err != nil {
+ return err
+ }
+ }
+ return nil
 }
 
 func deleteCluster(t *testing.T, envs []string) error {