move kubeadm specific config into default

templates/flavors/base/cluster.yaml

@@ -1,19 +1,18 @@
+---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   name: ${CLUSTER_NAME}
   labels:
-    cni: cilium
-    ccm: linode
-    crs: ${CLUSTER_NAME}-crs
+    cluster: ${CLUSTER_NAME}
 spec:
   clusterNetwork:
     pods:
       cidrBlocks:
         - 192.168.128.0/17
   controlPlaneRef:
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-    kind: KubeadmControlPlane
+    kind: REPLACEME
     name: ${CLUSTER_NAME}-control-plane
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1

templates/flavors/base/kustomization.yaml

@@ -1,7 +1,8 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - cluster.yaml
-  - kubeadm-control-plane.yaml
   - linode-cluster.yaml
   - linode-machine-template.yaml
+  - machine-deployment.yaml

templates/flavors/base/linode-machine-template.yaml

@@ -10,5 +10,19 @@ spec:
       type: ${LINODE_CONTROL_PLANE_MACHINE_TYPE}
       region: ${LINODE_REGION}
       authorizedKeys:
-# uncomment to include your ssh key in linode provisioning
-# - ${LINODE_SSH_PUBKEY:=""}
+      # uncomment to include your ssh key in linode provisioning
+      # - ${LINODE_SSH_PUBKEY:=""}
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachineTemplate
+metadata:
+  name: ${CLUSTER_NAME}-md-0
+spec:
+  template:
+    spec:
+      image: ${LINODE_OS:="linode/ubuntu22.04"}
+      type: ${LINODE_MACHINE_TYPE}
+      region: ${LINODE_REGION}
+      authorizedKeys:
+      # uncomment to include your ssh key in linode provisioning
+      # - ${LINODE_SSH_PUBKEY:=""}

templates/flavors/default/machine-deployment.yaml → templates/flavors/base/machine-deployment.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
@@ -15,7 +16,7 @@ spec:
         configRef:
           name: ${CLUSTER_NAME}-md-0
           apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-          kind: KubeadmConfigTemplate
+          kind: REPLACEME
       infrastructureRef:
         name: ${CLUSTER_NAME}-md-0
         apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1

templates/flavors/default/kustomization.yaml

@@ -1,9 +1,39 @@
 resources:
   - ../base
   - kubeadm-config-template.yaml
-  - linode-machine-template.yaml
-  - machine-deployment.yaml
+  - kubeadm-control-plane.yaml
   - ../../common-init-files
   - ../../addons/cilium
   - ../../addons/provider-linode
   - ../../addons/cluster-resource-set
+patches:
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster
+    patch: |-
+      - op: replace
+        path: /spec/controlPlaneRef/kind
+        value: KubeadmControlPlane
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster
+    patch: |-
+      apiVersion: cluster.x-k8s.io/v1beta1
+      kind: Cluster
+      metadata:
+        name: ${CLUSTER_NAME}
+        labels:
+            cni: cilium
+            ccm: linode
+            crs: ${CLUSTER_NAME}-crs
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: MachineDeployment
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/bootstrap/configRef/kind
+        value: KubeadmConfigTemplate
+