Merge pull request #228 from rabi/vlan

Use ctlplane vlan in networkdata
openstack-k8s-operators · Jan 6, 2025 · 91f3a89 · 91f3a89
2 parents 927fdf8 + b13b7b3
commit 91f3a89
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml
@@ -147,6 +147,9 @@ spec:
                 description: 'CtlplaneNetmask - Netmask to use for ctlplane network
                   (TODO: acquire this is another manner?)'
                 type: string
+              ctlplaneVlan:
+                description: CtlplaneVlan - Vlan for ctlplane network
+                type: integer
               deploymentSSHSecret:
                 description: DeploymentSSHSecret - Name of secret holding the cloud-admin
                   ssh keys

diff --git a/api/v1beta1/openstackbaremetalset_types.go b/api/v1beta1/openstackbaremetalset_types.go
@@ -111,6 +111,9 @@ type OpenStackBaremetalSetSpec struct {
 	// CtlplaneGateway - IP of gateway for ctrlplane network (TODO: acquire this is another manner?)
 	// +kubebuilder:validation:Optional
 	CtlplaneGateway string `json:"ctlplaneGateway,omitempty"`
+	// +kubebuilder:validation:Optional
+	// CtlplaneVlan - Vlan for ctlplane network
+	CtlplaneVlan *int `json:"ctlplaneVlan,omitempty"`
 	// DomainName is the domain name that will be set on the underlying Metal3 BaremetalHosts (TODO: acquire this is another manner?)
 	// +kubebuilder:validation:Optional
 	DomainName string `json:"domainName,omitempty"`

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml b/config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml
@@ -147,6 +147,9 @@ spec:
                 description: 'CtlplaneNetmask - Netmask to use for ctlplane network
                   (TODO: acquire this is another manner?)'
                 type: string
+              ctlplaneVlan:
+                description: CtlplaneVlan - Vlan for ctlplane network
+                type: integer
               deploymentSSHSecret:
                 description: DeploymentSSHSecret - Name of secret holding the cloud-admin
                   ssh keys

diff --git a/pkg/openstackbaremetalset/baremetalhost.go b/pkg/openstackbaremetalset/baremetalhost.go
@@ -125,6 +125,9 @@ func BaremetalHostProvision(
 		templateParameters := make(map[string]interface{})
 		templateParameters["CtlplaneIpVersion"] = CtlplaneIPVersion
 		templateParameters["CtlplaneIp"] = ipAddr
+		if instance.Spec.CtlplaneVlan != nil {
+			templateParameters["CtlplaneVlan"] = *instance.Spec.CtlplaneVlan
+		}
 		templateParameters["CtlplaneInterface"] = instance.Spec.CtlplaneInterface
 		templateParameters["CtlplaneGateway"] = instance.Spec.CtlplaneGateway
 		templateParameters["CtlplaneNetmask"] = net.IP(ipNet.Mask)

diff --git a/templates/openstackbaremetalset/cloudinit/networkdata b/templates/openstackbaremetalset/cloudinit/networkdata
@@ -2,9 +2,22 @@ links:
 - name: {{ .CtlplaneInterface }}
   id: {{ .CtlplaneInterface }}
   type: vif
+{{- if (index . "CtlplaneVlan") }}
+- name: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
+  id: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
+  type: vlan
+  vlan_id: {{ .CtlplaneVlan }}
+  vlan_link: {{ .CtlplaneInterface }}
+  vlan_mac_address: null
+{{- end }}
 networks:
+{{- if (index . "CtlplaneVlan") }}
+- link: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
+  id: {{ .CtlplaneInterface }}.{{ .CtlplaneVlan }}
+{{- else }}
 - link: {{ .CtlplaneInterface }}
   id: {{ .CtlplaneInterface }}
+{{- end }}
   type: {{ .CtlplaneIpVersion }}
   ip_address: {{ .CtlplaneIp }}
   netmask: "{{ .CtlplaneNetmask }}"