list PVC with ZookeeperCluster uid (#313)

pravega · Mar 22, 2021 · c25d193 · c25d193
1 parent cda03d2
commit c25d193
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/controller/zookeepercluster/zookeepercluster_controller.go b/pkg/controller/zookeepercluster/zookeepercluster_controller.go
@@ -722,7 +722,7 @@ func (r *ReconcileZookeeperCluster) cleanupOrphanPVCs(instance *zookeeperv1beta1
 
 func (r *ReconcileZookeeperCluster) getPVCList(instance *zookeeperv1beta1.ZookeeperCluster) (pvList corev1.PersistentVolumeClaimList, err error) {
 	selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{
-		MatchLabels: map[string]string{"app": instance.GetName()},
+		MatchLabels: map[string]string{"app": instance.GetName(), "uid": string(instance.UID)},
 	})
 	pvclistOps := &client.ListOptions{
 		Namespace:     instance.Namespace,

diff --git a/pkg/zk/generators.go b/pkg/zk/generators.go
@@ -57,7 +57,7 @@ func MakeStatefulSet(z *v1beta1.ZookeeperCluster) *appsv1.StatefulSet {
 				Name: zkDataVolume,
 				Labels: mergeLabels(
 					z.Spec.Labels,
-					map[string]string{"app": z.GetName()},
+					map[string]string{"app": z.GetName(), "uid": string(z.UID)},
 				),
 				Annotations: z.Spec.Persistence.Annotations,
 			},