Switch Topology defaultLabelSelector to lib-common GetLabelSelector

Signed-off-by: Francesco Pantano <fpantano@redhat.com>
openstack-k8s-operators · Feb 28, 2025 · 8fe2f1e · 8fe2f1e
1 parent e9b7df5
commit 8fe2f1e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/api/bases/horizon.openstack.org_horizons.yaml b/api/bases/horizon.openstack.org_horizons.yaml
@@ -1255,6 +1255,7 @@ spec:
                             items:
                               type: string
                             type: array
+                            x-kubernetes-list-type: atomic
                           sessionAffinity:
                             description: |-
                               Supports "ClientIP" and "None". Used to maintain session affinity.

diff --git a/api/go.mod b/api/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250220094812-174a6a440f37
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250220094812-174a6a440f37
 	k8s.io/api v0.29.14
 	k8s.io/apimachinery v0.29.14

diff --git a/api/go.sum b/api/go.sum
@@ -75,8 +75,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded h1:09SyMAXgnohPLQGKuvBeR72nxZWXLXI7309RjmYYBUU=
 github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250220094812-174a6a440f37 h1:EyqRXUdGIlSo0QUiLhcFVbOS429rS4clR6LOs2MQ/Tc=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250220094812-174a6a440f37/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91 h1:JSWODgJhcD1Q5YEwYZwtdE+ixjsjJq70AxwKgggwi3g=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250220094812-174a6a440f37 h1:rrrqu86rVZtxKBkEy5crGsCXQByi7iMtK/u0Eao956I=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250220094812-174a6a440f37/go.mod h1:u7Zqmyt1WB96KSz8apYltrZV9xlL0tTVYwOk9+6G57k=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

diff --git a/config/crd/bases/horizon.openstack.org_horizons.yaml b/config/crd/bases/horizon.openstack.org_horizons.yaml
@@ -1255,6 +1255,7 @@ spec:
                             items:
                               type: string
                             type: array
+                            x-kubernetes-list-type: atomic
                           sessionAffinity:
                             description: |-
                               Supports "ClientIP" and "None". Used to maintain session affinity.

diff --git a/controllers/horizon_controller.go b/controllers/horizon_controller.go
@@ -849,7 +849,7 @@ func (r *HorizonReconciler) reconcileNormal(ctx context.Context, instance *horiz
 	}
 
 	// Build a defaultLabelSelector (service=horizon)
-	defaultLabelSelector := labels.GetAppLabelSelector(horizon.ServiceName)
+	defaultLabelSelector := labels.GetLabelSelector(serviceLabels)
 	topology, err := topologyv1.EnsureServiceTopology(
 		ctx,
 		helper,

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240214134444-c675e5f69043
 	github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded
 	github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250220113356-66f9a1c66db4
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250220094812-174a6a440f37
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250220094812-174a6a440f37
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250220094812-174a6a440f37
 	k8s.io/api v0.29.14

diff --git a/go.sum b/go.sum
@@ -82,8 +82,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-a
 github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250218115938-ae95bdfefded/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
 github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250220113356-66f9a1c66db4 h1:UGgeBmnWCsTvZEXaZsEweZMFqFitlH2rhL4Y/3DUWsg=
 github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250220113356-66f9a1c66db4/go.mod h1:x8iCOBnARG5HtgXmAp7C/SwZpuDSSbYyMilPZSb/jWE=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250220094812-174a6a440f37 h1:EyqRXUdGIlSo0QUiLhcFVbOS429rS4clR6LOs2MQ/Tc=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250220094812-174a6a440f37/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91 h1:JSWODgJhcD1Q5YEwYZwtdE+ixjsjJq70AxwKgggwi3g=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250220094812-174a6a440f37 h1:U1a5yca8OTvf+eOAkuDdevVesFfrPCUmQKOCPygFojs=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250220094812-174a6a440f37/go.mod h1:tfMa+ochq7Dyilq9hQr2CEPfPtsj6IUgMmMqi4CWDmo=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250220094812-174a6a440f37 h1:rrrqu86rVZtxKBkEy5crGsCXQByi7iMtK/u0Eao956I=