Merge pull request #45 from wunderio/feature/remove-instance

Remove pvc based on helm instance label

Author: Jancis

cmd/ciReleaseDelete.go

@@ -78,17 +78,32 @@ var ciReleaseDeleteCmd = &cobra.Command{
 		}
 
 		//Delete PVCs
-		if deletePVCs == true {
+		if deletePVCs {
+
 			PVC_client := clientset.CoreV1().PersistentVolumeClaims(namespace)
-			list, err := PVC_client.List(context.TODO(), v1.ListOptions{
-				LabelSelector: "release=" + releaseName,
-			})
-			if err != nil {
-				log.Fatalf("Error getting the list of PVCs: %s", err)
+
+			selectorLabels := []string{
+				"app",
+				"release",
+				"app.kubernetes.io/instance",
 			}
 
-			for _, v := range list.Items {
-				PVC_client.Delete(context.TODO(), v.Name, v1.DeleteOptions{})
+			for _, l := range selectorLabels {
+				selector := l + "=" + releaseName
+				if l == "app" {
+					selector = l + "=" + releaseName + "-es"
+				}
+				list, err := PVC_client.List(context.TODO(), v1.ListOptions{
+					LabelSelector: selector,
+				})
+				if err != nil {
+					log.Fatalf("Error getting the list of PVCs: %s", err)
+				}
+
+				for _, v := range list.Items {
+					log.Printf("Deleting PVC: %s", v.Name)
+					PVC_client.Delete(context.TODO(), v.Name, v1.DeleteOptions{})
+				}
 			}
 		}