Use containerDisk instead of PVC

Signed-off-by: Johanan Liebermann <[email protected]>

Author: johananl

templates/cluster-template-lb-flatcar-kccm.yaml

@@ -1,9 +1,7 @@
 # export CLUSTER_NAME=my-cluster # replace your cluster name here
 # export NAMESPACE=default # replace your namespace here
-# export ROOT_VOLUME_SIZE=200G
 # export KUBERNETES_VERSION=v1.30.5
 # export NODE_VM_IMAGE_TEMPLATE="capi-flatcar-3975-2-2-v1.30.5.img" # Flatcar image should be pre-build. Check the project https://github.com/kubernetes-sigs/image-builder for more details
-# export STORAGE_CLASS_NAME=ceph-block
 # export CONTROL_PLANE_MACHINE_COUNT=3
 # export WORKER_MACHINE_COUNT=3
 # export INSTANCE_TYPE=u1.large
@@ -66,22 +64,6 @@ spec:
           preference:
             kind: VirtualMachineClusterPreference
             name: "${INSTANCE_PREFERENCE}"
-          dataVolumeTemplates:
-          - metadata:
-              name: "boot-volume"
-            spec:
-              pvc:
-                volumeMode: Block
-                accessModes:
-                - ReadWriteOnce
-                resources:
-                  requests:
-                    storage: "${ROOT_VOLUME_SIZE}"
-                storageClassName: "${STORAGE_CLASS_NAME}"
-              source:
-                pvc:
-                  name: ${NODE_VM_IMAGE_TEMPLATE}
-                  # namespace: golden-images
           runStrategy: Always
           template:
             spec:
@@ -91,15 +73,12 @@ spec:
                   disks:
                     - disk:
                         bus: virtio
-                      name: dv-volume
+                      name: containervolume
               evictionStrategy: External
               volumes:
-                # - name: serviceaccount
-                #   serviceAccount:
-                #     serviceAccountName: cdi-cloner
-                - dataVolume:
-                    name: "boot-volume"
-                  name: dv-volume
+                - containerDisk:
+                    image: "${NODE_VM_IMAGE_TEMPLATE}"
+                  name: containervolume
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
@@ -171,22 +150,6 @@ spec:
           preference:
             kind: VirtualMachineClusterPreference
             name: "${INSTANCE_PREFERENCE}"
-          dataVolumeTemplates:
-          - metadata:
-              name: "boot-volume"
-            spec:
-              pvc:
-                volumeMode: Block
-                accessModes:
-                - ReadWriteOnce
-                resources:
-                  requests:
-                    storage: "${ROOT_VOLUME_SIZE}"
-                storageClassName: "${STORAGE_CLASS_NAME}"
-              source:
-                pvc:
-                  name: ${NODE_VM_IMAGE_TEMPLATE}
-                  # namespace: golden-images
           runStrategy: Always
           template:
             metadata:
@@ -211,15 +174,12 @@ spec:
                   disks:
                     - disk:
                         bus: virtio
-                      name: dv-volume
+                      name: containervolume
               evictionStrategy: External
               volumes:
-                # - name: serviceaccount
-                #   serviceAccount:
-                #     serviceAccountName: cdi-cloner
-                - dataVolume:
-                    name: "boot-volume"
-                  name: dv-volume
+                - containerDisk:
+                    image: "${NODE_VM_IMAGE_TEMPLATE}"
+                  name: containervolume
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate

templates/cluster-template-lb-flatcar.yaml

@@ -1,9 +1,7 @@
 # export CLUSTER_NAME=my-cluster # replace your cluster name here
 # export NAMESPACE=default # replace your namespace here
-# export ROOT_VOLUME_SIZE=200G
 # export KUBERNETES_VERSION=v1.30.5
 # export NODE_VM_IMAGE_TEMPLATE="capi-flatcar-3975-2-2-v1.30.5.img" # Flatcar image should be pre-build. Check the project https://github.com/kubernetes-sigs/image-builder for more details
-# export STORAGE_CLASS_NAME=ceph-block
 # export CONTROL_PLANE_MACHINE_COUNT=3
 # export WORKER_MACHINE_COUNT=3
 # export INSTANCE_TYPE=u1.large
@@ -66,22 +64,6 @@ spec:
           preference:
             kind: VirtualMachineClusterPreference
             name: "${INSTANCE_PREFERENCE}"
-          dataVolumeTemplates:
-          - metadata:
-              name: "boot-volume"
-            spec:
-              pvc:
-                volumeMode: Block
-                accessModes:
-                - ReadWriteOnce
-                resources:
-                  requests:
-                    storage: "${ROOT_VOLUME_SIZE}"
-                storageClassName: "${STORAGE_CLASS_NAME}"
-              source:
-                pvc:
-                  name: ${NODE_VM_IMAGE_TEMPLATE}
-                  # namespace: golden-images
           runStrategy: Always
           template:
             spec:
@@ -91,15 +73,12 @@ spec:
                   disks:
                     - disk:
                         bus: virtio
-                      name: dv-volume
+                      name: containervolume
               evictionStrategy: External
               volumes:
-                # - name: serviceaccount
-                #   serviceAccount:
-                #     serviceAccountName: cdi-cloner
-                - dataVolume:
-                    name: "boot-volume"
-                  name: dv-volume
+                - containerDisk:
+                    image: "${NODE_VM_IMAGE_TEMPLATE}"
+                  name: containervolume
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
@@ -171,22 +150,6 @@ spec:
           preference:
             kind: VirtualMachineClusterPreference
             name: "${INSTANCE_PREFERENCE}"
-          dataVolumeTemplates:
-          - metadata:
-              name: "boot-volume"
-            spec:
-              pvc:
-                volumeMode: Block
-                accessModes:
-                - ReadWriteOnce
-                resources:
-                  requests:
-                    storage: "${ROOT_VOLUME_SIZE}"
-                storageClassName: "${STORAGE_CLASS_NAME}"
-              source:
-                pvc:
-                  name: ${NODE_VM_IMAGE_TEMPLATE}
-                  # namespace: golden-images
           runStrategy: Always
           template:
             metadata:
@@ -211,15 +174,12 @@ spec:
                   disks:
                     - disk:
                         bus: virtio
-                      name: dv-volume
+                      name: containervolume
               evictionStrategy: External
               volumes:
-                # - name: serviceaccount
-                #   serviceAccount:
-                #     serviceAccountName: cdi-cloner
-                - dataVolume:
-                    name: "boot-volume"
-                  name: dv-volume
+                - containerDisk:
+                    image: "${NODE_VM_IMAGE_TEMPLATE}"
+                  name: containervolume
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate