Fix-118: Check UID before deleting PVC

k8ssandra · Nov 2, 2021 · e407779 · e407779
1 parent ed4a19b
commit e407779
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/apis/cassandra/v1beta1/cassandradatacenter_types.go b/apis/cassandra/v1beta1/cassandradatacenter_types.go
@@ -24,6 +24,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"
 
@@ -496,6 +499,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/pkg/reconciliation/reconcile_datacenter.go b/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{