Fix-118: Check UID before deleting PVC

k8ssandra · Jun 12, 2021 · 99f5969 · 99f5969
1 parent ece4469
commit 99f5969
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go b/operator/pkg/apis/cassandra/v1beta1/cassandradatacenter_types.go
@@ -22,6 +22,9 @@ const (
 	// DatacenterLabel is the operator's label for the datacenter name
 	DatacenterLabel = "cassandra.datastax.com/datacenter"
 
+	// DatacenterUID is the operator's label for datacenter UID
+	DatacenterUID = "cassandra.datastax.com/datacenterUID"
+
 	// SeedNodeLabel is the operator's label for the seed node state
 	SeedNodeLabel = "cassandra.datastax.com/seed-node"
 
@@ -102,7 +105,7 @@ type CassandraDatacenterSpec struct {
 	//        },
 	//        "jmv-options": {
 	//          "max_heap_size": 1024M
-    //        }
+	//        }
 	//      }
 	//
 	// ConfigSecret is mutually exclusive with Config. ConfigSecret takes precedence and
@@ -514,6 +517,7 @@ func (dc *CassandraDatacenter) SetCondition(condition DatacenterCondition) {
 func (dc *CassandraDatacenter) GetDatacenterLabels() map[string]string {
 	labels := dc.GetClusterLabels()
 	labels[DatacenterLabel] = dc.Name
+	labels[DatacenterUID] = string(dc.UID)
 	return labels
 }
 

diff --git a/operator/pkg/reconciliation/reconcile_datacenter.go b/operator/pkg/reconciliation/reconcile_datacenter.go
@@ -98,6 +98,7 @@ func (rc *ReconciliationContext) listPVCs() (*corev1.PersistentVolumeClaimList,
 
 	selector := map[string]string{
 		api.DatacenterLabel: rc.Datacenter.Name,
+		api.DatacenterUID:   string(rc.Datacenter.UID),
 	}
 
 	listOptions := &client.ListOptions{