Add revision hash labels to PDB and fully reconcile object (#609)

Fixes #608
spotify · Jan 23, 2023 · fb1fb03 · fb1fb03
1 parent 41e5bea
commit fb1fb03
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/controllers/flinkcluster/flinkcluster_converter.go b/controllers/flinkcluster/flinkcluster_converter.go
@@ -574,15 +574,16 @@ func newPodDisruptionBudget(flinkCluster *v1beta1.FlinkCluster) *policyv1.PodDis
 		return nil
 	}
 
-	labels := getClusterLabels(flinkCluster)
+	selectorLabels := getClusterLabels(flinkCluster)
+	labels := mergeLabels(selectorLabels, getRevisionHashLabels(&flinkCluster.Status.Revision))
 	if pdbSpec.Selector == nil {
 		pdbSpec.Selector = new(metav1.LabelSelector)
 	}
 
 	if pdbSpec.Selector.MatchLabels == nil {
-		pdbSpec.Selector.MatchLabels = labels
+		pdbSpec.Selector.MatchLabels = selectorLabels
 	} else {
-		for k, v := range labels {
+		for k, v := range selectorLabels {
 			pdbSpec.Selector.MatchLabels[k] = v
 		}
 	}

diff --git a/controllers/flinkcluster/flinkcluster_reconciler.go b/controllers/flinkcluster/flinkcluster_reconciler.go
@@ -327,18 +327,14 @@ func (reconciler *ClusterReconciler) reconcileHAConfigMap(ctx context.Context) e
 }
 
 func (reconciler *ClusterReconciler) reconcilePodDisruptionBudget(ctx context.Context) error {
-	var desiredPodDisruptionBudget = reconciler.desired.PodDisruptionBudget
-	var observedPodDisruptionBudget = reconciler.observed.podDisruptionBudget
-
-	if desiredPodDisruptionBudget != nil && observedPodDisruptionBudget == nil {
-		return reconciler.createComponent(ctx, desiredPodDisruptionBudget, "PodDisruptionBudget")
-	}
-
-	if desiredPodDisruptionBudget == nil && observedPodDisruptionBudget != nil {
-		return reconciler.deleteComponent(ctx, observedPodDisruptionBudget, "PodDisruptionBudget")
-	}
+	desiredPodDisruptionBudget := reconciler.desired.PodDisruptionBudget
+	observedPodDisruptionBudget := reconciler.observed.podDisruptionBudget
+	return reconciler.reconcileComponent(
+		ctx,
+		"PodDisruptionBudget",
+		desiredPodDisruptionBudget,
+		observedPodDisruptionBudget)
 
-	return nil
 }
 
 func (reconciler *ClusterReconciler) reconcilePersistentVolumeClaims(ctx context.Context) error {