Skip to content

Commit 6ee06c4

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #518 from fmount/topologyref
Switch Topology defaultLabelSelector to lib-common GetLabelSelector
2 parents bbcbf07 + 6da5dc7 commit 6ee06c4

File tree

8 files changed

+10
-22
lines changed

8 files changed

+10
-22
lines changed

‎api/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/onsi/ginkgo/v2 v2.20.1
77
github.com/onsi/gomega v1.34.1
88
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe
9-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
9+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
1010
k8s.io/api v0.29.14
1111
k8s.io/apimachinery v0.29.14
1212
k8s.io/client-go v0.29.14

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6
7676
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
7777
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe h1:7aL4k0SE0e9PaCiv0K+QNm0qrZoEV334zV7jxv1BVuk=
7878
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
79-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f h1:3JVxp1FhQw62xYc/tnA04uPn9WCUTYupWucRQJeTy54=
80-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
79+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91 h1:JSWODgJhcD1Q5YEwYZwtdE+ixjsjJq70AxwKgggwi3g=
80+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
8181
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
8282
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
8383
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

‎controllers/ironicapi_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -885,10 +885,7 @@ func (r *IronicAPIReconciler) reconcileNormal(ctx context.Context, instance *iro
885885
instance, // topologyHandler
886886
instance.Name, // finalizer
887887
&instance.Status.Conditions,
888-
labels.GetSingleLabelSelector(
889-
common.ComponentSelector,
890-
ironic.APIComponent,
891-
),
888+
labels.GetLabelSelector(serviceLabels),
892889
)
893890
if err != nil {
894891
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/ironicconductor_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,10 +706,7 @@ func (r *IronicConductorReconciler) reconcileNormal(ctx context.Context, instanc
706706
instance, // topologyHandler
707707
instance.Name, // finalizer
708708
&instance.Status.Conditions,
709-
labels.GetSingleLabelSelector(
710-
common.ComponentSelector,
711-
ironic.ConductorComponent,
712-
),
709+
labels.GetLabelSelector(serviceLabels),
713710
)
714711
if err != nil {
715712
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/ironicinspector_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -663,10 +663,7 @@ func (r *IronicInspectorReconciler) reconcileStatefulSet(
663663
instance, // topologyHandler
664664
instance.Name, // finalizer
665665
&instance.Status.Conditions,
666-
labels.GetSingleLabelSelector(
667-
common.ComponentSelector,
668-
ironic.InspectorComponent,
669-
),
666+
labels.GetLabelSelector(serviceLabels),
670667
)
671668
if err != nil {
672669
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/ironicneutronagent_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,7 @@ func (r *IronicNeutronAgentReconciler) reconcileDeployment(
498498
instance, // topologyHandler
499499
instance.Name, // finalizer
500500
&instance.Status.Conditions,
501-
labels.GetSingleLabelSelector(
502-
common.ComponentSelector,
503-
ironicneutronagent.ServiceName,
504-
),
501+
labels.GetLabelSelector(serviceLabels),
505502
)
506503
if err != nil {
507504
instance.Status.Conditions.Set(condition.FalseCondition(

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe
1212
github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-00010101000000-000000000000
1313
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d
14-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
14+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
1515
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250225220922-3ead38b7284f
1616
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250225210327-7746ba50108f
1717
k8s.io/api v0.29.14

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-9
8282
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
8383
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d h1:6bkxDDhulO2Yjpo+s/ro9BCQ5abmrh9nzg05pf4LPs0=
8484
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d/go.mod h1:5i9OcPG3dNqjmIz4yhZCua2cLlFkDDLfnYQNKlSY8eo=
85-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f h1:3JVxp1FhQw62xYc/tnA04uPn9WCUTYupWucRQJeTy54=
86-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
85+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91 h1:JSWODgJhcD1Q5YEwYZwtdE+ixjsjJq70AxwKgggwi3g=
86+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
8787
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250225220922-3ead38b7284f h1:FDTENnXi2B+dKRFwRTuuegCJnU+c8tRs7AedDfYChtc=
8888
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:tfMa+ochq7Dyilq9hQr2CEPfPtsj6IUgMmMqi4CWDmo=
8989
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250225220922-3ead38b7284f h1:UTQCI1Ksq1orsJA4d4rsMfNMV+6OxbAZeNEHbhfacRY=

0 commit comments

Comments
 (0)