Add support for setting VLAN in network devices through config

ionos-cloud · Nov 19, 2024 · cc5cbb3 · cc5cbb3
1 parent afca76c
commit cc5cbb3
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 0 deletions.
diff --git a/docs/Usage.md b/docs/Usage.md
@@ -91,6 +91,7 @@ GATEWAY: "10.10.10.1"                                         # The gateway for
 IP_PREFIX: "25"                                               # Subnet Mask in CIDR notation for your node IP ranges
 DNS_SERVERS: "[8.8.8.8,8.8.4.4]"                              # The dns nameservers for the machines network-config.
 BRIDGE: "vmbr1"                                               # The network bridge device for Proxmox VE VMs
+VLAN: "2"                                                     # (optional) The VLAN to put the bridge device into
 
 ## -- xl nodes -- ##
 BOOT_VOLUME_DEVICE: "scsi0"                                   # The device used for the boot disk.

diff --git a/templates/cluster-class-calico.yaml b/templates/cluster-class-calico.yaml
@@ -982,6 +982,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 kind: ProxmoxMachineTemplate
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
@@ -998,6 +999,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 kind: KubeadmConfigTemplate
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1

diff --git a/templates/cluster-class-cilium.yaml b/templates/cluster-class-cilium.yaml
@@ -982,6 +982,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 kind: ProxmoxMachineTemplate
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
@@ -998,6 +999,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 kind: KubeadmConfigTemplate
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1

diff --git a/templates/cluster-template-calico.yaml b/templates/cluster-template-calico.yaml
@@ -186,6 +186,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -238,6 +239,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

diff --git a/templates/cluster-template-cilium-load-balancer.yaml b/templates/cluster-template-cilium-load-balancer.yaml
@@ -234,10 +234,12 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
         additionalDevices:
         - name: net1
           bridge: ${SECONDARY_BRIDGE}
           model: virtio
+          vlan: ${SECONDARY_VLAN}
           ipv4PoolRef:
             apiGroup: ipam.cluster.x-k8s.io
             kind: GlobalInClusterIPPool
@@ -295,10 +297,12 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
         additionalDevices:
         - name: net1
           bridge: ${SECONDARY_BRIDGE}
           model: virtio
+          vlan: ${SECONDARY_VLAN}
           ipv4PoolRef:
             apiGroup: ipam.cluster.x-k8s.io
             kind: GlobalInClusterIPPool
@@ -355,10 +359,12 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
         additionalDevices:
         - name: net1
           bridge: ${SECONDARY_BRIDGE}
           model: virtio
+          vlan: ${SECONDARY_VLAN}
           ipv4PoolRef:
             apiGroup: ipam.cluster.x-k8s.io
             kind: GlobalInClusterIPPool
@@ -367,6 +373,7 @@ spec:
         - name: net2
           bridge: ${EXT_SERVICE_BRIDGE}
           model: virtio
+          vlan: ${EXT_SERVICE_VLAN}
           ipv4PoolRef:
             apiGroup: ipam.cluster.x-k8s.io
             kind: GlobalInClusterIPPool

diff --git a/templates/cluster-template-cilium.yaml b/templates/cluster-template-cilium.yaml
@@ -179,6 +179,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -224,6 +225,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
@@ -194,6 +194,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -243,6 +244,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

diff --git a/templates/cluster-template-external-creds.yaml b/templates/cluster-template-external-creds.yaml
@@ -197,6 +197,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -246,6 +247,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

diff --git a/templates/cluster-template-multiple-vlans.yaml b/templates/cluster-template-multiple-vlans.yaml
@@ -193,10 +193,12 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
         additionalDevices:
         - name: net1
           bridge: ${SECONDARY_BRIDGE}
           model: virtio
+          vlan: ${SECONDARY_VLAN}
           ipv4PoolRef:
             apiGroup: ipam.cluster.x-k8s.io
             kind: GlobalInClusterIPPool
@@ -251,10 +253,12 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
         additionalDevices:
         - name: net1
           bridge: ${SECONDARY_BRIDGE}
           model: virtio
+          vlan: ${SECONDARY_VLAN}
           ipv4PoolRef:
             apiGroup: ipam.cluster.x-k8s.io
             kind: GlobalInClusterIPPool

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -184,6 +184,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -233,6 +234,7 @@ spec:
         default:
           bridge: ${BRIDGE}
           model: virtio
+          vlan: ${VLAN}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate