Skip to content

Commit 4ed90c4

Browse files
lmiccinilmiccini
committed
single if loop to init messagingBus from deprecated field and defaulting
1 parent a494e55 commit 4ed90c4

24 files changed

Lines changed: 418 additions & 109 deletions

‎api/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,11 @@ spec:
705705
default: 60
706706
minimum: 10
707707
type: integer
708+
auth:
709+
properties:
710+
applicationCredentialSecret:
711+
type: string
712+
type: object
708713
cinderAPI:
709714
properties:
710715
customServiceConfig:

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.
146146

147147
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b
148148

149-
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976
149+
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260202135636-cac3f48d9aa2
150150

151151
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6
152152

@@ -168,6 +168,6 @@ replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lm
168168

169169
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348
170170

171-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769
171+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260202133001-8d290e538966
172172

173173
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84

‎api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
9292
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
9393
github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b h1:wmMT88+pB4Ro+oCQUlxfDFwwyehglomlTbToYZOkMbc=
9494
github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b/go.mod h1:KQnoNfCO5HHB/P6MAOE2u9V1wQbQxy5n51p8W7Dki4E=
95-
github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976 h1:LDwPjOr/y/WVgWJUhb1edilH9EV06NtsEjieBsG3490=
96-
github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976/go.mod h1:EzMRjjhQf66iBj1XW+87MTohQttxkVh/u0PnhKR/RQI=
95+
github.com/lmiccini/cinder-operator/api v0.0.0-20260202135636-cac3f48d9aa2 h1:1rBuX9SysikAn2x4g3ge2UnQugCy2GLXANz12uOApaQ=
96+
github.com/lmiccini/cinder-operator/api v0.0.0-20260202135636-cac3f48d9aa2/go.mod h1:EzMRjjhQf66iBj1XW+87MTohQttxkVh/u0PnhKR/RQI=
9797
github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6 h1:YdzbZAPGFQYgLhqrOtEJfOCYFwrp6uvKTom5er5QaZI=
9898
github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6/go.mod h1:2tyAJhSJSiGGG0NJqqvbh64EmVCCVKNZDqkWm/KdBZA=
9999
github.com/lmiccini/glance-operator/api v0.0.0-20260202091739-732301c2f4bd h1:eNA9FvD1WvsuPb8UiRMEUAwG8kzHApe4VycfB9TKmtU=
@@ -114,8 +114,8 @@ github.com/lmiccini/octavia-operator/api v0.0.0-20260131142608-b5b99abd4e39 h1:J
114114
github.com/lmiccini/octavia-operator/api v0.0.0-20260131142608-b5b99abd4e39/go.mod h1:U+xQIGQ6U3F+plwX3QTG1x/D6+tk/16h91/YbHPFRGU=
115115
github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348 h1:exjRSuygiwCeReaRVw0560CqQI4V2kwXEJ6j2ZVThl8=
116116
github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348/go.mod h1:cQmm3SMOGD5AEsN8d7eF99c6LPgRkWEEBAY4K6ZHbs8=
117-
github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769 h1:uRYcvNSU1EpoWolpjHNZHTxjkEcHY7V3Kwv58ncCHLg=
118-
github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
117+
github.com/lmiccini/telemetry-operator/api v0.0.0-20260202133001-8d290e538966 h1:MBDQzWa6DQ7lgCwmK0EkoChmbDtxKs4iPVw8WrblQp8=
118+
github.com/lmiccini/telemetry-operator/api v0.0.0-20260202133001-8d290e538966/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
119119
github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84 h1:S+08wuvnv0FntOhj6Bci6QP7v8/46iV569v9jjmdqCc=
120120
github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84/go.mod h1:XEJp64OcVDbT9G1gHowBBruWcZngWN4C5Z8UgpOoqvk=
121121
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=

‎bindata/crds/cinder.openstack.org_cinders.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ spec:
5353
description: APITimeout for HAProxy, Apache, and rpc_response_timeout
5454
minimum: 10
5555
type: integer
56+
auth:
57+
description: Auth - Parameters related to authentication
58+
properties:
59+
applicationCredentialSecret:
60+
description: ApplicationCredentialSecret - Secret containing Application
61+
Credential ID and Secret
62+
type: string
63+
type: object
5664
cinderAPI:
5765
description: CinderAPI - Spec definition for the API service of this
5866
Cinder deployment

‎bindata/crds/crds.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,11 @@ spec:
970970
default: 60
971971
minimum: 10
972972
type: integer
973+
auth:
974+
properties:
975+
applicationCredentialSecret:
976+
type: string
977+
type: object
973978
cinderAPI:
974979
properties:
975980
customServiceConfig:

‎bindata/crds/telemetry.openstack.org_cloudkitties.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -808,10 +808,6 @@ spec:
808808
type: string
809809
description: Map of hashes to track e.g. job status
810810
type: object
811-
notificationsURLSecret:
812-
description: NotificationsURLSecret - Secret containing RabbitMQ notification
813-
transportURL
814-
type: string
815811
observedGeneration:
816812
description: |-
817813
ObservedGeneration - the most recent generation observed for this service.

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,11 @@ spec:
705705
default: 60
706706
minimum: 10
707707
type: integer
708+
auth:
709+
properties:
710+
applicationCredentialSecret:
711+
type: string
712+
type: object
708713
cinderAPI:
709714
properties:
710715
customServiceConfig:

‎config/operator/manager_operator_images.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: RELATED_IMAGE_BARBICAN_OPERATOR_MANAGER_IMAGE_URL
1717
value: quay.io/lmiccini/barbican-operator@sha256:840e391b9a51241176705a421996a17a1433878433ce8720d4ed1a4b69319ccd
1818
- name: RELATED_IMAGE_CINDER_OPERATOR_MANAGER_IMAGE_URL
19-
value: quay.io/lmiccini/cinder-operator@sha256:1009a198bc6c71cd23c16244cc9e561c066a7f3f29c4f1ad027b60a1f73c1817
19+
value: quay.io/lmiccini/cinder-operator@sha256:f2b89a92d76fd91abc62a306cf774f3440648709ac3b3223e2bba524a48d665c
2020
- name: RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL
2121
value: quay.io/lmiccini/designate-operator@sha256:0d329ab746aa36e748f3d236599b186dc9787c63630f91bc2975d7e784d837be
2222
- name: RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL
@@ -52,7 +52,7 @@ spec:
5252
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
5353
value: quay.io/lmiccini/swift-operator@sha256:8f8c3f4484960b48b4aa30b66deb78e54443e5d0a91ce7e34f3cd34675d7eda4
5454
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
55-
value: quay.io/lmiccini/telemetry-operator@sha256:2b7b63bdb08d5b163e2477ca7afc8ca449e5ff6a39cef97f3e63c663e7994c71
55+
value: quay.io/lmiccini/telemetry-operator@sha256:674639c6f9130078d6b5e4bace30435325651c82f3090681562c9cf6655b9576
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
5757
value: quay.io/openstack-k8s-operators/test-operator@sha256:3e01e99d3ca1b6c20b1bb015b00cfcbffc584f22a93dc6fe4019d63b813c0241
5858
- name: RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.
184184

185185
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b
186186

187-
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976
187+
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260202135636-cac3f48d9aa2
188188

189189
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6
190190

@@ -206,6 +206,6 @@ replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lm
206206

207207
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348
208208

209-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769
209+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260202133001-8d290e538966
210210

211211
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
116116
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
117117
github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b h1:wmMT88+pB4Ro+oCQUlxfDFwwyehglomlTbToYZOkMbc=
118118
github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b/go.mod h1:KQnoNfCO5HHB/P6MAOE2u9V1wQbQxy5n51p8W7Dki4E=
119-
github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976 h1:LDwPjOr/y/WVgWJUhb1edilH9EV06NtsEjieBsG3490=
120-
github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976/go.mod h1:EzMRjjhQf66iBj1XW+87MTohQttxkVh/u0PnhKR/RQI=
119+
github.com/lmiccini/cinder-operator/api v0.0.0-20260202135636-cac3f48d9aa2 h1:1rBuX9SysikAn2x4g3ge2UnQugCy2GLXANz12uOApaQ=
120+
github.com/lmiccini/cinder-operator/api v0.0.0-20260202135636-cac3f48d9aa2/go.mod h1:EzMRjjhQf66iBj1XW+87MTohQttxkVh/u0PnhKR/RQI=
121121
github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6 h1:YdzbZAPGFQYgLhqrOtEJfOCYFwrp6uvKTom5er5QaZI=
122122
github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6/go.mod h1:2tyAJhSJSiGGG0NJqqvbh64EmVCCVKNZDqkWm/KdBZA=
123123
github.com/lmiccini/glance-operator/api v0.0.0-20260202091739-732301c2f4bd h1:eNA9FvD1WvsuPb8UiRMEUAwG8kzHApe4VycfB9TKmtU=
@@ -138,8 +138,8 @@ github.com/lmiccini/octavia-operator/api v0.0.0-20260131142608-b5b99abd4e39 h1:J
138138
github.com/lmiccini/octavia-operator/api v0.0.0-20260131142608-b5b99abd4e39/go.mod h1:U+xQIGQ6U3F+plwX3QTG1x/D6+tk/16h91/YbHPFRGU=
139139
github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348 h1:exjRSuygiwCeReaRVw0560CqQI4V2kwXEJ6j2ZVThl8=
140140
github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348/go.mod h1:cQmm3SMOGD5AEsN8d7eF99c6LPgRkWEEBAY4K6ZHbs8=
141-
github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769 h1:uRYcvNSU1EpoWolpjHNZHTxjkEcHY7V3Kwv58ncCHLg=
142-
github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
141+
github.com/lmiccini/telemetry-operator/api v0.0.0-20260202133001-8d290e538966 h1:MBDQzWa6DQ7lgCwmK0EkoChmbDtxKs4iPVw8WrblQp8=
142+
github.com/lmiccini/telemetry-operator/api v0.0.0-20260202133001-8d290e538966/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
143143
github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84 h1:S+08wuvnv0FntOhj6Bci6QP7v8/46iV569v9jjmdqCc=
144144
github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84/go.mod h1:XEJp64OcVDbT9G1gHowBBruWcZngWN4C5Z8UgpOoqvk=
145145
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=

0 commit comments

Comments
 (0)