Skip to content

Commit 7dda5c4

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1606 from openstack-k8s-operators/openstack-dependency-bump/18.0-fr3
openstack-k8s-operators dependency bump branch: 18.0-fr3
2 parents e5a77f1 + 3844e76 commit 7dda5c4

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
@@ -13,7 +13,7 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250901072146-2be6be08d902
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250903094154-45e4d9dd39a4
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250831203253-9d97a0b7a0c7
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250915130221-636b635428be
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250917183121-f2de869e4953
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250908082125-1e6f74ca0521
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250915091459-b2e35a35d423
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250605082218-a58074898dd7
@@ -27,7 +27,7 @@ require (
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902045753-a1902b8c8c94
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250823133647-0561698fe839
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250911121739-4bf9b6837dca
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250823134211-a2ff384028b8
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072533-191de3a70e25
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
3333
go.uber.org/multierr v1.11.0 // indirect

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250903094154-45e
106106
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250903094154-45e4d9dd39a4/go.mod h1:LHx5TeF+EA3VUngLdh/bDuqaUKH9s6lEv37PvrzUUtM=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250831203253-9d97a0b7a0c7 h1:Pnv3QvKWVFTIUaqssBv5C9+cJFB3Db6UMjvEoKRUyZM=
108108
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250831203253-9d97a0b7a0c7/go.mod h1:wqhkg2OuBRligea7Dz0yJS/jV3esw/qt1h5/PSylI0c=
109-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250915130221-636b635428be h1:DOKIRPDZGhI/qGpQje02OeDng4j1P2+y33D+PpQxkfY=
110-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250915130221-636b635428be/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
109+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250917183121-f2de869e4953 h1:fsP+sK0qdrdF+MHX9N02ubwrFV3h323QKx/eG3w3TvQ=
110+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250917183121-f2de869e4953/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
111111
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250908082125-1e6f74ca0521 h1:BwgznhHZKc6EoCTVXwX85m6xwHVuV96lL6Q+l49SpOY=
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250908082125-1e6f74ca0521/go.mod h1:+cQH5y24NQXLsQSb9+dnhcHatn2YYU9HBBHHhrI9ntg=
113113
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250915091459-b2e35a35d423 h1:Xc8dvSH9LpslHDs0VHUDjXTfcNveUKIZmVrkdFIeRFs=
@@ -138,8 +138,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2024101
138138
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
139139
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250911121739-4bf9b6837dca h1:iA3/ZzW4atiro3imcg31gzdVLMdodDVWknvefXSTo64=
140140
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250911121739-4bf9b6837dca/go.mod h1:iaxkbKWdCQ8lqukq+jfYAqp9/5N4YBH8FEj7czQQtjk=
141-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250823134211-a2ff384028b8 h1:F4YJ41T/KHh/LW7YZGiMMYFLA+qPPG3bHEUQCxjw89I=
142-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250823134211-a2ff384028b8/go.mod h1:lO16WxXtC+9NewjssRDGqwzD4Yexn2xsdTxtKn1sWt4=
141+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072533-191de3a70e25 h1:7yMSeS+cfxGGdzEySF/SZ0hhUBIUxoDjaqnGvzJmvio=
142+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072533-191de3a70e25/go.mod h1:TZEFVgf7CxMOPsOUL8Z2SpmRsoMIn8YFpc93H4WVBdE=
143143
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
144144
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
145145
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎config/operator/manager_operator_images.yaml‎

Lines changed: 2 additions & 2 deletions
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:21212fd7121eeac952281b778b9eec7d909699146d40593120e3336e1e5907e0
2828
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
29-
value: quay.io/openstack-k8s-operators/infra-operator@sha256:727c431441fea427c7ca047f16fc2ba93c04a98d33989b85b58b4dfc73df7030
29+
value: quay.io/openstack-k8s-operators/infra-operator@sha256:882e4fa832e5af2c6d8c55b99948a44c7bcfc48d99a08b36fe0bb35fa3e86caf
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:dcd2893c765f69d05481eb20f3a0244c8abc9fa67f91bdd81532555cedd3acd2
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
@@ -52,6 +52,6 @@ spec:
5252
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
5353
value: quay.io/openstack-k8s-operators/swift-operator@sha256:7c549f735f9064b3706e94b1486fa6a866ded8af7f6263c0408784595fd17f44
5454
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
55-
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:027d01e1dd4d909450534b024405be24997f584c0a87ce78196c8255c9030d18
55+
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:141a82e4684502adce96515fb42bab774da715d0717db6a14f2c4d987d40ffbb
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
5757
value: quay.io/openstack-k8s-operators/test-operator@sha256:759b6819170324524e39ee25d0fe171e6a9a638e62904944a596cfab42481ef7

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250901072146-2be6be08d902
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250903094154-45e4d9dd39a4
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250831203253-9d97a0b7a0c7
21-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250915130221-636b635428be
21+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250917183121-f2de869e4953
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250908082125-1e6f74ca0521
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250915091459-b2e35a35d423
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250605082218-a58074898dd7
@@ -36,7 +36,7 @@ require (
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902045753-a1902b8c8c94
3737
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250823133647-0561698fe839
3838
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250911121739-4bf9b6837dca
39-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250823134211-a2ff384028b8
39+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072533-191de3a70e25
4040
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250901125937-4aac6f709010
4141
github.com/pkg/errors v0.9.1
4242
github.com/rabbitmq/cluster-operator/v2 v2.11.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250903094154-45e
110110
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250903094154-45e4d9dd39a4/go.mod h1:LHx5TeF+EA3VUngLdh/bDuqaUKH9s6lEv37PvrzUUtM=
111111
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250831203253-9d97a0b7a0c7 h1:Pnv3QvKWVFTIUaqssBv5C9+cJFB3Db6UMjvEoKRUyZM=
112112
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250831203253-9d97a0b7a0c7/go.mod h1:wqhkg2OuBRligea7Dz0yJS/jV3esw/qt1h5/PSylI0c=
113-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250915130221-636b635428be h1:DOKIRPDZGhI/qGpQje02OeDng4j1P2+y33D+PpQxkfY=
114-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250915130221-636b635428be/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
113+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250917183121-f2de869e4953 h1:fsP+sK0qdrdF+MHX9N02ubwrFV3h323QKx/eG3w3TvQ=
114+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250917183121-f2de869e4953/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
115115
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250908082125-1e6f74ca0521 h1:BwgznhHZKc6EoCTVXwX85m6xwHVuV96lL6Q+l49SpOY=
116116
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250908082125-1e6f74ca0521/go.mod h1:+cQH5y24NQXLsQSb9+dnhcHatn2YYU9HBBHHhrI9ntg=
117117
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250915091459-b2e35a35d423 h1:Xc8dvSH9LpslHDs0VHUDjXTfcNveUKIZmVrkdFIeRFs=
@@ -148,8 +148,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2024101
148148
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
149149
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250911121739-4bf9b6837dca h1:iA3/ZzW4atiro3imcg31gzdVLMdodDVWknvefXSTo64=
150150
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250911121739-4bf9b6837dca/go.mod h1:iaxkbKWdCQ8lqukq+jfYAqp9/5N4YBH8FEj7czQQtjk=
151-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250823134211-a2ff384028b8 h1:F4YJ41T/KHh/LW7YZGiMMYFLA+qPPG3bHEUQCxjw89I=
152-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250823134211-a2ff384028b8/go.mod h1:lO16WxXtC+9NewjssRDGqwzD4Yexn2xsdTxtKn1sWt4=
151+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072533-191de3a70e25 h1:7yMSeS+cfxGGdzEySF/SZ0hhUBIUxoDjaqnGvzJmvio=
152+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072533-191de3a70e25/go.mod h1:TZEFVgf7CxMOPsOUL8Z2SpmRsoMIn8YFpc93H4WVBdE=
153153
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250901125937-4aac6f709010 h1:cYmPCvXJKkbBOI/22XK3wZHgPoLP5RuZfaLyatqjjzk=
154154
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250901125937-4aac6f709010/go.mod h1:MoBtDQ4FFH6jaTRRdadgEVhH/TjnyrfiOFnsC/wz6Aw=
155155
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎hack/export_operator_related_images.sh‎

Lines changed: 2 additions & 2 deletions
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:24ce2afd2fe5e4e059512e3f9bf364b370fe6301610db19145d2b61c485fbd3a
77
export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:68c3fc0e062f3092e3414c5a466f61f1bdfe55c1c7a057b0d98bf95d48ffd529
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:21212fd7121eeac952281b778b9eec7d909699146d40593120e3336e1e5907e0
9-
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:727c431441fea427c7ca047f16fc2ba93c04a98d33989b85b58b4dfc73df7030
9+
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:882e4fa832e5af2c6d8c55b99948a44c7bcfc48d99a08b36fe0bb35fa3e86caf
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:dcd2893c765f69d05481eb20f3a0244c8abc9fa67f91bdd81532555cedd3acd2
1111
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:850173f34b8af97295420f6ed2ebd714da68f14e9d6b84f2990fbf938ef4ec40
1212
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:cffb9e8e7713d523404cdda41ac756b2b284b741b67f927cb10aad2d45531f07
@@ -19,5 +19,5 @@ export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operat
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:e2dd700b6454f0f1a0a7aae913c5a09462e44c1d8967fddcce641d0d99b3d13d
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
2121
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:7c549f735f9064b3706e94b1486fa6a866ded8af7f6263c0408784595fd17f44
22-
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:027d01e1dd4d909450534b024405be24997f584c0a87ce78196c8255c9030d18
22+
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:141a82e4684502adce96515fb42bab774da715d0717db6a14f2c4d987d40ffbb
2323
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:759b6819170324524e39ee25d0fe171e6a9a638e62904944a596cfab42481ef7

0 commit comments

Comments
 (0)