From a6123fa99dc342c570cf68d137e1c6b46d71a92e Mon Sep 17 00:00:00 2001
From: Andrew Bays <andrew.bays@gmail.com>
Date: Mon, 4 Nov 2024 16:53:39 +0000
Subject: [PATCH] Fix IPSet label variable usage

---
 controllers/openstackbaremetalset_controller.go | 2 +-
 controllers/openstackclient_controller.go       | 2 +-
 controllers/openstackcontrolplane_controller.go | 2 +-
 controllers/openstackipset_controller.go        | 2 +-
 controllers/openstackvmset_controller.go        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/openstackbaremetalset_controller.go b/controllers/openstackbaremetalset_controller.go
index c8ee345d..932c9a45 100644
--- 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
index 150b12bf..b1841608 100644
--- 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
index 3c6d1708..c75bdd61 100644
--- 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
index 02a76ccc..d1505f72 100644
--- 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
index 4298e2f9..e1311b5a 100644
--- 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