Merge pull request #1252 from rabi/OSPRH-10127

Use ctlplaneVlan from NetConfig/IPSet
openstack-k8s-operators · Jan 7, 2025 · cd3530c · cd3530c
2 parents 6a69a3f + 9d44ecb
commit cd3530c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -98,6 +98,8 @@ spec:
                     type: string
                   ctlplaneNetmask:
                     type: string
+                  ctlplaneVlan:
+                    type: integer
                   deploymentSSHSecret:
                     type: string
                   dnsSearchDomains:

diff --git a/apis/go.mod b/apis/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
 	github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
 	github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
-	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
+	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c
 	github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
 	github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af
 	github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241218182118-b0eb827b3236

diff --git a/apis/go.sum b/apis/go.sum
@@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
 github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
 github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
 github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
+github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c h1:aIivGKNADPlq6tirV9x0NkDKWi7QGdSMXSJiKRjCsYo=
+github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
 github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
 github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
 github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=

diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -98,6 +98,8 @@ spec:
                     type: string
                   ctlplaneNetmask:
                     type: string
+                  ctlplaneVlan:
+                    type: integer
                   deploymentSSHSecret:
                     type: string
                   dnsSearchDomains:

diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
 	github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
 	github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
-	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
+	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c
 	github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
 	github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
 	github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af

diff --git a/go.sum b/go.sum
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
 github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
 github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
 github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
+github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c h1:aIivGKNADPlq6tirV9x0NkDKWi7QGdSMXSJiKRjCsYo=
+github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250107002537-ec83ee1dca8c/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
 github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
 github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
 github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=

diff --git a/pkg/dataplane/baremetal.go b/pkg/dataplane/baremetal.go
@@ -89,6 +89,7 @@ func DeployBaremetalSet(
 						return fmt.Errorf("%s gateway is missing", dataplanev1.CtlPlaneNetwork)
 					}
 					baremetalSet.Spec.CtlplaneGateway = *res.Gateway
+					baremetalSet.Spec.CtlplaneVlan = res.Vlan
 					baremetalSet.Spec.BootstrapDNS = dnsAddresses
 					baremetalSet.Spec.DNSSearchDomains = []string{res.DNSDomain}
 				}