Skip to content

Commit acc7649

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2204 from openstack-k8s-operators/openstack-dependency-bump/18.0-fr7
openstack-k8s-operators dependency bump branch: 18.0-fr7
2 parents 1410ddb + 5c6bc91 commit acc7649

6 files changed

Lines changed: 56 additions & 56 deletions

File tree

‎api/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/onsi/ginkgo/v2 v2.33.0
99
github.com/onsi/gomega v1.43.1
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261025095928-795d4aac149b
11-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260923153654-7535523d36fd
12-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261024112021-a6e0900c2c0a
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261024112020-c033b7cf024b
11+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261031090231-f58ae0940a25
12+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261026093100-2b7c07fc4e86
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261031090232-e5bc2c1b4b55
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261025095535-bb417d5117fd
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20261025095536-4e14b8bd8db7
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261020055343-66a79fe1e289
@@ -22,12 +22,12 @@ require (
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261025095536-4d28a9227d9c
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261025095536-0926ce77a6f8
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261017101601-706af87e3727
25-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261025095537-d93b1738bb12
25+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261026093101-3e7cf1bde9ca
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261024024544-78628af1d2bb
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261025113420-8c4a0c93c6d1
28-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261024134214-a63e6b9eda11
29-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261022111610-33888bc0299b
30-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021083455-8ed6bf6493ca
28+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261031091349-2fb50e25854d
29+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261029152859-d373715fd7d3
30+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261027101125-e00f7c6110b8
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v1.0.0 // indirect
3333
go.uber.org/multierr v1.11.0 // indirect

‎api/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 h1:YVY7Mb0AdJBbNgC/Z
136136
github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM=
137137
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261025095928-795d4aac149b h1:j+WRvMDzcfE3mm72QBkXFmbg4zFz574oxT8PBnX/iPQ=
138138
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261025095928-795d4aac149b/go.mod h1:vHbN6CwRrXMS+0B8LJ5SbgK5yMe8zsWI4lBjhXczu5o=
139-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260923153654-7535523d36fd h1:7hFBmlNWgdQHaYDwOOnTlsPS96l1w6tn17hlwuk8SKo=
140-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260923153654-7535523d36fd/go.mod h1:LKz9RwRU1UbO79Ko+Prs9Bw2+oEPg292CjyQ7yMf7gM=
141-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261024112021-a6e0900c2c0a h1:bJ20TWmsrGaL8cFLUVsLFjprkN4YByIyHz+wYYAjcso=
142-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261024112021-a6e0900c2c0a/go.mod h1:MHmEwKjDY1WzkmFZB6DBeQBLI4nz6qZ6ykXGaEJYzV4=
143-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261024112020-c033b7cf024b h1:q58RYZ0NCC1rY8mvTFdjug5T3YrQ0fPNg9TlzcQ7baQ=
144-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261024112020-c033b7cf024b/go.mod h1:aAOAHRf4eMLB3o5pHgBadEzDAzJej/dw38161iwuOnw=
139+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261031090231-f58ae0940a25 h1:jYovZXIMdQb8eUclbluKIdnoa77k4vYZHAniDGCB/6E=
140+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261031090231-f58ae0940a25/go.mod h1:QFLwc8GRV2d3CJwcASHelxkXZLrhC1sUTyqU6mQroPs=
141+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261026093100-2b7c07fc4e86 h1:v7i4Y1agfkS13sbV9fq4fC8viDsoQIBgpVX4WRuLU6c=
142+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261026093100-2b7c07fc4e86/go.mod h1:MHmEwKjDY1WzkmFZB6DBeQBLI4nz6qZ6ykXGaEJYzV4=
143+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261031090232-e5bc2c1b4b55 h1:w8FlrY9Ta0HttKL/3QkYr3vwfVxUle7iuRE4mAZcjJw=
144+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261031090232-e5bc2c1b4b55/go.mod h1:aAOAHRf4eMLB3o5pHgBadEzDAzJej/dw38161iwuOnw=
145145
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261025095535-bb417d5117fd h1:+1FMXk3Q0qftzS8PJHen4daLm/tS4A+6nExGSw41WKE=
146146
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261025095535-bb417d5117fd/go.mod h1:EwTc6eTi3CF+ZhOQFgF82nuR0UvEnEkM0gtQJ8Oy6+Y=
147147
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20261025095536-4e14b8bd8db7 h1:hil82FehC3QG0YZqQtJT/tU7enSNqY0U5utamBJF7q0=
@@ -166,18 +166,18 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261025095536-
166166
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261025095536-0926ce77a6f8/go.mod h1:YzfDfi+6aVyQUCAeGfjb/5tUfrPb3cgEZCkDUPGOnO8=
167167
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261017101601-706af87e3727 h1:U7GUQPsL4QF2vIDVX4i/UWIizIFU9KakPDEG+V3tpA8=
168168
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261017101601-706af87e3727/go.mod h1:1kMeqQU3pO9WhyD5IaVPZq2y+rG37HCTHozZJXwMFSo=
169-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261025095537-d93b1738bb12 h1:m+83PSyjeFrUt4R1lbhUMJUqNM/VBRW4+T4NZj9KipE=
170-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261025095537-d93b1738bb12/go.mod h1:HQVchr8PQ9wwYGqC2aBCLMI2Uoiafe4oXlfwLP4KGQs=
169+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261026093101-3e7cf1bde9ca h1:66/kuYfz7EFj0gfl08DTjOzFUvNsUf2ZkwBaUrTOwGQ=
170+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261026093101-3e7cf1bde9ca/go.mod h1:HQVchr8PQ9wwYGqC2aBCLMI2Uoiafe4oXlfwLP4KGQs=
171171
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261024024544-78628af1d2bb h1:x1YJvtoWvUbsC7l0Q/1du1KVPLSTUCHAAHmh0TLighc=
172172
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261024024544-78628af1d2bb/go.mod h1:5nPYGLH4X7bn/jra9iKFbxEaITqWl9tOu6zpt5ODLzc=
173173
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261025113420-8c4a0c93c6d1 h1:TN0B3YrTyafUfVD6WDL9fEej0tQ2RPOer1aLJXaYv9s=
174174
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261025113420-8c4a0c93c6d1/go.mod h1:KKWoVJl6uTSqyAqP5/t9fCYF3Xf6+VE7tHTnIJMGFyQ=
175-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261024134214-a63e6b9eda11 h1:oW292qRJYheXOPRTh9nVi+MqTHc4JoLGP3tmdi/zZx0=
176-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261024134214-a63e6b9eda11/go.mod h1:zyiJLJ60De9NMkJPSpKlk9QnPCrPgNmIlBgM8BjA+vE=
177-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261022111610-33888bc0299b h1:ERiTMuDsr5AvXirqUzSeYTwgirEQzVj60X+l5PZODBM=
178-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261022111610-33888bc0299b/go.mod h1:jZioag+mpkEyn9C5N+ZYP5vX+wjzQyiwRSFKv1Swq9I=
179-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021083455-8ed6bf6493ca h1:xptfav4ZHn/x1SJvOapWrdndRqHkC/98ImwxUQByq2k=
180-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021083455-8ed6bf6493ca/go.mod h1:0MbbcjzCVOEUanVSxeq1PXhVulTZD8CQTOi0dsd8xfI=
175+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261031091349-2fb50e25854d h1:ILcW8tf7EiOEDj/M2lw3lN+L8sPhS6ksjNG5CFDAPns=
176+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261031091349-2fb50e25854d/go.mod h1:zyiJLJ60De9NMkJPSpKlk9QnPCrPgNmIlBgM8BjA+vE=
177+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261029152859-d373715fd7d3 h1:+psq/EFEMY0FjIdg6yMRsCY7tzMJOiNfp5bKUYbBPbU=
178+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261029152859-d373715fd7d3/go.mod h1:YpCoogCD9gqeZZRh7UyvfpOP77mGjhi7nlTF3Aq6Qgo=
179+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261027101125-e00f7c6110b8 h1:+RX5NQrbvqfZtDFSNBLBoXWtpgSCSX3bKOLqqyuJyZw=
180+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261027101125-e00f7c6110b8/go.mod h1:rBtNC4dmnzlGNQkjcpTuJQCXxea5zwz9QrtrlxyM1RM=
181181
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
182182
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
183183
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎config/operator/manager_operator_images.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ spec:
1616
- name: RELATED_IMAGE_BARBICAN_OPERATOR_MANAGER_IMAGE_URL
1717
value: quay.io/openstack-k8s-operators/barbican-operator@sha256:1d2779e609c79c69cd4e3550f796bee291d1d4978fa22f0e54602f8460e71447
1818
- name: RELATED_IMAGE_CINDER_OPERATOR_MANAGER_IMAGE_URL
19-
value: quay.io/openstack-k8s-operators/cinder-operator@sha256:9148aee5c690bda740c495d51f6820c7caae901a9827d696079ed73b084caf42
19+
value: quay.io/openstack-k8s-operators/cinder-operator@sha256:157a1d5b73ad2bd8c8f7a467e1b8909ba81df18c5221cd6bf6c9736309bd019f
2020
- name: RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL
21-
value: quay.io/openstack-k8s-operators/designate-operator@sha256:507f6db51f8545a66fdf74c899489e15f572a3ab77dcd3a183ce2ed0ddd78564
21+
value: quay.io/openstack-k8s-operators/designate-operator@sha256:d785c8f5405961bee9518b9f3675704d104d4ec979a2e88d633c6fa843011a8b
2222
- name: RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL
23-
value: quay.io/openstack-k8s-operators/glance-operator@sha256:0216fe2518b372b2d79555d77f33e2a6d86bc4571b33a306922e053739d4bed9
23+
value: quay.io/openstack-k8s-operators/glance-operator@sha256:1a08de96889c46a897deade2e52e698ba506e2bd0f3207de1960e411aa35a14f
2424
- name: RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL
2525
value: quay.io/openstack-k8s-operators/heat-operator@sha256:32a8d40ba7b441579fa46cdd822256e37f00ce3dd5d4a1715be225b3a9200413
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
@@ -40,16 +40,16 @@ spec:
4040
- name: RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL
4141
value: quay.io/openstack-k8s-operators/nova-operator@sha256:7ace8825903d2ce2875a49cbb4dd50946b2fee31a86fe5fc9881a6ae1389a511
4242
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
43-
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:4e9e6981e7ab43238eb081f3557423f4e8480c4f90bfd36808c2baf71fcc1640
43+
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:d6efc8a89052e19a4fc0eb4ca03a48c30d04eccaf4a7a8072355b9d15dd535ac
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
4545
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:696d39eddc7d1b1e1558076d458c369b4e6be66dd9e2e91f3b0f70efcc0624d4
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
4747
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:94a396ca827899926e3b9964d748517c0452bb5fe657dff87f8fac65b26ed59f
4848
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
49-
value: quay.io/openstack-k8s-operators/swift-operator@sha256:7c9204c76226a8152c4e89b957f4ea64245b8331d7314f728fe1a761fceb0bc4
49+
value: quay.io/openstack-k8s-operators/swift-operator@sha256:6b7ac689bc02de972322c953632c8b74847ab31756333f757990a79ac297b8a9
5050
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
51-
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:9e670ab49aeb797b7ef982ab4177191e89abbbcd8e7f82154f89a4a643e0beaf
51+
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:18b6d327c47591f734e63f5647489e8713b82b15283afe12664c50014a820a23
5252
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
5353
value: quay.io/openstack-k8s-operators/test-operator@sha256:90f90d5da583d3598bc59dcd809cb0e7eca0fbb7f82319ddb3a64f191c2b1145
5454
- name: RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL
55-
value: quay.io/openstack-k8s-operators/watcher-operator@sha256:aff1af90aa435653e4a70d2e7bdec1430fd1f70e8f95e055d4fe94b0bf3a998b
55+
value: quay.io/openstack-k8s-operators/watcher-operator@sha256:341fca738d6ad490daf65388556429c02b541123608e1c41ae030a1ea3a4dbbb

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/onsi/gomega v1.43.1
1414
github.com/openshift/api v3.9.0+incompatible
1515
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20261025095928-795d4aac149b
16-
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260923153654-7535523d36fd
17-
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261024112021-a6e0900c2c0a
18-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261024112020-c033b7cf024b
16+
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20261031090231-f58ae0940a25
17+
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20261026093100-2b7c07fc4e86
18+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20261031090232-e5bc2c1b4b55
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20261025095535-bb417d5117fd
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20261025095536-4e14b8bd8db7
2121
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261020055343-66a79fe1e289
@@ -30,14 +30,14 @@ require (
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20261025095536-4d28a9227d9c
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20261025095536-0926ce77a6f8
3232
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20261017101601-706af87e3727
33-
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261025095537-d93b1738bb12
33+
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20261026093101-3e7cf1bde9ca
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20261024024544-78628af1d2bb
3535
github.com/openstack-k8s-operators/openstack-operator/api v0.0.0-00010101000000-000000000000
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20261025113420-8c4a0c93c6d1
37-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261024134214-a63e6b9eda11
38-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261022111610-33888bc0299b
37+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20261031091349-2fb50e25854d
38+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20261029152859-d373715fd7d3
3939
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20261024040826-3fede8506a19
40-
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261021083455-8ed6bf6493ca
40+
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20261027101125-e00f7c6110b8
4141
github.com/pkg/errors v0.9.1
4242
github.com/stretchr/testify v1.12.1
4343
go.uber.org/zap v1.28.0

0 commit comments

Comments
 (0)