Skip to content

Switch Topology defaultLabelSelector to lib-common GetLabelSelector #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Feb 27, 2025
Merged

Switch Topology defaultLabelSelector to lib-common GetLabelSelector #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/onsi/ginkgo/v2 v2.20.1
github.com/onsi/gomega v1.34.1
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
k8s.io/api v0.29.14
k8s.io/apimachinery v0.29.14
k8s.io/client-go v0.29.14
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe h1:7aL4k0SE0e9PaCiv0K+QNm0qrZoEV334zV7jxv1BVuk=
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f h1:3JVxp1FhQw62xYc/tnA04uPn9WCUTYupWucRQJeTy54=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f/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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
5 changes: 1 addition & 4 deletions controllers/ironicapi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,10 +885,7 @@ func (r *IronicAPIReconciler) reconcileNormal(ctx context.Context, instance *iro
instance, // topologyHandler
instance.Name, // finalizer
&instance.Status.Conditions,
labels.GetSingleLabelSelector(
common.ComponentSelector,
ironic.APIComponent,
),
labels.GetLabelSelector(serviceLabels),
)
if err != nil {
instance.Status.Conditions.Set(condition.FalseCondition(
Expand Down
5 changes: 1 addition & 4 deletions controllers/ironicconductor_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,10 +706,7 @@ func (r *IronicConductorReconciler) reconcileNormal(ctx context.Context, instanc
instance, // topologyHandler
instance.Name, // finalizer
&instance.Status.Conditions,
labels.GetSingleLabelSelector(
common.ComponentSelector,
ironic.ConductorComponent,
),
labels.GetLabelSelector(serviceLabels),
)
if err != nil {
instance.Status.Conditions.Set(condition.FalseCondition(
Expand Down
5 changes: 1 addition & 4 deletions controllers/ironicinspector_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,10 +663,7 @@ func (r *IronicInspectorReconciler) reconcileStatefulSet(
instance, // topologyHandler
instance.Name, // finalizer
&instance.Status.Conditions,
labels.GetSingleLabelSelector(
common.ComponentSelector,
ironic.InspectorComponent,
),
labels.GetLabelSelector(serviceLabels),
)
if err != nil {
instance.Status.Conditions.Set(condition.FalseCondition(
Expand Down
5 changes: 1 addition & 4 deletions controllers/ironicneutronagent_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,7 @@ func (r *IronicNeutronAgentReconciler) reconcileDeployment(
instance, // topologyHandler
instance.Name, // finalizer
&instance.Status.Conditions,
labels.GetSingleLabelSelector(
common.ComponentSelector,
ironicneutronagent.ServiceName,
),
labels.GetLabelSelector(serviceLabels),
)
if err != nil {
instance.Status.Conditions.Set(condition.FalseCondition(
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe
github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-00010101000000-000000000000
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250227072032-4046ee8c6a91
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250225220922-3ead38b7284f
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250225210327-7746ba50108f
k8s.io/api v0.29.14
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-9
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250225210325-92c2416febbe/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d h1:6bkxDDhulO2Yjpo+s/ro9BCQ5abmrh9nzg05pf4LPs0=
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250225210326-4f4d3cd2801d/go.mod h1:5i9OcPG3dNqjmIz4yhZCua2cLlFkDDLfnYQNKlSY8eo=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f h1:3JVxp1FhQw62xYc/tnA04uPn9WCUTYupWucRQJeTy54=
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f/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.20250225220922-3ead38b7284f h1:FDTENnXi2B+dKRFwRTuuegCJnU+c8tRs7AedDfYChtc=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:tfMa+ochq7Dyilq9hQr2CEPfPtsj6IUgMmMqi4CWDmo=
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250225220922-3ead38b7284f h1:UTQCI1Ksq1orsJA4d4rsMfNMV+6OxbAZeNEHbhfacRY=
Expand Down