fix: Refactor kustomize templates

ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2

@@ -3,8 +3,8 @@ kind: Kustomization
 resources:
 - cluster-template.yaml
 
-patchesStrategicMerge:
-  - |-
+patches:
+- patch: |-
     apiVersion: v1
     kind: Secret
     metadata:
@@ -32,7 +32,7 @@ patchesStrategicMerge:
             [Network]
             public-network = "${VSPHERE_NETWORK}"
         type: Opaque
-  - |-
+- patch: |-
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
     kind: KubeadmControlPlane
     metadata:
@@ -42,7 +42,7 @@ patchesStrategicMerge:
       kubeadmConfigSpec:
         clusterConfiguration:
           imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
-  - |-
+- patch: |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -53,7 +53,7 @@ patchesStrategicMerge:
         spec:
           clusterConfiguration:
             imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
-  - |-
+- patch: |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -86,7 +86,7 @@ patchesStrategicMerge:
               {{ _template.rootca | indent(width=14, first=False) | trim }}
             owner: root:root
             path: /usr/local/share/ca-certificates/root_ca.crt
-  - |-
+- patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -105,7 +105,7 @@ patchesStrategicMerge:
               nameservers:
               - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
-  - |-
+- patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -125,8 +125,7 @@ patchesStrategicMerge:
               - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
 
-patchesJson6902:
-  - target:
+- target:
     group: controlplane.cluster.x-k8s.io
     version: v1beta1
     kind: KubeadmControlPlane
@@ -167,7 +166,7 @@ patchesJson6902:
           {{ _template.rootca | indent(width=12, first=False) | trim }}
         owner: root:root
         path: /usr/local/share/ca-certificates/root_ca.crt
-  - target:
+- target:
     group: bootstrap.cluster.x-k8s.io
     version: v1beta1
     kind: KubeadmConfigTemplate
@@ -178,7 +177,7 @@ patchesJson6902:
       path: /spec/template/spec/preKubeadmCommands/-
       value: {{ cmd }}
 {% endfor %}
-  - target:
+- target:
     group: controlplane.cluster.x-k8s.io
     version: v1beta1
     kind: KubeadmControlPlane
@@ -190,7 +189,7 @@ patchesJson6902:
       value: {{ cmd }}
 {% endfor %}
 
-  - target:
+- target:
     group: infrastructure.cluster.x-k8s.io
     version: v1beta1
     kind: VSphereMachineTemplate
@@ -199,7 +198,7 @@ patchesJson6902:
     - op: replace
       path: /metadata/name
       value: ${CLUSTER_NAME}-master
-  - target:
+- target:
     group: controlplane.cluster.x-k8s.io
     version: v1beta1
     kind: KubeadmControlPlane
@@ -211,7 +210,7 @@ patchesJson6902:
     - op: replace
       path: /spec/machineTemplate/infrastructureRef/name
       value: ${CLUSTER_NAME}-master
-  - target:
+- target:
     group: cluster.x-k8s.io
     version: v1beta1
     kind: Cluster
@@ -221,7 +220,7 @@ patchesJson6902:
       path: /spec/controlPlaneRef/name
       value: ${CLUSTER_NAME}-master
 
-  - target:
+- target:
     group: infrastructure.cluster.x-k8s.io
     version: v1beta1
     kind: VSphereMachineTemplate
@@ -233,7 +232,7 @@ patchesJson6902:
     - op: replace
       path: /spec/template/spec/memoryMiB
       value: {{ _template.nodesize.memory }}
-  - target:
+- target:
     group: cluster.x-k8s.io
     version: v1beta1
     kind: MachineDeployment
@@ -245,7 +244,7 @@ patchesJson6902:
     - op: replace
       path: /spec/template/spec/bootstrap/configRef/name
       value: ${CLUSTER_NAME}-worker
-  - target:
+- target:
     group: bootstrap.cluster.x-k8s.io
     version: v1beta1
     kind: KubeadmConfigTemplate

ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2

@@ -5,8 +5,8 @@ resources:
 - manifests/machinedeployment-{{ _template.cluster.name }}-worker.yaml
 - manifests/vspheremachinetemplate-{{ _template.cluster.name }}-worker.yaml
 
-patchesStrategicMerge:
-  - |-
+patches:
+- patch: |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -31,7 +31,7 @@ patchesStrategicMerge:
           mounts:
           - - LABEL=blockstorage
             - /mnt/blockstorage
-  - |-
+- patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -43,8 +43,7 @@ patchesStrategicMerge:
           additionalDisksGiB:
           - {{ _template.nodepool.additionaldisk }}
 
-patchesJson6902:
-  - target:
+- target:
     group: bootstrap.cluster.x-k8s.io
     version: v1beta1
     kind: KubeadmConfigTemplate
@@ -54,7 +53,7 @@ patchesJson6902:
       path: /metadata/name
       value: {{ _template.cluster.name }}-worker-storage
 
-  - target:
+- target:
     group: cluster.x-k8s.io
     version: v1beta1
     kind: MachineDeployment
@@ -73,7 +72,7 @@ patchesJson6902:
       path: /spec/replicas
       value: {{ _template.nodepool.size }}
 
-  - target:
+- target:
     group: infrastructure.cluster.x-k8s.io
     version: v1beta1
     kind: VSphereMachineTemplate