Merge pull request #1105 from openshift-cherrypick-robot/cherry-pick-…

…1104-to-v1.3.x [v1.3.x] Fix IPSet label variable usage in AddOSNetConfigRefLabel context
openstack-k8s-operators · Nov 5, 2024 · 5c7a727 · 5c7a727
2 parents bccd75e + fc2a54e
commit 5c7a727
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/controllers/openstackbaremetalset_controller.go b/controllers/openstackbaremetalset_controller.go
@@ -261,7 +261,7 @@ func (r *OpenStackBaremetalSetReconciler) Reconcile(ctx context.Context, req ctr
 			r.Client,
 			instance.Namespace,
 			instance.Spec.Networks[0],
-			currentLabels,
+			instance.Labels,
 		)
 		if err != nil {
 			return ctrlResult, err

diff --git a/controllers/openstackclient_controller.go b/controllers/openstackclient_controller.go
@@ -159,7 +159,7 @@ func (r *OpenStackClientReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 			r.Client,
 			instance.Namespace,
 			instance.Spec.Networks[0],
-			currentLabels,
+			instance.Labels,
 		)
 		if err != nil {
 			return ctrlResult, err

diff --git a/controllers/openstackcontrolplane_controller.go b/controllers/openstackcontrolplane_controller.go
@@ -913,7 +913,7 @@ func (r *OpenStackControlPlaneReconciler) ensureVIPs(
 			r.Client,
 			instance.Namespace,
 			vipNetworksList[0],
-			currentLabels,
+			instance.Labels,
 		)
 		if err != nil {
 			return ctrlResult, err

diff --git a/controllers/openstackipset_controller.go b/controllers/openstackipset_controller.go
@@ -149,7 +149,7 @@ func (r *OpenStackIPSetReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 			r.Client,
 			instance.Namespace,
 			instance.Spec.Networks[0],
-			currentLabels,
+			instance.Labels,
 		)
 		if err != nil {
 			return ctrlResult, err

diff --git a/controllers/openstackvmset_controller.go b/controllers/openstackvmset_controller.go
@@ -266,7 +266,7 @@ func (r *OpenStackVMSetReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 			r.Client,
 			instance.Namespace,
 			instance.Spec.Networks[0],
-			currentLabels,
+			instance.Labels,
 		)
 		if err != nil {
 			return ctrlResult, err