Skip to content

Commit 6a824ff

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1461 from openstack-k8s-operators/openstack-dependency-bump/18.0-fr2
openstack-k8s-operators dependency bump branch: 18.0-fr2
2 parents c944203 + 63e1416 commit 6a824ff

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ require (
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250520115632-cc1e567c9fc7
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250429142319-453fcb22aa51
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51
21-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250512100019-093e4e1761d5
21+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250526102308-6ad1d889fc1b
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250512070835-cee940f15bf8
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250520115348-cf6310689e58
2424
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250520124107-b6a870724e0f
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250520065326-7786251e5dfb
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250513053454-0e15fa647f5e
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250515082924-91a4e95349ad
2828
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250524073251-0e658ae71e49
29-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250505154423-cbdc523702ac
29+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250526102307-07572d07567f
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250324113602-5517274b6007
3131
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
3232
github.com/rhobs/observability-operator v0.3.1 // indirect

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.2025042
118118
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250429142319-453fcb22aa51/go.mod h1:GJhNMXs8MN+UFyas74fecnEVZ9vhxn7nCAWQfmrdoLM=
119119
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51 h1:JqZMUVRkMb84pgiQzG1DOBHuIFvtg0UMB3zsDEKrpUs=
120120
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
121-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250512100019-093e4e1761d5 h1:JIl/W2mKafq7Z9ZZJ67t8vQIDAYbTObKKCVa26XgfTU=
122-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250512100019-093e4e1761d5/go.mod h1:jMf2BeqNiZQ17PPPlcK0rDYPdJdzg+EU0ahs9eORZi8=
121+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250526102308-6ad1d889fc1b h1:PDrwhTcktpkc5oRrR3kRa2qz2tG0PfUTaEhZrCL2yxs=
122+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250526102308-6ad1d889fc1b/go.mod h1:jMf2BeqNiZQ17PPPlcK0rDYPdJdzg+EU0ahs9eORZi8=
123123
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250512070835-cee940f15bf8 h1:+eGbUGCNtlFnkZEYbuNvZ95sc/axO75xhbjZujjqzRg=
124124
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250512070835-cee940f15bf8/go.mod h1:oygF3dWLbczrRcpXjPifLkb6OT9/2aI/9h+NtYyUc0c=
125125
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250520115348-cf6310689e58 h1:Mk7zVm3Ok3yHFRWV0Pu7QLfNLPIlVbDNJlf2ebNutu8=
@@ -136,8 +136,8 @@ github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.2025052407325
136136
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250524073251-0e658ae71e49/go.mod h1:vh2ecFcxuQcWFAXwuxBKJEBeFGZ57oDVtggZLlDdt88=
137137
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 h1:/7SnnHfGCH/dwuZFNUx54zw4cnwv2w6hjONq16aoowM=
138138
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
139-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250505154423-cbdc523702ac h1:qE4upyK0J03wnwc5U6u66WwxvUJrRHDX+vsDGzMiY3U=
140-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250505154423-cbdc523702ac/go.mod h1:wAyYC6e+cln6wcd+pUgHQZ1cAZ+ar873FfhaqMpbPyM=
139+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250526102307-07572d07567f h1:fB0EfS6DhM5no3oumyifnQYWU0EAIuY5Ud2urGETMvs=
140+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250526102307-07572d07567f/go.mod h1:OwbHe/rVqbSlHFqn13Jrh7b3ZpCW/XM+25zQw6hGH9Q=
141141
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250324113602-5517274b6007 h1:okSIp7Kk5AQLHy+DqbIR5YKb79PDDikWHaL2jUE/dvo=
142142
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250324113602-5517274b6007/go.mod h1:FdyE/XKRDmLAr1jnG14dvqlC4b5vbgxkCmKmAxbHRuM=
143143
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎config/operator/manager_operator_images.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
3333
value: quay.io/openstack-k8s-operators/keystone-operator@sha256:8be0aae841d1954015a65f84a3516cda807df51e787165bcace42904fcd9de96
3434
- name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
35-
value: quay.io/openstack-k8s-operators/manila-operator@sha256:bf630e350b4111e9698cf58b4548e393cebdfef07188190646c2880b673529cc
35+
value: quay.io/openstack-k8s-operators/manila-operator@sha256:36d5f4b9a0bb3982efc23400f2db6026127f9a8a8e8caf1ff5a0e16744c56100
3636
- name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL
3737
value: quay.io/openstack-k8s-operators/mariadb-operator@sha256:599e1d9c8313daad5e9353106d4a11d71f60468ea1d63b3b9368b6104379f65b
3838
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL
@@ -50,7 +50,7 @@ spec:
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
5151
value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
5252
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
53-
value: quay.io/openstack-k8s-operators/swift-operator@sha256:480579ee9c82580dd82d3e604f49145bdbca4977d381f70baf696a0a7fdd78e4
53+
value: quay.io/openstack-k8s-operators/swift-operator@sha256:d892386f9055cd0f3a05e7840c91126698f6efd31f02180ad51205d6967c0c79
5454
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
5555
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:b621a2161ed2647d47d802d1ce0d067e2c87cc669f60cbb1a242287df7ced766
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250429142319-453fcb22aa51
2727
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51
2828
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250429142319-453fcb22aa51
29-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250512100019-093e4e1761d5
29+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250526102308-6ad1d889fc1b
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250512070835-cee940f15bf8
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250520115348-cf6310689e58
3232
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250520124107-b6a870724e0f
@@ -35,7 +35,7 @@ require (
3535
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-00010101000000-000000000000
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250515082924-91a4e95349ad
3737
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250524073251-0e658ae71e49
38-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250505154423-cbdc523702ac
38+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250526102307-07572d07567f
3939
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250324113602-5517274b6007
4040
github.com/openstack-k8s-operators/test-operator/api v0.6.0
4141
github.com/pkg/errors v0.9.1

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.202504291
128128
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250429142319-453fcb22aa51/go.mod h1:5+v92XC/PRATIiBrhNLEpJ+T4R9JpxBCgRP6QvbfwgE=
129129
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250429142319-453fcb22aa51 h1:RCcV3JuKz0c6MI2DhFb2trhdGI5gQRHCJ3YEwLUIyGg=
130130
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250429142319-453fcb22aa51/go.mod h1:oKvVb28i6wwBR5uQO2B2KMzZnCFTPCUCj31c5Zvz2lo=
131-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250512100019-093e4e1761d5 h1:JIl/W2mKafq7Z9ZZJ67t8vQIDAYbTObKKCVa26XgfTU=
132-
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250512100019-093e4e1761d5/go.mod h1:jMf2BeqNiZQ17PPPlcK0rDYPdJdzg+EU0ahs9eORZi8=
131+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250526102308-6ad1d889fc1b h1:PDrwhTcktpkc5oRrR3kRa2qz2tG0PfUTaEhZrCL2yxs=
132+
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250526102308-6ad1d889fc1b/go.mod h1:jMf2BeqNiZQ17PPPlcK0rDYPdJdzg+EU0ahs9eORZi8=
133133
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250512070835-cee940f15bf8 h1:+eGbUGCNtlFnkZEYbuNvZ95sc/axO75xhbjZujjqzRg=
134134
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250512070835-cee940f15bf8/go.mod h1:oygF3dWLbczrRcpXjPifLkb6OT9/2aI/9h+NtYyUc0c=
135135
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250520115348-cf6310689e58 h1:Mk7zVm3Ok3yHFRWV0Pu7QLfNLPIlVbDNJlf2ebNutu8=
@@ -146,8 +146,8 @@ github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.2025052407325
146146
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250524073251-0e658ae71e49/go.mod h1:vh2ecFcxuQcWFAXwuxBKJEBeFGZ57oDVtggZLlDdt88=
147147
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 h1:/7SnnHfGCH/dwuZFNUx54zw4cnwv2w6hjONq16aoowM=
148148
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
149-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250505154423-cbdc523702ac h1:qE4upyK0J03wnwc5U6u66WwxvUJrRHDX+vsDGzMiY3U=
150-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250505154423-cbdc523702ac/go.mod h1:wAyYC6e+cln6wcd+pUgHQZ1cAZ+ar873FfhaqMpbPyM=
149+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250526102307-07572d07567f h1:fB0EfS6DhM5no3oumyifnQYWU0EAIuY5Ud2urGETMvs=
150+
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250526102307-07572d07567f/go.mod h1:OwbHe/rVqbSlHFqn13Jrh7b3ZpCW/XM+25zQw6hGH9Q=
151151
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250324113602-5517274b6007 h1:okSIp7Kk5AQLHy+DqbIR5YKb79PDDikWHaL2jUE/dvo=
152152
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250324113602-5517274b6007/go.mod h1:FdyE/XKRDmLAr1jnG14dvqlC4b5vbgxkCmKmAxbHRuM=
153153
github.com/openstack-k8s-operators/test-operator/api v0.6.0 h1:WByBYqXpjr3RwpmavSFDquIojrKfsViZH2iIKjQjhzQ=

‎hack/export_operator_related_images.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
99
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:13ca77a70ce7d54e15c9ba4e51cb9e20444baf073711d2df1a74965ec8a165c7
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:30465f234a66b5497815482477a854f5ad9c08fd38abccdd3aa90478d9a14314
1111
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:8be0aae841d1954015a65f84a3516cda807df51e787165bcace42904fcd9de96
12-
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:bf630e350b4111e9698cf58b4548e393cebdfef07188190646c2880b673529cc
12+
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:36d5f4b9a0bb3982efc23400f2db6026127f9a8a8e8caf1ff5a0e16744c56100
1313
export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/mariadb-operator@sha256:599e1d9c8313daad5e9353106d4a11d71f60468ea1d63b3b9368b6104379f65b
1414
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:201617072f36379ed1be7903217283cddbba41da159e895ae79a3733af11d550
1515
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:92c029f04d0ab00a88d23627094016dd1dbdbbf929ef7f0a47fdf69813b4dc66
@@ -18,6 +18,6 @@ export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/open
1818
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:ef34de008512ad93f65716165fae705360bb48907e799d981cef579208b6343c
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:3f58b1357f448bb6dff45cfa9aa6543f9d2b5a669b53836c311ee190f74c95b0
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
21-
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:480579ee9c82580dd82d3e604f49145bdbca4977d381f70baf696a0a7fdd78e4
21+
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:d892386f9055cd0f3a05e7840c91126698f6efd31f02180ad51205d6967c0c79
2222
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:b621a2161ed2647d47d802d1ce0d067e2c87cc669f60cbb1a242287df7ced766
2323
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:588fe324441934159c1834fa3c16375808b485af92145387a590a51e31f765fe

0 commit comments

Comments
 (0)