chore(t8s-cluster/management-cluster): deduplicate kubeadmConfigTemplate

teutonet · Aug 23, 2023 · 6a6f0de · 6a6f0de
1 parent 269afac
commit 6a6f0de
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/...s/management-cluster/clusterClass/kubeadmConfigTemplate/_workerKubeadmConfigTemplate.yaml b/...s/management-cluster/clusterClass/kubeadmConfigTemplate/_workerKubeadmConfigTemplate.yaml
@@ -0,0 +1,11 @@
+{{- define "t8s-cluster.clusterClass.kubeadmConfigTemplate" -}}
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KubeadmConfigTemplate
+metadata:
+  name: {{ printf "%s-%s-worker" .context.Release.Name (.gpu | ternary "gpu" "standard") }}
+  namespace: {{ .context.Release.Namespace }}
+  labels: {{- include "common.labels.standard" .context | nindent 4 }}
+spec:
+  template:
+    spec: {{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate.spec" (dict "gpu" .gpu "context" .context) | nindent 6 }}
+{{- end -}}
diff --git a/...management-cluster/clusterClass/kubeadmConfigTemplate/gpuWorkerKubeadmConfigTemplate.yaml b/...management-cluster/clusterClass/kubeadmConfigTemplate/gpuWorkerKubeadmConfigTemplate.yaml
@@ -1,11 +1,3 @@
 {{- if eq (include "t8s-cluster.hasGPUNodes" .) "true" }}
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-kind: KubeadmConfigTemplate
-metadata:
-  name: {{ printf "%s-gpu-worker" $.Release.Name }}
-  namespace: {{ $.Release.Namespace }}
-  labels: {{- include "common.labels.standard" $ | nindent 4 }}
-spec:
-  template:
-    spec: {{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate.spec" (dict "gpu" true "context" $) | nindent 6 }}
+  {{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate" (dict "gpu" true "context" $) -}}
 {{- end }}
diff --git a/...ement-cluster/clusterClass/kubeadmConfigTemplate/standardWorkerKubeadmConfigTemplate.yaml b/...ement-cluster/clusterClass/kubeadmConfigTemplate/standardWorkerKubeadmConfigTemplate.yaml
@@ -5,13 +5,5 @@
   {{- end -}}
 {{- end }}
 {{- if $hasStandardFlavor }}
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-kind: KubeadmConfigTemplate
-metadata:
-  name: {{ printf "%s-standard-worker" $.Release.Name }}
-  namespace: {{ $.Release.Namespace }}
-  labels: {{- include "common.labels.standard" $ | nindent 4 }}
-spec:
-  template:
-    spec: {{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate.spec" (dict "gpu" false "context" $) | nindent 6 }}
+  {{- include "t8s-cluster.clusterClass.kubeadmConfigTemplate" (dict "gpu" false "context" $) -}}
 {{- end }}