cleanup for additional clusterclasses when ready for rke2 and k3s (#153)

linode · Feb 29, 2024 · 4748538 · 4748538
1 parent 2143bea
commit 4748538
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 15 deletions.
diff --git a/hack/generate-flavors.sh b/hack/generate-flavors.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 FLAVORS_DIR="${REPO_ROOT}/templates/flavors"
 
-for name in $(find "${FLAVORS_DIR}/"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v base); do
+for name in $(find "${FLAVORS_DIR}/"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v base | grep -v clusterclass-base ); do
     # clusterctl expects clusterclass not have the "cluster-template" prefix
     # except for the actual cluster template using the clusterclass
     if [[ "$name" == clusterclass* ]]; then

diff --git a/templates/addons/cluster-resource-set/kustomization.yaml b/templates/addons/cluster-resource-set/kustomization.yaml
@@ -1,4 +1,3 @@
-
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

diff --git a/templates/common-init-files/kustomization.yaml b/templates/common-init-files/kustomization.yaml
@@ -1,3 +1,4 @@
-namespace: default
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - secret.yaml
diff --git a/templates/flavors/base/kustomization.yaml b/templates/flavors/base/kustomization.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - cluster.yaml
-  - linode-cluster.yaml
-  - linode-machine-template.yaml
-  - machine-deployment.yaml
+  - linodeCluster.yaml
+  - linodeMachineTemplate.yaml
+  - machineDeployment.yaml
diff --git a/templates/flavors/base/linode-cluster.yaml → templates/flavors/base/linodeCluster.yaml b/templates/flavors/base/linode-cluster.yaml → templates/flavors/base/linodeCluster.yaml
diff --git a/...flavors/base/linode-machine-template.yaml → ...s/flavors/base/linodeMachineTemplate.yaml b/...flavors/base/linode-machine-template.yaml → ...s/flavors/base/linodeMachineTemplate.yaml
diff --git a/...ates/flavors/base/machine-deployment.yaml → ...lates/flavors/base/machineDeployment.yaml b/...ates/flavors/base/machine-deployment.yaml → ...lates/flavors/base/machineDeployment.yaml
diff --git a/templates/flavors/clusterclass-base/kustomization.yaml b/templates/flavors/clusterclass-base/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - linodeClusterTemplate.yaml
+  - linodeMachineControlPlaneTemplate.yaml
+  - linodeMachineWorkerTemplate.yaml
diff --git a/...lass-kubeadm/linode-cluster-template.yaml → ...sterclass-base/linodeClusterTemplate.yaml b/...lass-kubeadm/linode-cluster-template.yaml → ...sterclass-base/linodeClusterTemplate.yaml
diff --git a/...linode-machine-controlplane-template.yaml → ...se/linodeMachineControlPlaneTemplate.yaml b/...linode-machine-controlplane-template.yaml → ...se/linodeMachineControlPlaneTemplate.yaml
diff --git a/...beadm/linode-machine-worker-template.yaml → ...ass-base/linodeMachineWorkerTemplate.yaml b/...beadm/linode-machine-worker-template.yaml → ...ass-base/linodeMachineWorkerTemplate.yaml
diff --git a/...rs/clusterclass-kubeadm/clusterclass.yaml → ...rs/clusterclass-kubeadm/clusterClass.yaml b/...rs/clusterclass-kubeadm/clusterclass.yaml → ...rs/clusterclass-kubeadm/clusterClass.yaml
diff --git a/...lass-kubeadm/kubeadm-config-template.yaml → ...rclass-kubeadm/kubeadmConfigTemplate.yaml b/...lass-kubeadm/kubeadm-config-template.yaml → ...rclass-kubeadm/kubeadmConfigTemplate.yaml
diff --git a/...ubeadm/kubeadm-controlplane-template.yaml → ...-kubeadm/kubeadmControlPlaneTemplate.yaml b/...ubeadm/kubeadm-controlplane-template.yaml → ...-kubeadm/kubeadmControlPlaneTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/kustomization.yaml b/templates/flavors/clusterclass-kubeadm/kustomization.yaml
@@ -1,10 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - clusterclass.yaml
-  - linode-cluster-template.yaml
-  - linode-machine-controlplane-template.yaml
-  - linode-machine-worker-template.yaml
-  - kubeadm-controlplane-template.yaml
-  - kubeadm-config-template.yaml
+  - clusterClass.yaml
+  - kubeadmControlPlaneTemplate.yaml
+  - kubeadmConfigTemplate.yaml
+  - ../clusterclass-base
   - ../../common-init-files
   - ../../addons/cilium
   - ../../addons/provider-linode

diff --git a/...vors/default/kubeadm-config-template.yaml → ...lavors/default/kubeadmConfigTemplate.yaml b/...vors/default/kubeadm-config-template.yaml → ...lavors/default/kubeadmConfigTemplate.yaml
diff --git a/...lavors/default/kubeadm-control-plane.yaml → .../flavors/default/kubeadmControlPlane.yaml b/...lavors/default/kubeadm-control-plane.yaml → .../flavors/default/kubeadmControlPlane.yaml
diff --git a/templates/flavors/default/kustomization.yaml b/templates/flavors/default/kustomization.yaml
@@ -1,7 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ../base
-  - kubeadm-config-template.yaml
-  - kubeadm-control-plane.yaml
+  - kubeadmConfigTemplate.yaml
+  - kubeadmControlPlane.yaml
   - ../../common-init-files
   - ../../addons/cilium
   - ../../addons/provider-linode

diff --git a/templates/flavors/k3s/kustomization.yaml b/templates/flavors/k3s/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ../base
   - k3sControlPlane.yaml

diff --git a/templates/flavors/rke2/kustomization.yaml b/templates/flavors/rke2/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ../base
   - rke2ControlPlane.yaml