Remove superfluous label on managed PVCs

The label in question (pgremove) was used to indicate that
the PVC was managed by PGO, but there are other labels that
handle that,

Author: Jonathan S. Katz

installers/ansible/roles/pgo-operator/files/pgo-configs/pvc-storageclass.json

@@ -5,7 +5,6 @@
         "name": "{{.Name}}",
         "labels": {
             "vendor": "crunchydata",
-            "pgremove": "true",
             "pg-cluster": "{{.ClusterName}}"
         }
     },

installers/ansible/roles/pgo-operator/files/pgo-configs/pvc.json

@@ -5,7 +5,6 @@
         "name": "{{.Name}}",
         "labels": {
             "vendor": "crunchydata",
-            "pgremove": "true",
             "pg-cluster": "{{.ClusterName}}"
         }
     },

internal/apiserver/pvcservice/pvcimpl.go

@@ -30,9 +30,7 @@ import (
 func ShowPVC(allflag bool, clusterName, ns string) ([]msgs.ShowPVCResponseResult, error) {
 	ctx := context.TODO()
 	pvcList := []msgs.ShowPVCResponseResult{}
-	// note to a future editor...all of our managed PVCs have a label called
-	// called "pgremove"
-	selector := fmt.Sprintf("%s=%s", config.LABEL_PGREMOVE, "true")
+	selector := fmt.Sprintf("%s=%s", config.LABEL_VENDOR, config.LABEL_CRUNCHY)
 
 	// if allflag is not set to true, then update the selector to target the
 	// specific PVCs for a specific cluster

internal/apiserver/statusservice/statusimpl.go

@@ -46,10 +46,10 @@ func Status(ns string) msgs.StatusResponse {
 
 func getNumClaims(ns string) int {
 	ctx := context.TODO()
-	// count number of PVCs with pgremove=true
+
 	pvcs, err := apiserver.Clientset.
 		CoreV1().PersistentVolumeClaims(ns).
-		List(ctx, metav1.ListOptions{LabelSelector: config.LABEL_PGREMOVE})
+		List(ctx, metav1.ListOptions{LabelSelector: config.LABEL_VENDOR + "=" + config.LABEL_CRUNCHY})
 	if err != nil {
 		log.Error(err)
 		return 0
@@ -75,7 +75,7 @@ func getVolumeCap(ns string) string {
 	// sum all PVCs storage capacity
 	pvcs, err := apiserver.Clientset.
 		CoreV1().PersistentVolumeClaims(ns).
-		List(ctx, metav1.ListOptions{LabelSelector: config.LABEL_PGREMOVE})
+		List(ctx, metav1.ListOptions{LabelSelector: config.LABEL_VENDOR + "=" + config.LABEL_CRUNCHY})
 	if err != nil {
 		log.Error(err)
 		return "error"

internal/config/labels.go

@@ -34,7 +34,6 @@ const (
 
 const (
 	LABEL_PGPOLICY           = "pgpolicy"
-	LABEL_PGREMOVE           = "pgremove"
 	LABEL_PVCNAME            = "pvcname"
 	LABEL_EXPORTER           = "crunchy-postgres-exporter"
 	LABEL_ARCHIVE            = "archive"

internal/operator/pvc/pvc.go

@@ -198,15 +198,13 @@ func DeleteIfExists(clientset kubernetes.Interface, name string, namespace strin
 	}
 
 	log.Debugf("PVC %s is found", pvc.Name)
+	log.Debugf("delete PVC %s in namespace %s", name, namespace)
 
-	if pvc.ObjectMeta.Labels[config.LABEL_PGREMOVE] == "true" {
-		log.Debugf("delete PVC %s in namespace %s", name, namespace)
-		deletePropagation := metav1.DeletePropagationForeground
-		err = clientset.
-			CoreV1().PersistentVolumeClaims(namespace).
-			Delete(ctx, name, metav1.DeleteOptions{PropagationPolicy: &deletePropagation})
-	}
-	return err
+	deletePropagation := metav1.DeletePropagationForeground
+
+	return clientset.
+		CoreV1().PersistentVolumeClaims(namespace).
+		Delete(ctx, name, metav1.DeleteOptions{PropagationPolicy: &deletePropagation})
 }
 
 // Exists test to see if pvc exists