fix: when blue-green upgreda, should selector old version sts for req…

…uest API Signed-off-by: Rory Z <[email protected]>
emqx · Oct 8, 2023 · aec37c6 · aec37c6
1 parent 935bf8a
commit aec37c6
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/controllers/apps/v2beta1/emqx_controller.go b/controllers/apps/v2beta1/emqx_controller.go
@@ -172,23 +172,12 @@ func newRequester(k8sClient client.Client, instance *appsv2beta1.EMQX) (innerReq
 	}
 
 	labels := appsv2beta1.DefaultCoreLabels(instance)
-	if instance.Status.IsConditionTrue(appsv2beta1.Available) {
-		if instance.Status.CoreNodesStatus.UpdateRevision != "" {
-			labels = appsv2beta1.CloneAndAddLabel(
-				labels,
-				appsv2beta1.LabelsPodTemplateHashKey,
-				instance.Status.CoreNodesStatus.UpdateRevision,
-			)
-		}
-	} else {
-		if instance.Status.CoreNodesStatus.CurrentRevision != "" {
-			labels = appsv2beta1.CloneAndAddLabel(
-				labels,
-				appsv2beta1.LabelsPodTemplateHashKey,
-				instance.Status.CoreNodesStatus.CurrentRevision,
-			)
-
-		}
+	if instance.Status.CoreNodesStatus.CurrentRevision != "" {
+		labels = appsv2beta1.CloneAndAddLabel(
+			labels,
+			appsv2beta1.LabelsPodTemplateHashKey,
+			instance.Status.CoreNodesStatus.CurrentRevision,
+		)
 	}
 
 	podList := &corev1.PodList{}