Skip to content

Commit 1e5890f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1917 from stuggi/OSPRH-29710
Bump infra-operator to pick up dnsmasq local domain default
2 parents fe7a8d8 + 6c68e75 commit 1e5890f

15 files changed

Lines changed: 46 additions & 51 deletions

‎api/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ const (
7171
DeploymentStageAnnotation = "core.openstack.org/deployment-stage"
7272
// DeploymentStageInfrastructureOnly - Annotation value to pause after infrastructure deployment
7373
DeploymentStageInfrastructureOnly = "infrastructure-only"
74-
75-
// ReconcileTriggerAnnotation - Generic annotation to trigger reconciliation and webhook
76-
// Value is typically a timestamp to ensure annotation changes trigger updates
77-
// Used by controller to trigger UPDATE webhook when needed (e.g., for service name caching)
78-
ReconcileTriggerAnnotation = "openstack.org/reconcile-trigger"
7974
)
8075

8176
// OpenStackControlPlaneSpec defines the desired state of OpenStackControlPlane

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"strings"
2626

2727
keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
28+
common_annotations "github.com/openstack-k8s-operators/lib-common/modules/common/annotations"
2829
"github.com/openstack-k8s-operators/lib-common/modules/common/object"
2930
"github.com/openstack-k8s-operators/lib-common/modules/common/route"
3031
common_webhook "github.com/openstack-k8s-operators/lib-common/modules/common/webhook"
@@ -235,13 +236,12 @@ func (r *OpenStackControlPlane) ValidateUpdate(ctx context.Context, old runtime.
235236
}
236237

237238
// Handle annotation-triggered migration from controller
238-
const reconcileTriggerAnnotation = "openstack.org/reconcile-trigger"
239239
if annotations := r.GetAnnotations(); annotations != nil {
240-
if _, exists := annotations[reconcileTriggerAnnotation]; exists {
240+
if _, exists := annotations[common_annotations.ReconcileTriggerAnnotation]; exists {
241241
openstackcontrolplanelog.Info("Reconcile trigger annotation detected, performing migration",
242242
"instance", r.Name)
243243
r.migrateDeprecatedFields()
244-
delete(annotations, reconcileTriggerAnnotation)
244+
delete(annotations, common_annotations.ReconcileTriggerAnnotation)
245245
r.SetAnnotations(annotations)
246246
}
247247
}
@@ -1141,7 +1141,7 @@ func (r *OpenStackControlPlane) DefaultServices() {
11411141
r.Spec.DNS.Template = &networkv1.DNSMasqSpecCore{}
11421142
}
11431143

1144-
r.Spec.DNS.Template.Default()
1144+
r.Spec.DNS.Template.Default(r.Namespace)
11451145
}
11461146

11471147
// Telemetry

‎api/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ require (
66
github.com/cert-manager/cert-manager v1.16.5
77
github.com/go-playground/validator/v10 v10.30.1
88
github.com/onsi/ginkgo/v2 v2.28.2
9-
github.com/onsi/gomega v1.39.1
9+
github.com/onsi/gomega v1.40.0
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260420052305-96c3a8196933
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260418071314-55ff2fc10b0c
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260418051458-40035e96e631
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260418071313-4af756ba3dac
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260420052550-a562e0ee16fd
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260418053129-fb096ad89dce
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260416122644-5476763a36b6
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260507103247-9c1255698eac
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260420052552-1ba026c533d6
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260420052838-77f94aef5af2
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260417092244-81c71b39e981
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260417092244-81c71b39e981
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260420052836-ac1a4d8a769e
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a
@@ -32,7 +32,7 @@ require (
3232
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3333
github.com/rhobs/observability-operator v1.0.0 // indirect
3434
go.uber.org/multierr v1.11.0 // indirect
35-
go.uber.org/zap v1.27.1 // indirect
35+
go.uber.org/zap v1.28.0 // indirect
3636
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
3737
golang.org/x/tools v0.41.0 // indirect
3838
k8s.io/api v0.31.14

‎api/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
110110
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
111111
github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps=
112112
github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
113-
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
114-
github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
113+
github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc=
114+
github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A=
115115
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U=
116116
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
117117
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260420052305-96c3a8196933 h1:Ks/OYlX2ipYy1XjAezm1955VkmwXoi+fAZlL0X0NDwM=
@@ -126,14 +126,14 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260420052550-a56
126126
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260420052550-a562e0ee16fd/go.mod h1:aA+YEZ3UJCQvJB2X3qOliGVB7EXdImfJ0qV2jUG/L0E=
127127
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260418053129-fb096ad89dce h1:4nqAqtmfoN3VoWtFhHj65iZhi40KNp254/trUuoTD0M=
128128
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260418053129-fb096ad89dce/go.mod h1:ZMH+2206hZgGFjEhC+hhPvU+v6haNaeh5FR1mHylfqw=
129-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260416122644-5476763a36b6 h1:117Gu9HCSu2tAp579WnCJ9QtnslH2qnPB8UFvn8ZpqE=
130-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260416122644-5476763a36b6/go.mod h1:i7l8cihvFktd/LSuyvL2z6OcwauarQGoVhDMePL4VyI=
129+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260507103247-9c1255698eac h1:iALKqINqZR916pWQdjBzi4RtydKcAFAFAMCBXGhnsL0=
130+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260507103247-9c1255698eac/go.mod h1:/S2AN21zV70V1XuL0Of2dCjYWNkKwQSyNI8l/iQVrMs=
131131
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260420052552-1ba026c533d6 h1:thGt9sbYC1L9/UvkeYQQbWGxeiNeaXVckB/0QuBkN78=
132132
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260420052552-1ba026c533d6/go.mod h1:pnFZOetSrSoCdyMyTOUTfsFTdwtGwNFKtaPNNZtyHuw=
133133
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260420052838-77f94aef5af2 h1:h7pTz90cHqX6nTYjYDphuitIfD4UpM9yGnI3AbLdHrY=
134134
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260420052838-77f94aef5af2/go.mod h1:SpO4CL7c5/1HG+61fP6kWhL2+3aqR+5SNatdZueKrz8=
135-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260417092244-81c71b39e981 h1:v1viH0gmNb+AXMg/0GxDcj8VUTdjVLotfOIGrNyMxHk=
136-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260417092244-81c71b39e981/go.mod h1:I/VBXZLdjk8DUGsEbB+Ha72JBFYYntP7Pm2FpEto9K8=
135+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0 h1:vkFvn06Ns9qW4AbzFjFDu8ioosRmhkEZiDrO3DOQhLg=
136+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0/go.mod h1:aIuG6lx3aS0vnXweRNdR/Q0SlfOsLIo0OzrqKK7C6xs=
137137
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260417092244-81c71b39e981 h1:jN3Kvt+RYUTaL9EXeeeIqRXVjqeNF74SuLTDXmi4X2Y=
138138
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260417092244-81c71b39e981/go.mod h1:7yqbVpg0k0vW+kZks+TMU/cd1ovoejyHfVPWcyGYLHI=
139139
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260417092244-81c71b39e981 h1:X3/Gc+i0ZxaROExrpLXonz9EPhftlubFnOK4aSkRLvo=
@@ -203,8 +203,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
203203
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
204204
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
205205
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
206-
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
207-
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
206+
go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
207+
go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
208208
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
209209
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
210210
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=

‎bindata/crds/rabbitmq.openstack.org_rabbitmqvhosts.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
backup.openstack.org/category: controlplane
99
backup.openstack.org/restore: "true"
10-
backup.openstack.org/restore-order: "40"
10+
backup.openstack.org/restore-order: "30"
1111
name: rabbitmqvhosts.rabbitmq.openstack.org
1212
spec:
1313
group: rabbitmq.openstack.org

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
2727
value: quay.io/openstack-k8s-operators/horizon-operator@sha256:705211b1980c1d4c84b284a20b7a6e1662da9912027377e611b682da88dca8ec
2828
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
29-
value: quay.io/openstack-k8s-operators/infra-operator@sha256:508d7cc33da4e4d1bc03e0b0f03dfb8f5875639e9b18354f8aea1c2110224d08
29+
value: quay.io/openstack-k8s-operators/infra-operator@sha256:d8e7e53913119e62b8710c6d7d15cc0d0890ba96a0058ba61b994128cfe6502f
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:d32d5dc44157ad38f7df15630a03a6d0429f98360fc7f798a392d33f8fbf1869
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ require (
1010
github.com/iancoleman/strcase v0.3.0
1111
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
1212
github.com/onsi/ginkgo/v2 v2.28.2
13-
github.com/onsi/gomega v1.39.1
13+
github.com/onsi/gomega v1.40.0
1414
github.com/openshift/api v3.9.0+incompatible
1515
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260420052305-96c3a8196933
1616
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260418071314-55ff2fc10b0c
1717
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260418051458-40035e96e631
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260418071313-4af756ba3dac
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260420052550-a562e0ee16fd
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260418053129-fb096ad89dce
21-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260416122644-5476763a36b6
21+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260507103247-9c1255698eac
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260420052552-1ba026c533d6
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260420052838-77f94aef5af2
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20260417092244-81c71b39e981
2525
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260417092244-81c71b39e981
26-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260417092244-81c71b39e981
26+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0
2727
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260417092244-81c71b39e981
2828
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20260417092244-81c71b39e981
2929
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260420052836-ac1a4d8a769e
@@ -41,7 +41,7 @@ require (
4141
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260414124111-458e17672b3c
4242
github.com/pkg/errors v0.9.1
4343
github.com/stretchr/testify v1.11.1
44-
go.uber.org/zap v1.27.1
44+
go.uber.org/zap v1.28.0
4545
gopkg.in/yaml.v3 v3.0.1
4646
k8s.io/api v0.31.14
4747
k8s.io/apiextensions-apiserver v0.33.2

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
134134
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
135135
github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps=
136136
github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
137-
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
138-
github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
137+
github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc=
138+
github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A=
139139
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U=
140140
github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
141141
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260420052305-96c3a8196933 h1:Ks/OYlX2ipYy1XjAezm1955VkmwXoi+fAZlL0X0NDwM=
@@ -150,8 +150,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260420052550-a56
150150
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260420052550-a562e0ee16fd/go.mod h1:aA+YEZ3UJCQvJB2X3qOliGVB7EXdImfJ0qV2jUG/L0E=
151151
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260418053129-fb096ad89dce h1:4nqAqtmfoN3VoWtFhHj65iZhi40KNp254/trUuoTD0M=
152152
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260418053129-fb096ad89dce/go.mod h1:ZMH+2206hZgGFjEhC+hhPvU+v6haNaeh5FR1mHylfqw=
153-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260416122644-5476763a36b6 h1:117Gu9HCSu2tAp579WnCJ9QtnslH2qnPB8UFvn8ZpqE=
154-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260416122644-5476763a36b6/go.mod h1:i7l8cihvFktd/LSuyvL2z6OcwauarQGoVhDMePL4VyI=
153+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260507103247-9c1255698eac h1:iALKqINqZR916pWQdjBzi4RtydKcAFAFAMCBXGhnsL0=
154+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260507103247-9c1255698eac/go.mod h1:/S2AN21zV70V1XuL0Of2dCjYWNkKwQSyNI8l/iQVrMs=
155155
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260420052552-1ba026c533d6 h1:thGt9sbYC1L9/UvkeYQQbWGxeiNeaXVckB/0QuBkN78=
156156
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260420052552-1ba026c533d6/go.mod h1:pnFZOetSrSoCdyMyTOUTfsFTdwtGwNFKtaPNNZtyHuw=
157157
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260420052838-77f94aef5af2 h1:h7pTz90cHqX6nTYjYDphuitIfD4UpM9yGnI3AbLdHrY=
@@ -160,8 +160,8 @@ github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.202604170
160160
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20260417092244-81c71b39e981/go.mod h1:tXxVkkk8HlATwTmDA5RTP3b+c8apfuMM15mZ2wW5iNs=
161161
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260417092244-81c71b39e981 h1:G0YU5B6AhXDy/46urlNjz6tMXmHGDdoslgucTIN3F30=
162162
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20260417092244-81c71b39e981/go.mod h1:GzD7Jc5o98ptJ97DSjhC0CQ6OiTP0PB/2qJqxYGcOH8=
163-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260417092244-81c71b39e981 h1:v1viH0gmNb+AXMg/0GxDcj8VUTdjVLotfOIGrNyMxHk=
164-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260417092244-81c71b39e981/go.mod h1:I/VBXZLdjk8DUGsEbB+Ha72JBFYYntP7Pm2FpEto9K8=
163+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0 h1:vkFvn06Ns9qW4AbzFjFDu8ioosRmhkEZiDrO3DOQhLg=
164+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260506154724-30a976ba8ef0/go.mod h1:aIuG6lx3aS0vnXweRNdR/Q0SlfOsLIo0OzrqKK7C6xs=
165165
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260417092244-81c71b39e981 h1:jN3Kvt+RYUTaL9EXeeeIqRXVjqeNF74SuLTDXmi4X2Y=
166166
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260417092244-81c71b39e981/go.mod h1:7yqbVpg0k0vW+kZks+TMU/cd1ovoejyHfVPWcyGYLHI=
167167
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260417092244-81c71b39e981 h1:X3/Gc+i0ZxaROExrpLXonz9EPhftlubFnOK4aSkRLvo=
@@ -266,8 +266,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
266266
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
267267
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
268268
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
269-
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
270-
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
269+
go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
270+
go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
271271
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
272272
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
273273
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-
66
export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:c6c51902eae4064427040a648a3172b2a2663ed75ba5fe65bf4f5ea20ff4b983
77
export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:051fb60096064551502a9e69bb1b54f4303e7941ceb91cebdb12f24aa12bc301
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:705211b1980c1d4c84b284a20b7a6e1662da9912027377e611b682da88dca8ec
9-
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:508d7cc33da4e4d1bc03e0b0f03dfb8f5875639e9b18354f8aea1c2110224d08
9+
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:d8e7e53913119e62b8710c6d7d15cc0d0890ba96a0058ba61b994128cfe6502f
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:d32d5dc44157ad38f7df15630a03a6d0429f98360fc7f798a392d33f8fbf1869
1111
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:dee0da68f43b117f55bcf0d5bf224deba7845cd3058eb7b6f49d757d96829f2b
1212
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:4a1978fcd77a62c0ee127dfc3c75b5a5273b871aac52c60ad1a0cef46d004acf

‎internal/controller/core/openstackcontrolplane_controller.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
3636
ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
3737
keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
38+
"github.com/openstack-k8s-operators/lib-common/modules/common/annotations"
3839
"github.com/openstack-k8s-operators/lib-common/modules/common/backup"
3940
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
4041
common_helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
@@ -487,7 +488,7 @@ func (r *OpenStackControlPlaneReconciler) reconcileNormal(ctx context.Context, i
487488
ctrlResult, err := webhook.EnsureWebhookTrigger(
488489
ctx,
489490
instance,
490-
openstack.ReconcileTriggerAnnotation,
491+
annotations.ReconcileTriggerAnnotation,
491492
"messaging bus migration",
492493
helper.GetLogger(),
493494
5*time.Minute,

0 commit comments

Comments
 (0)