Skip to content

Commit fafe123

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1384 from rabi/node_vlan
Set ctlplaneVlan/ctlplaneGateway in instanceSpec
2 parents 6cfbc39 + 06e9880 commit fafe123

File tree

8 files changed

+53
-46
lines changed

8 files changed

+53
-46
lines changed

‎apis/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ require (
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250301104950-9a202ca63f62
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250303132458-6952fcf52f13
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250304114258-f5fc2ffa57b3
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250228124213-cd63da392f97
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250315090821-34e570d2d5fb
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250228124213-cd63da392f97
2121
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250302155852-69eda4bfb5d3
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250303174417-12dee52aaf2b
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250304114826-556730052875
2424
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250303132459-92f1636bd888
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250302172121-dbb82a196b6c
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250303135758-cdba0925cc95
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250331064629-f00958dd65f8
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250304112628-fa4c66054312
2828
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250302155853-3e53088b1eeb
2929
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250303075553-7708ba479bb4
@@ -34,9 +34,9 @@ require (
3434
go.uber.org/zap v1.27.0 // indirect
3535
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3636
golang.org/x/tools v0.24.0 // indirect
37-
k8s.io/api v0.29.14
38-
k8s.io/apimachinery v0.29.14
39-
k8s.io/client-go v0.29.14
37+
k8s.io/api v0.29.15
38+
k8s.io/apimachinery v0.29.15
39+
k8s.io/client-go v0.29.15
4040
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
4141
sigs.k8s.io/controller-runtime v0.17.6
4242
)
@@ -99,8 +99,8 @@ require (
9999
gopkg.in/inf.v0 v0.9.1 // indirect
100100
gopkg.in/yaml.v2 v2.4.0 // indirect
101101
gopkg.in/yaml.v3 v3.0.1 // indirect
102-
k8s.io/apiextensions-apiserver v0.29.14 // indirect
103-
k8s.io/component-base v0.29.14 // indirect
102+
k8s.io/apiextensions-apiserver v0.29.15 // indirect
103+
k8s.io/component-base v0.29.15 // indirect
104104
k8s.io/klog/v2 v2.120.1 // indirect
105105
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
106106
sigs.k8s.io/gateway-api v1.0.0 // indirect

‎apis/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250303132458-6
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250303132458-6952fcf52f13/go.mod h1:CynoEHrLBq+3emyWXz8TBxPj4ppNmFhBhy7q+3gTlYY=
113113
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250304114258-f5fc2ffa57b3 h1:yAkhxuRR0FWXUVCB3heX+79Cq38rs9U6V293p36atv4=
114114
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250304114258-f5fc2ffa57b3/go.mod h1:5eUEjRPFyDhyJTdKz9xfeNP1OMFiJWy4ejb4tidD6ds=
115-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250228124213-cd63da392f97 h1:3LC66vrXJzGMV/eCdvImosOEL2Cgc2KFJIm2YhfTG3w=
116-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
115+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250315090821-34e570d2d5fb h1:UAFYEHnbyhO0+yymquFmIqxc9QGji9mzreuYrDS1Ev4=
116+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250315090821-34e570d2d5fb/go.mod h1:1CtBP0MQffdjE6buOv5jP2rB3+h7WH0a11lcyrpmxOk=
117117
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250228124213-cd63da392f97 h1:2m8xt9k3FWcnzmq5SxplT0t6v8vvH7LZq3UWK17ygak=
118118
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:tfMa+ochq7Dyilq9hQr2CEPfPtsj6IUgMmMqi4CWDmo=
119119
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250228124213-cd63da392f97 h1:xQ7/UNSPVRzwQq7wYG9i87dCCQztgmz1kqn2sy6HhlQ=
@@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250303132459-92f
128128
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250303132459-92f1636bd888/go.mod h1:92KQ1xUJQRS4oxCaZ8jkdUju7gypr/1HpOMPOQRmGo4=
129129
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250302172121-dbb82a196b6c h1:7iiMXpX0eAuCzfYaLDPrsinP33cf6Hvzf/ACL2LYdmw=
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250302172121-dbb82a196b6c/go.mod h1:XyWFsi3Fdes6BSqNA93ysZ3VZgYPDMVLC7RoRhuurXA=
131-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250303135758-cdba0925cc95 h1:nSEOQB0AIViazXkSyiTIPMrAA5BnreLtHPPXkDoLFts=
132-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250303135758-cdba0925cc95/go.mod h1:ZVtezoCaIO4u2Cfllwr3wxKi0zWiTl/u/LvVC+KecYQ=
131+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250331064629-f00958dd65f8 h1:GjjHq6O2LRg3PM9yCTqOrXgRXhadV80g0Nl3ss2i+Zg=
132+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250331064629-f00958dd65f8/go.mod h1:RZj8UXrq5Sg6a8SP3R4kzpQbHxM1bBCYPc3ecDfuQPQ=
133133
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250304112628-fa4c66054312 h1:GI6b6HD93wYKl1VzjS2qA+ATt/DQqOwkVh6UIi5gh1E=
134134
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250304112628-fa4c66054312/go.mod h1:6JU/Slf2vtZpGBljlBTbOSVVqpksMd+dM36G67Kqap0=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250302155853-3e53088b1eeb h1:GM+jTUPY+KZpT9u/lGuFziNiL3QKaMbmECZ9oOrMJfo=
@@ -255,16 +255,16 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
255255
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
256256
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
257257
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
258-
k8s.io/api v0.29.14 h1:JWFh5ufowH3Y6tCgEzY3URVJHb27f0tEDEej0nCjWDw=
259-
k8s.io/api v0.29.14/go.mod h1:IV8YqKxMm8JGLBLlHM13Npn5lCITH10XYipWEW+YEOQ=
260-
k8s.io/apiextensions-apiserver v0.29.14 h1:gw9WXrZJPu5kpI1UC+Wf8BVe9PWwRUB/UZXU8VzBsq4=
261-
k8s.io/apiextensions-apiserver v0.29.14/go.mod h1:TJ51W+HKW2XqTtAsEFOz1/OohsMtekbKaTXh8ldioL4=
262-
k8s.io/apimachinery v0.29.14 h1:IDhwnGNCp836SLOwW1SoEfFNV77wxIklhxeAHX9vmSo=
263-
k8s.io/apimachinery v0.29.14/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
264-
k8s.io/client-go v0.29.14 h1:OSnzZ9DClaFRgl3zMAY2kGZhNjdGJkEb+RDz+MW2h6k=
265-
k8s.io/client-go v0.29.14/go.mod h1:XtZt5n5UxKfPJ+sCoTPcEavWgZbLFFxMnAFFRQGK1RY=
266-
k8s.io/component-base v0.29.14 h1:SF1DWN7bc2VloJ/ysegGoi/aHnopEo81aw9CslhqXIw=
267-
k8s.io/component-base v0.29.14/go.mod h1:FoK1PHhFTaEQVvQLw29/Uyfd8Ug0qUKHrUcXIXJ1VxI=
258+
k8s.io/api v0.29.15 h1:QxPcAheYujeBwkdiE0vMyKkAtqUq5YNyXVqimT+me44=
259+
k8s.io/api v0.29.15/go.mod h1:16duIp2ez6GiLPq1g8XtZNIkw6hJpIitpxZSvv0dZ6E=
260+
k8s.io/apiextensions-apiserver v0.29.15 h1:XI5axgsWqMlIIgpHbcz5vPjk06i3ibHv5FUdSfdtQLU=
261+
k8s.io/apiextensions-apiserver v0.29.15/go.mod h1:6ZU61z32I8WUwbBTPIANUesTj5G40sZek0ojmeoMJI8=
262+
k8s.io/apimachinery v0.29.15 h1:aLc0wghElkdnTO7TMVTxTrifoXah1lqRL8s6szDHGbg=
263+
k8s.io/apimachinery v0.29.15/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
264+
k8s.io/client-go v0.29.15 h1:zCBOXKCtz9Hl8boKUGs8zbtZEP6pc7O8Ov3ma+gnS6o=
265+
k8s.io/client-go v0.29.15/go.mod h1:xPy0D3p4sonPhZhI3QoYo4m7oLKoPjFf4vYF9oxoxNM=
266+
k8s.io/component-base v0.29.15 h1:CvmXXTDyk43FDaiJ/Rp+yWFjw6hkUI2t7mIJUrK5j00=
267+
k8s.io/component-base v0.29.15/go.mod h1:jH/sbuvmXew2Fz2iIKNMeNw8o/d1KR9tAg6uekQKnVk=
268268
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
269269
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
270270
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 h1:qVoMaQV5t62UUvHe16Q3eb2c5HPzLHYzsi0Tu/xLndo=

‎bindata/crds/baremetal.openstack.org_openstackbaremetalsets.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ spec:
8383
ctlPlaneIP:
8484
description: CtlPlaneIP - Control Plane IP in CIDR notation
8585
type: string
86+
ctlplaneGateway:
87+
description: 'CtlplaneGateway - IP of gateway for ctrlplane
88+
network (TODO: acquire this is another manner?)'
89+
type: string
90+
ctlplaneVlan:
91+
description: CtlplaneVlan - Vlan for ctlplane network
92+
type: integer
8693
networkData:
8794
description: NetworkData - Host Network Data
8895
properties:

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
4343
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:dbd08b8ac02039bc285b148088bbddf52f8085d6048bd3cc97ddf78d79cb2d75
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
45-
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:d55a29e9115f5b3f2d0cd36252e0c245d547bd5195a877e6893b9518f344937c
45+
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:639aa48435ce8a963dc1e5545f0ab0247c0d5a6af2d61770dee838a9672694d7
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
4747
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:560e544a3efb46ec371cf5898ebdb814c5c88cde3797392823a4e1f858d1bd9b
4848
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ require (
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250304114258-f5fc2ffa57b3
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.5.1-0.20250228124213-cd63da392f97
2525
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.5.1-0.20250228124213-cd63da392f97
26-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250228124213-cd63da392f97
26+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250315090821-34e570d2d5fb
2727
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250228124213-cd63da392f97
2828
github.com/openstack-k8s-operators/lib-common/modules/test v0.5.1-0.20250228124213-cd63da392f97
2929
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250302155852-69eda4bfb5d3
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250303174417-12dee52aaf2b
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250304114826-556730052875
3232
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250303132459-92f1636bd888
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250302172121-dbb82a196b6c
34-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250303135758-cdba0925cc95
34+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250331064629-f00958dd65f8
3535
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250304112628-fa4c66054312
3737
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250302155853-3e53088b1eeb
@@ -43,9 +43,9 @@ require (
4343
go.uber.org/zap v1.27.0
4444
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
4545
gopkg.in/yaml.v3 v3.0.1
46-
k8s.io/api v0.29.14
47-
k8s.io/apimachinery v0.29.14
48-
k8s.io/client-go v0.29.14
46+
k8s.io/api v0.29.15
47+
k8s.io/apimachinery v0.29.15
48+
k8s.io/client-go v0.29.15
4949
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
5050
sigs.k8s.io/controller-runtime v0.17.6
5151
)
@@ -107,8 +107,8 @@ require (
107107
google.golang.org/protobuf v1.34.1 // indirect
108108
gopkg.in/inf.v0 v0.9.1 // indirect
109109
gopkg.in/yaml.v2 v2.4.0 // indirect
110-
k8s.io/apiextensions-apiserver v0.29.14 // indirect
111-
k8s.io/component-base v0.29.14 // indirect
110+
k8s.io/apiextensions-apiserver v0.29.15 // indirect
111+
k8s.io/component-base v0.29.15 // indirect
112112
k8s.io/klog/v2 v2.120.1 // indirect
113113
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
114114
sigs.k8s.io/gateway-api v1.0.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ github.com/openstack-k8s-operators/lib-common/modules/ansible v0.5.1-0.202502281
120120
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:0bajRHochTUT6Ecfriw27l3vL0yezVrnUmt3bcIpu4w=
121121
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.5.1-0.20250228124213-cd63da392f97 h1:SFJICWqoZurrru1/09SuXZpI18BuKIFuzfUkLZBeuvc=
122122
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:ZgEunOcdFYadtHQuTFwZohPrbPPfSV+bzOcqMLjBNRA=
123-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250228124213-cd63da392f97 h1:3LC66vrXJzGMV/eCdvImosOEL2Cgc2KFJIm2YhfTG3w=
124-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
123+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250315090821-34e570d2d5fb h1:UAFYEHnbyhO0+yymquFmIqxc9QGji9mzreuYrDS1Ev4=
124+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250315090821-34e570d2d5fb/go.mod h1:1CtBP0MQffdjE6buOv5jP2rB3+h7WH0a11lcyrpmxOk=
125125
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250228124213-cd63da392f97 h1:2m8xt9k3FWcnzmq5SxplT0t6v8vvH7LZq3UWK17ygak=
126126
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250228124213-cd63da392f97/go.mod h1:tfMa+ochq7Dyilq9hQr2CEPfPtsj6IUgMmMqi4CWDmo=
127127
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250228124213-cd63da392f97 h1:xQ7/UNSPVRzwQq7wYG9i87dCCQztgmz1kqn2sy6HhlQ=
@@ -138,8 +138,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250303132459-92f
138138
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250303132459-92f1636bd888/go.mod h1:92KQ1xUJQRS4oxCaZ8jkdUju7gypr/1HpOMPOQRmGo4=
139139
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250302172121-dbb82a196b6c h1:7iiMXpX0eAuCzfYaLDPrsinP33cf6Hvzf/ACL2LYdmw=
140140
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250302172121-dbb82a196b6c/go.mod h1:XyWFsi3Fdes6BSqNA93ysZ3VZgYPDMVLC7RoRhuurXA=
141-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250303135758-cdba0925cc95 h1:nSEOQB0AIViazXkSyiTIPMrAA5BnreLtHPPXkDoLFts=
142-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250303135758-cdba0925cc95/go.mod h1:ZVtezoCaIO4u2Cfllwr3wxKi0zWiTl/u/LvVC+KecYQ=
141+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250331064629-f00958dd65f8 h1:GjjHq6O2LRg3PM9yCTqOrXgRXhadV80g0Nl3ss2i+Zg=
142+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250331064629-f00958dd65f8/go.mod h1:RZj8UXrq5Sg6a8SP3R4kzpQbHxM1bBCYPc3ecDfuQPQ=
143143
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250304112628-fa4c66054312 h1:GI6b6HD93wYKl1VzjS2qA+ATt/DQqOwkVh6UIi5gh1E=
144144
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250304112628-fa4c66054312/go.mod h1:6JU/Slf2vtZpGBljlBTbOSVVqpksMd+dM36G67Kqap0=
145145
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20250302155853-3e53088b1eeb h1:GM+jTUPY+KZpT9u/lGuFziNiL3QKaMbmECZ9oOrMJfo=
@@ -269,16 +269,16 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
269269
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
270270
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
271271
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
272-
k8s.io/api v0.29.14 h1:JWFh5ufowH3Y6tCgEzY3URVJHb27f0tEDEej0nCjWDw=
273-
k8s.io/api v0.29.14/go.mod h1:IV8YqKxMm8JGLBLlHM13Npn5lCITH10XYipWEW+YEOQ=
274-
k8s.io/apiextensions-apiserver v0.29.14 h1:gw9WXrZJPu5kpI1UC+Wf8BVe9PWwRUB/UZXU8VzBsq4=
275-
k8s.io/apiextensions-apiserver v0.29.14/go.mod h1:TJ51W+HKW2XqTtAsEFOz1/OohsMtekbKaTXh8ldioL4=
276-
k8s.io/apimachinery v0.29.14 h1:IDhwnGNCp836SLOwW1SoEfFNV77wxIklhxeAHX9vmSo=
277-
k8s.io/apimachinery v0.29.14/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
278-
k8s.io/client-go v0.29.14 h1:OSnzZ9DClaFRgl3zMAY2kGZhNjdGJkEb+RDz+MW2h6k=
279-
k8s.io/client-go v0.29.14/go.mod h1:XtZt5n5UxKfPJ+sCoTPcEavWgZbLFFxMnAFFRQGK1RY=
280-
k8s.io/component-base v0.29.14 h1:SF1DWN7bc2VloJ/ysegGoi/aHnopEo81aw9CslhqXIw=
281-
k8s.io/component-base v0.29.14/go.mod h1:FoK1PHhFTaEQVvQLw29/Uyfd8Ug0qUKHrUcXIXJ1VxI=
272+
k8s.io/api v0.29.15 h1:QxPcAheYujeBwkdiE0vMyKkAtqUq5YNyXVqimT+me44=
273+
k8s.io/api v0.29.15/go.mod h1:16duIp2ez6GiLPq1g8XtZNIkw6hJpIitpxZSvv0dZ6E=
274+
k8s.io/apiextensions-apiserver v0.29.15 h1:XI5axgsWqMlIIgpHbcz5vPjk06i3ibHv5FUdSfdtQLU=
275+
k8s.io/apiextensions-apiserver v0.29.15/go.mod h1:6ZU61z32I8WUwbBTPIANUesTj5G40sZek0ojmeoMJI8=
276+
k8s.io/apimachinery v0.29.15 h1:aLc0wghElkdnTO7TMVTxTrifoXah1lqRL8s6szDHGbg=
277+
k8s.io/apimachinery v0.29.15/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
278+
k8s.io/client-go v0.29.15 h1:zCBOXKCtz9Hl8boKUGs8zbtZEP6pc7O8Ov3ma+gnS6o=
279+
k8s.io/client-go v0.29.15/go.mod h1:xPy0D3p4sonPhZhI3QoYo4m7oLKoPjFf4vYF9oxoxNM=
280+
k8s.io/component-base v0.29.15 h1:CvmXXTDyk43FDaiJ/Rp+yWFjw6hkUI2t7mIJUrK5j00=
281+
k8s.io/component-base v0.29.15/go.mod h1:jH/sbuvmXew2Fz2iIKNMeNw8o/d1KR9tAg6uekQKnVk=
282282
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
283283
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
284284
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 h1:qVoMaQV5t62UUvHe16Q3eb2c5HPzLHYzsi0Tu/xLndo=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
1414
export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/neutron-operator@sha256:0fbaa7f8525469b8a56daf8e32f24e6ad816164a755e7ecec91f3a9c11f84a02
1515
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:ec27ef9d57b39b60a9fa024805779ddd33d333b91b109fc9bee33e224a460ff9
1616
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:dbd08b8ac02039bc285b148088bbddf52f8085d6048bd3cc97ddf78d79cb2d75
17-
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:d55a29e9115f5b3f2d0cd36252e0c245d547bd5195a877e6893b9518f344937c
17+
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:639aa48435ce8a963dc1e5545f0ab0247c0d5a6af2d61770dee838a9672694d7
1818
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:560e544a3efb46ec371cf5898ebdb814c5c88cde3797392823a4e1f858d1bd9b
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:be710420d03d63caa7dfa3e34db0980a3ef697cf7355b2a768dda15189954441
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b

‎pkg/dataplane/baremetal.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ func DeployBaremetalSet(
9494
if res.Gateway == nil {
9595
return fmt.Errorf("%s gateway is missing", dataplanev1.CtlPlaneNetwork)
9696
}
97-
baremetalSet.Spec.CtlplaneGateway = *res.Gateway
98-
baremetalSet.Spec.CtlplaneVlan = res.Vlan
97+
instanceSpec.CtlplaneGateway = *res.Gateway
98+
instanceSpec.CtlplaneVlan = res.Vlan
9999
baremetalSet.Spec.BootstrapDNS = dnsAddresses
100100
baremetalSet.Spec.DNSSearchDomains = []string{res.DNSDomain}
101101
}

0 commit comments

Comments
 (0)