Skip to content

Commit cd3530c

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openstack-k8s-operators#1252 from rabi/OSPRH-10127
Use ctlplaneVlan from NetConfig/IPSet
2 parents 6a69a3f + 9d44ecb commit cd3530c

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

‎apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ spec:
9898
type: string
9999
ctlplaneNetmask:
100100
type: string
101+
ctlplaneVlan:
102+
type: integer
101103
deploymentSSHSecret:
102104
type: string
103105
dnsSearchDomains:

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
2424
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
2828
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af
2929
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241218182118-b0eb827b3236

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
128128
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
129129
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
131-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
132-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
131+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c h1:aIivGKNADPlq6tirV9x0NkDKWi7QGdSMXSJiKRjCsYo=
132+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
133133
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
134134
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=

‎config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ spec:
9898
type: string
9999
ctlplaneNetmask:
100100
type: string
101+
ctlplaneVlan:
102+
type: integer
101103
deploymentSSHSecret:
102104
type: string
103105
dnsSearchDomains:

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
3333
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
3434
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
35-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
35+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c
3636
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
3737
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
3838
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
140140
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
141141
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
142142
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
143-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
144-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
143+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c h1:aIivGKNADPlq6tirV9x0NkDKWi7QGdSMXSJiKRjCsYo=
144+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
145145
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
146146
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
147147
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=

‎pkg/dataplane/baremetal.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ func DeployBaremetalSet(
8989
return fmt.Errorf("%s gateway is missing", dataplanev1.CtlPlaneNetwork)
9090
}
9191
baremetalSet.Spec.CtlplaneGateway = *res.Gateway
92+
baremetalSet.Spec.CtlplaneVlan = res.Vlan
9293
baremetalSet.Spec.BootstrapDNS = dnsAddresses
9394
baremetalSet.Spec.DNSSearchDomains = []string{res.DNSDomain}
9495
}

0 commit comments

Comments
 (0)