Skip to content

Commit 1a33605

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1647 from openstack-k8s-operators/openstack-dependency-bump/main
openstack-k8s-operators dependency bump branch: main
2 parents 836b049 + 42213d3 commit 1a33605

File tree

10 files changed

+83
-8
lines changed

10 files changed

+83
-8
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12065,6 +12065,24 @@ spec:
1206512065
properties:
1206612066
ovnController:
1206712067
properties:
12068+
bondConfiguration:
12069+
additionalProperties:
12070+
properties:
12071+
links:
12072+
default: []
12073+
items:
12074+
type: string
12075+
type: array
12076+
x-kubernetes-list-type: set
12077+
mode:
12078+
default: active-backup
12079+
type: string
12080+
mtu:
12081+
default: 1500
12082+
format: int32
12083+
type: integer
12084+
type: object
12085+
type: object
1206812086
external-ids:
1206912087
default: {}
1207012088
properties:

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20251007102453-c0615f12de18
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251007102453-ebfa5abc85f9
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251007160653-73411ba26222
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251007102452-2237fe83b2ac
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251009064229-83a344ba9732
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251006102217-a0180c9d1d51
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251007103438-307e78eb9c16
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251007210529-9443999b075b

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251007102453-
150150
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251007102453-ebfa5abc85f9/go.mod h1:9hVb6W4F+QOsScCF69O+y0DREQOYZNRHB3pAWNgdr9M=
151151
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251007160653-73411ba26222 h1:6njT8VlvIBKuii7AEQumhqnI8u0dgoYkX8Rf7jcPySw=
152152
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251007160653-73411ba26222/go.mod h1:StWvPTGwPxvaC5T+6qCEFVGlU1/en80J1pYijplyKZE=
153-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251007102452-2237fe83b2ac h1:GqcTTj5fvD4ltxsciXCcUg92mwyJR0NbEJ0/P9ykwqE=
154-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251007102452-2237fe83b2ac/go.mod h1:9A4u8gHLl+PeEfcqweyyIdUGRap3j95oTlkRhw6FDa0=
153+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251009064229-83a344ba9732 h1:n8VE9b+geiFr6z3j6Ys6stT2ntSWDGeB8Pp2odf82fA=
154+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251009064229-83a344ba9732/go.mod h1:9A4u8gHLl+PeEfcqweyyIdUGRap3j95oTlkRhw6FDa0=
155155
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251006102217-a0180c9d1d51 h1:+uy6b+pzHzib8OtjXex+mYsWMZc41P327Lima/TtAOM=
156156
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251006102217-a0180c9d1d51/go.mod h1:tT7pLlledNe6qxzJPmgG4Vt3y8C8hjlUli0rPBeAiz0=
157157
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=

‎bindata/crds/crds.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12231,6 +12231,24 @@ spec:
1223112231
properties:
1223212232
ovnController:
1223312233
properties:
12234+
bondConfiguration:
12235+
additionalProperties:
12236+
properties:
12237+
links:
12238+
default: []
12239+
items:
12240+
type: string
12241+
type: array
12242+
x-kubernetes-list-type: set
12243+
mode:
12244+
default: active-backup
12245+
type: string
12246+
mtu:
12247+
default: 1500
12248+
format: int32
12249+
type: integer
12250+
type: object
12251+
type: object
1223412252
external-ids:
1223512253
default: {}
1223612254
properties:

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,27 @@ spec:
5252
spec:
5353
description: OVNControllerSpec defines the desired state of OVNController
5454
properties:
55+
bondConfiguration:
56+
additionalProperties:
57+
description: Bond defines the configuration of each bond interface
58+
in the deployment
59+
properties:
60+
links:
61+
default: []
62+
items:
63+
type: string
64+
type: array
65+
x-kubernetes-list-type: set
66+
mode:
67+
default: active-backup
68+
type: string
69+
mtu:
70+
default: 1500
71+
format: int32
72+
type: integer
73+
type: object
74+
description: Map of bond names to their configuration
75+
type: object
5576
exporterImage:
5677
description: ExporterImage - Container Image URL for the openstack-network-exporter
5778
metrics daemonset (will be set to environmental default if empty)

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12065,6 +12065,24 @@ spec:
1206512065
properties:
1206612066
ovnController:
1206712067
properties:
12068+
bondConfiguration:
12069+
additionalProperties:
12070+
properties:
12071+
links:
12072+
default: []
12073+
items:
12074+
type: string
12075+
type: array
12076+
x-kubernetes-list-type: set
12077+
mode:
12078+
default: active-backup
12079+
type: string
12080+
mtu:
12081+
default: 1500
12082+
format: int32
12083+
type: integer
12084+
type: object
12085+
type: object
1206812086
external-ids:
1206912087
default: {}
1207012088
properties:

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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:a17fc270857869fd1efe5020b2a1cb8c2abbd838f08de88f3a6a59e8754ec351
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47-
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:551b59e107c9812f7ad7aa06577376b0dcb58ff9498a41d5d5273e60e20ba7e4
47+
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:315e558023b41ac1aa215082096995a03810c5b42910a33b00427ffcac9c6a14
4848
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
4949
value: quay.io/openstack-k8s-operators/placement-operator@sha256:d33c1f507e1f5b9a4bf226ad98917e92101ac66b36e19d35cbe04ae7014f6bff
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251007102453-ebfa5abc85f9
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251007160653-73411ba26222
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.20251007102452-2237fe83b2ac
36+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251009064229-83a344ba9732
3737
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251006102217-a0180c9d1d51
3838
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251007103438-307e78eb9c16
3939
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251007210529-9443999b075b

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251007102453-
160160
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251007102453-ebfa5abc85f9/go.mod h1:9hVb6W4F+QOsScCF69O+y0DREQOYZNRHB3pAWNgdr9M=
161161
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251007160653-73411ba26222 h1:6njT8VlvIBKuii7AEQumhqnI8u0dgoYkX8Rf7jcPySw=
162162
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251007160653-73411ba26222/go.mod h1:StWvPTGwPxvaC5T+6qCEFVGlU1/en80J1pYijplyKZE=
163-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251007102452-2237fe83b2ac h1:GqcTTj5fvD4ltxsciXCcUg92mwyJR0NbEJ0/P9ykwqE=
164-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251007102452-2237fe83b2ac/go.mod h1:9A4u8gHLl+PeEfcqweyyIdUGRap3j95oTlkRhw6FDa0=
163+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251009064229-83a344ba9732 h1:n8VE9b+geiFr6z3j6Ys6stT2ntSWDGeB8Pp2odf82fA=
164+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251009064229-83a344ba9732/go.mod h1:9A4u8gHLl+PeEfcqweyyIdUGRap3j95oTlkRhw6FDa0=
165165
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251006102217-a0180c9d1d51 h1:+uy6b+pzHzib8OtjXex+mYsWMZc41P327Lima/TtAOM=
166166
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251006102217-a0180c9d1d51/go.mod h1:tT7pLlledNe6qxzJPmgG4Vt3y8C8hjlUli0rPBeAiz0=
167167
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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:b2e9acf568a48c28cf2aed6012e432eeeb7d5f0eb11878fc91b62bc34cba10cd
1616
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:09deecf840d38ff6af3c924729cf0a9444bc985848bfbe7c918019b88a6bc4d7
1717
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:a17fc270857869fd1efe5020b2a1cb8c2abbd838f08de88f3a6a59e8754ec351
18-
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:551b59e107c9812f7ad7aa06577376b0dcb58ff9498a41d5d5273e60e20ba7e4
18+
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:315e558023b41ac1aa215082096995a03810c5b42910a33b00427ffcac9c6a14
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:d33c1f507e1f5b9a4bf226ad98917e92101ac66b36e19d35cbe04ae7014f6bff
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2
2121
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:4b4a17fe08ce00e375afaaec6a28835f5c1784f03d11c4558376ac04130f3a9e

0 commit comments

Comments
 (0)