Skip to content

Commit b0457a5

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1521 from openstack-k8s-operators/openstack-dependency-bump/18.0-fr3
openstack-k8s-operators dependency bump branch: 18.0-fr3
2 parents ea565cf + 4d86491 commit b0457a5

File tree

7 files changed

+19
-16
lines changed

7 files changed

+19
-16
lines changed

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250626075020-dae6f5c33dc9
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623134037-bce8067f284a
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250627145037-aab1156f296e
13-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250623134038-189ddfcdeacf
13+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250703101425-7bb4dc0a75cb
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250623134039-cd9d6c60f812
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250623134040-c52983398998
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250626084237-ff8bcd258e1a
@@ -24,7 +24,7 @@ require (
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250623134046-5ff6412844b1
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250623134046-bab75c6d5715
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623134047-13588826f6d6
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134049-ee16b9218206
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630081913-8ee2ac940c4d
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623134050-97368f870cf2
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250623134050-9b8d74ec10a9
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250626151737-fbabbc4d62d5

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623134037-b
100100
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623134037-bce8067f284a/go.mod h1:UjAj45onUQ4Dqhp2BUN+x5PQQMZIpYFxJyqlofO0Qbo=
101101
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250627145037-aab1156f296e h1:S+CSWzDYknzL4vxRjouyE9uYJIrF6SeYw+D1XrHhjPY=
102102
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250627145037-aab1156f296e/go.mod h1:7ZBMYsL9k0ennWcYNAz+mPHejIIlQEnd74n5H8TRPhg=
103-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250623134038-189ddfcdeacf h1:jmd56k++u93i8Z6e/47AvX02h9FF+eWN9G6SVQMOHqA=
104-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250623134038-189ddfcdeacf/go.mod h1:DbwbZiNqh9MkGvUj47dPbXojq8QiBUPI3Tgbfj5Ynxw=
103+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250703101425-7bb4dc0a75cb h1:DhOzDleQHUs8rLWl++wSes5wajXzrACwcdVsK3j2qXI=
104+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250703101425-7bb4dc0a75cb/go.mod h1:p/CHbKOq10i/RHDMU9kDQxIFtwfd/yhNRCDBhikbEBE=
105105
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250623134039-cd9d6c60f812 h1:cJ4Q0+m3qqvXcGkX6mM8hYOKDaiPa8jUScGXNFCaPtU=
106106
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250623134039-cd9d6c60f812/go.mod h1:vMExlZbEsUE9+OnnjG5Q9BRHZUyDn/DLI6jXEZ/sR+c=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250623134040-c52983398998 h1:eKF/tYHpb8u3LjtRkfDOm3lHdZ9WQ+Lmto5dHT7asxo=
@@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250623134046-
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250623134046-bab75c6d5715/go.mod h1:bwo701L2fifrRvlPeRAW2C/YpPNx4YXrzS/VnQEa8/Y=
131131
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623134047-13588826f6d6 h1:daP8QOk14y9XGCTkyc+A6wiDMWW7u+TZF6tiUnqAIGc=
132132
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623134047-13588826f6d6/go.mod h1:IC6WKXLQF6W7sNwFCLBKK/rmPYufb6aLlbJk7UGuAfs=
133-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134049-ee16b9218206 h1:4MI/o6eNJOM0otCC3MmWpF8hMVyrpdHA0+LG84gfrBg=
134-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134049-ee16b9218206/go.mod h1:JqZcmN8j2PGB/817BKUQue1vBr4DTMkTQYqHj9RGNRg=
133+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630081913-8ee2ac940c4d h1:rWX9ekbnciPCjHmaLNaC0WRwrgIE1+WY/1nm8yOoUcA=
134+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630081913-8ee2ac940c4d/go.mod h1:JqZcmN8j2PGB/817BKUQue1vBr4DTMkTQYqHj9RGNRg=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623134050-97368f870cf2 h1:0CP6gTKB8qZ8gFycsni1SZKzd0VJPRjlyW47JPlHkKs=
136136
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623134050-97368f870cf2/go.mod h1:ZHZ/55O5Wpc1HMCC+pmTOrhFG+t8Ybuw2z0lqrCXg20=
137137
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 h1:/7SnnHfGCH/dwuZFNUx54zw4cnwv2w6hjONq16aoowM=

‎bindata/crds/ovn.openstack.org_ovncontrollers.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ spec:
6464
type: array
6565
enable-chassis-as-gateway:
6666
default: true
67+
description: |-
68+
DEPRECATED: To be removed in the next API version
69+
Any value set to this field is ignored
6770
type: boolean
6871
ovn-bridge:
6972
default: br-int

‎config/operator/manager_operator_images.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
- name: RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL
2121
value: quay.io/openstack-k8s-operators/designate-operator@sha256:986f365be58d672d478baae8a8f86c322c2e6f88b4bc92a3bde3cd5737c5ebe8
2222
- name: RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL
23-
value: quay.io/openstack-k8s-operators/glance-operator@sha256:6add3fd76684175739531cba97ca63e64a5455d6ccbc79ec20008b9fdd68e07b
23+
value: quay.io/openstack-k8s-operators/glance-operator@sha256:3b03c697f66727f31de1e09a21e9bac97feff920ad25e1e5e8b75d8c7aa85bb0
2424
- name: RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL
2525
value: quay.io/openstack-k8s-operators/heat-operator@sha256:e4eb71f5a5e1f406870b0b1b925b44ceded1b2032b3f3ef7ed68fbc68a85bb74
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
@@ -44,7 +44,7 @@ spec:
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
4545
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:a857f1d48b6bb38e77997baf7e7b7a9930aacab912b42ac10d1023d7e4e1dad0
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47-
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:f402890f142fcca3b3cf58e43ae34d78e892f3739fba20ba66e57e13e29e73f8
47+
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:93369e242db21744fed7a1798ef50ba3f0def47c9fc8d648c1768a5fa436db2b
4848
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
4949
value: quay.io/openstack-k8s-operators/placement-operator@sha256:5f4507a37e210852a076aec8fc9db3c79fe82c0ad5e4e8f58b8b6bc604fdcb97
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250626075020-dae6f5c33dc9
1616
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623134037-bce8067f284a
1717
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250627145037-aab1156f296e
18-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250623134038-189ddfcdeacf
18+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250703101425-7bb4dc0a75cb
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250623134039-cd9d6c60f812
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250623134040-c52983398998
2121
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250626084237-ff8bcd258e1a
@@ -33,7 +33,7 @@ require (
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250623134046-bab75c6d5715
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623134047-13588826f6d6
3535
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
36-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134049-ee16b9218206
36+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630081913-8ee2ac940c4d
3737
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623134050-97368f870cf2
3838
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250623134050-9b8d74ec10a9
3939
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250626151737-fbabbc4d62d5

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623134037-b
104104
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250623134037-bce8067f284a/go.mod h1:UjAj45onUQ4Dqhp2BUN+x5PQQMZIpYFxJyqlofO0Qbo=
105105
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250627145037-aab1156f296e h1:S+CSWzDYknzL4vxRjouyE9uYJIrF6SeYw+D1XrHhjPY=
106106
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250627145037-aab1156f296e/go.mod h1:7ZBMYsL9k0ennWcYNAz+mPHejIIlQEnd74n5H8TRPhg=
107-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250623134038-189ddfcdeacf h1:jmd56k++u93i8Z6e/47AvX02h9FF+eWN9G6SVQMOHqA=
108-
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250623134038-189ddfcdeacf/go.mod h1:DbwbZiNqh9MkGvUj47dPbXojq8QiBUPI3Tgbfj5Ynxw=
107+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250703101425-7bb4dc0a75cb h1:DhOzDleQHUs8rLWl++wSes5wajXzrACwcdVsK3j2qXI=
108+
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250703101425-7bb4dc0a75cb/go.mod h1:p/CHbKOq10i/RHDMU9kDQxIFtwfd/yhNRCDBhikbEBE=
109109
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250623134039-cd9d6c60f812 h1:cJ4Q0+m3qqvXcGkX6mM8hYOKDaiPa8jUScGXNFCaPtU=
110110
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250623134039-cd9d6c60f812/go.mod h1:vMExlZbEsUE9+OnnjG5Q9BRHZUyDn/DLI6jXEZ/sR+c=
111111
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250623134040-c52983398998 h1:eKF/tYHpb8u3LjtRkfDOm3lHdZ9WQ+Lmto5dHT7asxo=
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250623134046-
140140
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250623134046-bab75c6d5715/go.mod h1:bwo701L2fifrRvlPeRAW2C/YpPNx4YXrzS/VnQEa8/Y=
141141
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623134047-13588826f6d6 h1:daP8QOk14y9XGCTkyc+A6wiDMWW7u+TZF6tiUnqAIGc=
142142
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250623134047-13588826f6d6/go.mod h1:IC6WKXLQF6W7sNwFCLBKK/rmPYufb6aLlbJk7UGuAfs=
143-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134049-ee16b9218206 h1:4MI/o6eNJOM0otCC3MmWpF8hMVyrpdHA0+LG84gfrBg=
144-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250623134049-ee16b9218206/go.mod h1:JqZcmN8j2PGB/817BKUQue1vBr4DTMkTQYqHj9RGNRg=
143+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630081913-8ee2ac940c4d h1:rWX9ekbnciPCjHmaLNaC0WRwrgIE1+WY/1nm8yOoUcA=
144+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250630081913-8ee2ac940c4d/go.mod h1:JqZcmN8j2PGB/817BKUQue1vBr4DTMkTQYqHj9RGNRg=
145145
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623134050-97368f870cf2 h1:0CP6gTKB8qZ8gFycsni1SZKzd0VJPRjlyW47JPlHkKs=
146146
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250623134050-97368f870cf2/go.mod h1:ZHZ/55O5Wpc1HMCC+pmTOrhFG+t8Ybuw2z0lqrCXg20=
147147
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49 h1:/7SnnHfGCH/dwuZFNUx54zw4cnwv2w6hjONq16aoowM=

‎hack/export_operator_related_images.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
export RELATED_IMAGE_BARBICAN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/barbican-operator@sha256:3379667542bb730a606ec77d93f88723abb407a9f585161059674a7e31b1e8c5
44
export RELATED_IMAGE_CINDER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/cinder-operator@sha256:ae8e69456bce33ce5b18bd22912398229ad04da1090181f5ab2e5a0943944b5c
55
export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/designate-operator@sha256:986f365be58d672d478baae8a8f86c322c2e6f88b4bc92a3bde3cd5737c5ebe8
6-
export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:6add3fd76684175739531cba97ca63e64a5455d6ccbc79ec20008b9fdd68e07b
6+
export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:3b03c697f66727f31de1e09a21e9bac97feff920ad25e1e5e8b75d8c7aa85bb0
77
export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:e4eb71f5a5e1f406870b0b1b925b44ceded1b2032b3f3ef7ed68fbc68a85bb74
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:0ccf6a33a3fa7ed5545ee0e7f3f207c0755ec11eddea581c2f7894a7fa769a76
99
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:ccf3a4b4624bba87f4320629ed9970badb6587076d197e173f99bcca5b2f305f
@@ -15,7 +15,7 @@ export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
1515
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:f3cd3bfc155ff375e0fa71dbd9f7e079621d7b54a1c684586f428a90f31249be
1616
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:ae7c9ee3f8a88ff88abd509d0a8c1aca6bd53c96bbba44d566056eed18bf3dd9
1717
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:a857f1d48b6bb38e77997baf7e7b7a9930aacab912b42ac10d1023d7e4e1dad0
18-
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:f402890f142fcca3b3cf58e43ae34d78e892f3739fba20ba66e57e13e29e73f8
18+
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:93369e242db21744fed7a1798ef50ba3f0def47c9fc8d648c1768a5fa436db2b
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:5f4507a37e210852a076aec8fc9db3c79fe82c0ad5e4e8f58b8b6bc604fdcb97
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:81a3234f96bda51cfed00c80c5a0f48b488ff362659ecb840bfd30b21ca1c576

0 commit comments

Comments
 (0)