Skip to content

Commit d408924

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #293 from fmount/topologyref
Switch Topology defaultLabelSelector to lib-common GetLabelSelector
2 parents 25cf788 + 6f5af9a commit d408924

11 files changed

+13
-34
lines changed

‎api/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
require (
66
github.com/onsi/ginkgo/v2 v2.20.1
7-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
7+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
88
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250225220922-3ead38b7284f
99
k8s.io/api v0.29.14
1010
k8s.io/apimachinery v0.29.14

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
7474
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
7575
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe h1:7aL4k0SE0e9PaCiv0K+QNm0qrZoEV334zV7jxv1BVuk=
7676
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
77-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f h1:3JVxp1FhQw62xYc/tnA04uPn9WCUTYupWucRQJeTy54=
78-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
77+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91 h1:JSWODgJhcD1Q5YEwYZwtdE+ixjsjJq70AxwKgggwi3g=
78+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
7979
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250225220922-3ead38b7284f h1:Xd0/QSUkT0kImHoI6Te8BXLU7r4FIiKcQ3FwaUk59VI=
8080
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:u7Zqmyt1WB96KSz8apYltrZV9xlL0tTVYwOk9+6G57k=
8181
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎controllers/designateapi_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -909,10 +909,7 @@ func (r *DesignateAPIReconciler) reconcileNormal(ctx context.Context, instance *
909909
instance, // topologyHandler
910910
instance.Name, // finalizer
911911
&instance.Status.Conditions,
912-
labels.GetSingleLabelSelector(
913-
common.ComponentSelector,
914-
designateapi.Component,
915-
),
912+
labels.GetLabelSelector(serviceLabels),
916913
)
917914
if err != nil {
918915
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/designatebackendbind9_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -583,10 +583,7 @@ func (r *DesignateBackendbind9Reconciler) reconcileNormal(ctx context.Context, i
583583
instance, // topologyHandler
584584
instance.Name, // finalizer
585585
&instance.Status.Conditions,
586-
labels.GetSingleLabelSelector(
587-
common.ComponentSelector,
588-
designatebackendbind9.Component,
589-
),
586+
labels.GetLabelSelector(serviceLabels),
590587
)
591588
if err != nil {
592589
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/designatecentral_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,7 @@ func (r *DesignateCentralReconciler) reconcileNormal(ctx context.Context, instan
621621
instance, // topologyHandler
622622
designatecentral.Component, // finalizer
623623
&instance.Status.Conditions,
624-
labels.GetSingleLabelSelector(
625-
common.ComponentSelector,
626-
designatecentral.Component,
627-
),
624+
labels.GetLabelSelector(serviceLabels),
628625
)
629626
if err != nil {
630627
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/designatemdns_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,10 +640,7 @@ func (r *DesignateMdnsReconciler) reconcileNormal(ctx context.Context, instance
640640
instance, // topologyHandler
641641
instance.Name, // finalizer
642642
&instance.Status.Conditions,
643-
labels.GetSingleLabelSelector(
644-
common.ComponentSelector,
645-
designatemdns.Component,
646-
),
643+
labels.GetLabelSelector(serviceLabels),
647644
)
648645
if err != nil {
649646
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/designateproducer_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,7 @@ func (r *DesignateProducerReconciler) reconcileNormal(ctx context.Context, insta
621621
instance, // topologyHandler
622622
designateproducer.Component, // finalizer
623623
&instance.Status.Conditions,
624-
labels.GetSingleLabelSelector(
625-
common.ComponentSelector,
626-
designateproducer.Component,
627-
),
624+
labels.GetLabelSelector(serviceLabels),
628625
)
629626
if err != nil {
630627
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/designateunbound_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,7 @@ func (r *UnboundReconciler) reconcileNormal(ctx context.Context, instance *desig
395395
instance, // topologyHandler
396396
instance.Name, // finalizer
397397
&instance.Status.Conditions,
398-
labels.GetSingleLabelSelector(
399-
common.ComponentSelector,
400-
designateunbound.Component,
401-
),
398+
labels.GetLabelSelector(serviceLabels),
402399
)
403400
if err != nil {
404401
instance.Status.Conditions.Set(condition.FalseCondition(

‎controllers/designateworker_controller.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,10 +617,7 @@ func (r *DesignateWorkerReconciler) reconcileNormal(ctx context.Context, instanc
617617
instance, // topologyHandler
618618
instance.Name, // finalizer
619619
&instance.Status.Conditions,
620-
labels.GetSingleLabelSelector(
621-
common.ComponentSelector,
622-
designateworker.Component,
623-
),
620+
labels.GetLabelSelector(serviceLabels),
624621
)
625622
if err != nil {
626623
instance.Status.Conditions.Set(condition.FalseCondition(

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/openstack-k8s-operators/designate-operator/api v0.1.1-0.20240807132522-6c2eca7c6bbb
1414
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe
1515
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d
16-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
16+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
1717
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250225220922-3ead38b7284f
1818
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250225210327-7746ba50108f
1919
gopkg.in/yaml.v2 v2.4.0

0 commit comments

Comments
 (0)