cluster-class: polish all templates

ionos-cloud · Apr 2, 2024 · 9c8bcd3 · 9c8bcd3
1 parent 1a922be
commit 9c8bcd3
Show file tree

Hide file tree

Showing 9 changed files with 9,200 additions and 75 deletions.
diff --git a/examples/cluster-calico.yaml b/examples/cluster-calico.yaml
@@ -45,9 +45,9 @@ spec:
       value:
         machineSpec:
           controlPlane:
-           network:
-             default:
-               bridge: vmbr0
+            network:
+              default:
+                bridge: vmbr0
 #             additionalDevices:
 #               - name: net1
 #                 model: virtio
@@ -90,28 +90,28 @@ spec:
             network:
               default:
                 bridge: vmbr0
-#              additionalDevices:
-#                - name: net1
-#                  model: virtio
-#                  ipv4PoolRef:
-#                    name: shared-inclusteripv4pool
-#                    apiGroup: ipam.cluster.x-k8s.io
-#                    kind: GlobalInClusterIPPool
-#                  ipv6PoolRef:
-#                    name: shared-inclusteripv6pool
-#                    apiGroup: ipam.cluster.x-k8s.io
-#                    kind: GlobalInClusterIPPool
-#                  bridge: vmbr1
-#              vrfs:
-#                - name: vrf-ext
-#                  interfaces:
-#                    - net1
-#                  table: 500
-#                  routingPolicy:
-#                    - from: 192.0.2.0/24
-#            numSockets: 1
-#            numCores: 2
-#            memoryMiB: 2048
+#             additionalDevices:
+#               - name: net1
+#                 model: virtio
+#                 ipv4PoolRef:
+#                   name: shared-inclusteripv4pool
+#                   apiGroup: ipam.cluster.x-k8s.io
+#                   kind: GlobalInClusterIPPool
+#                 ipv6PoolRef:
+#                   name: shared-inclusteripv6pool
+#                   apiGroup: ipam.cluster.x-k8s.io
+#                   kind: GlobalInClusterIPPool
+#                 bridge: vmbr1
+#             vrfs:
+#               - name: vrf-ext
+#                 interfaces:
+#                   - net1
+#                 table: 500
+#                 routingPolicy:
+#                   - from: 192.0.2.0/24
+#           numSockets: 1
+#           numCores: 2
+#           memoryMiB: 2048
             sourceNode: pve1
             templateID: 100
         sshAuthorizedKeys:

diff --git a/examples/cluster-cilium.yaml b/examples/cluster-cilium.yaml
@@ -45,9 +45,9 @@ spec:
       value:
         machineSpec:
           controlPlane:
-           network:
-             default:
-               bridge: vmbr0
+            network:
+              default:
+                bridge: vmbr0
 #             additionalDevices:
 #               - name: net1
 #                 model: virtio
@@ -90,28 +90,28 @@ spec:
             network:
               default:
                 bridge: vmbr0
-#              additionalDevices:
-#                - name: net1
-#                  model: virtio
-#                  ipv4PoolRef:
-#                    name: shared-inclusteripv4pool
-#                    apiGroup: ipam.cluster.x-k8s.io
-#                    kind: GlobalInClusterIPPool
-#                  ipv6PoolRef:
-#                    name: shared-inclusteripv6pool
-#                    apiGroup: ipam.cluster.x-k8s.io
-#                    kind: GlobalInClusterIPPool
-#                  bridge: vmbr1
-#              vrfs:
-#                - name: vrf-ext
-#                  interfaces:
-#                    - net1
-#                  table: 500
-#                  routingPolicy:
-#                    - from: 192.0.2.0/24
-#            numSockets: 1
-#            numCores: 2
-#            memoryMiB: 2048
+#             additionalDevices:
+#               - name: net1
+#                 model: virtio
+#                 ipv4PoolRef:
+#                   name: shared-inclusteripv4pool
+#                   apiGroup: ipam.cluster.x-k8s.io
+#                   kind: GlobalInClusterIPPool
+#                 ipv6PoolRef:
+#                   name: shared-inclusteripv6pool
+#                   apiGroup: ipam.cluster.x-k8s.io
+#                   kind: GlobalInClusterIPPool
+#                 bridge: vmbr1
+#             vrfs:
+#               - name: vrf-ext
+#                 interfaces:
+#                   - net1
+#                 table: 500
+#                 routingPolicy:
+#                   - from: 192.0.2.0/24
+#           numSockets: 1
+#           numCores: 2
+#           memoryMiB: 2048
             sourceNode: pve1
             templateID: 100
         sshAuthorizedKeys:

diff --git a/examples/cluster.yaml b/examples/cluster.yaml
@@ -45,9 +45,9 @@ spec:
       value:
         machineSpec:
           controlPlane:
-           network:
-             default:
-               bridge: vmbr0
+            network:
+              default:
+                bridge: vmbr0
 #             additionalDevices:
 #               - name: net1
 #                 model: virtio
@@ -90,28 +90,28 @@ spec:
             network:
               default:
                 bridge: vmbr0
-#              additionalDevices:
-#                - name: net1
-#                  model: virtio
-#                  ipv4PoolRef:
-#                    name: shared-inclusteripv4pool
-#                    apiGroup: ipam.cluster.x-k8s.io
-#                    kind: GlobalInClusterIPPool
-#                  ipv6PoolRef:
-#                    name: shared-inclusteripv6pool
-#                    apiGroup: ipam.cluster.x-k8s.io
-#                    kind: GlobalInClusterIPPool
-#                  bridge: vmbr1
-#              vrfs:
-#                - name: vrf-ext
-#                  interfaces:
-#                    - net1
-#                  table: 500
-#                  routingPolicy:
-#                    - from: 192.0.2.0/24
-#            numSockets: 1
-#            numCores: 2
-#            memoryMiB: 2048
+#             additionalDevices:
+#               - name: net1
+#                 model: virtio
+#                 ipv4PoolRef:
+#                   name: shared-inclusteripv4pool
+#                   apiGroup: ipam.cluster.x-k8s.io
+#                   kind: GlobalInClusterIPPool
+#                 ipv6PoolRef:
+#                   name: shared-inclusteripv6pool
+#                   apiGroup: ipam.cluster.x-k8s.io
+#                   kind: GlobalInClusterIPPool
+#                 bridge: vmbr1
+#             vrfs:
+#               - name: vrf-ext
+#                 interfaces:
+#                   - net1
+#                 table: 500
+#                 routingPolicy:
+#                   - from: 192.0.2.0/24
+#           numSockets: 1
+#           numCores: 2
+#           memoryMiB: 2048
             sourceNode: pve1
             templateID: 100
         sshAuthorizedKeys:

diff --git a/templates/cluster-class-calico.yaml b/templates/cluster-class-calico.yaml
@@ -45,6 +45,9 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: ProxmoxMachineTemplate
               name: proxmox-clusterclass-v0.1.0-workertemplate
+          metadata:
+            labels:
+              node-role.kubernetes.io/node: ""
         machineHealthCheck:
           maxUnhealthy: 33%
           nodeStartupTimeout: 15m
@@ -69,6 +72,10 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: ProxmoxMachineTemplate
               name: proxmox-clusterclass-v0.1.0-loadbalancer-template
+          metadata:
+            labels:
+              node-role.kubernetes.io/load-balancer: ""
+              node-role.kubernetes.io/node: ""
         machineHealthCheck:
           maxUnhealthy: 33%
           nodeStartupTimeout: 15m
@@ -961,6 +968,10 @@ spec:
         nodeRegistration:
           kubeletExtraArgs:
             provider-id: "proxmox://'{{ ds.meta_data.instance_id }}'"
+          taints:
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/load-balancer
+            value: ""
 ---
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet

diff --git a/templates/cluster-class-cilium.yaml b/templates/cluster-class-cilium.yaml
@@ -45,6 +45,9 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: ProxmoxMachineTemplate
               name: proxmox-clusterclass-v0.1.0-workertemplate
+          metadata:
+            labels:
+              node-role.kubernetes.io/node: ""
         machineHealthCheck:
           maxUnhealthy: 33%
           nodeStartupTimeout: 15m
@@ -69,6 +72,10 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: ProxmoxMachineTemplate
               name: proxmox-clusterclass-v0.1.0-loadbalancer-template
+          metadata:
+            labels:
+              node-role.kubernetes.io/load-balancer: ""
+              node-role.kubernetes.io/node: ""
         machineHealthCheck:
           maxUnhealthy: 33%
           nodeStartupTimeout: 15m
@@ -961,6 +968,10 @@ spec:
         nodeRegistration:
           kubeletExtraArgs:
             provider-id: "proxmox://'{{ ds.meta_data.instance_id }}'"
+          taints:
+          - effect: NoSchedule
+            key: node-role.kubernetes.io/load-balancer
+            value: ""
 ---
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet

diff --git a/templates/cluster-class.yaml b/templates/cluster-class.yaml
@@ -35,6 +35,9 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: ProxmoxMachineTemplate
               name: proxmox-clusterclass-v0.1.0-workertemplate
+          metadata:
+            labels:
+              node-role.kubernetes.io/node: ""
         namingStrategy:
            template: "{{ .cluster.name }}-worker-{{ .random }}"
       - class: proxmox-loadbalancer
@@ -49,6 +52,10 @@ spec:
               apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
               kind: ProxmoxMachineTemplate
               name: proxmox-clusterclass-v0.1.0-loadbalancer-template
+          metadata:
+            labels:
+              node-role.kubernetes.io/load-balancer: ""
+              node-role.kubernetes.io/node: ""
         namingStrategy:
            template: "{{ .cluster.name }}-loadbalancer-{{ .random }}"
   variables: