Drop default values for seed and runtime cluster

The default values shouldn't anticipate if the extension is deployed to a seed or garden runtime cluster. Dropping the default values makes this chart handling less error-prone.
gardener · Feb 6, 2025 · 0657d0d · 0657d0d
1 parent 8bcae9a
commit 0657d0d
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 18 deletions.
diff --git a/charts/gardener-extension-provider-aws/templates/_helpers.tpl b/charts/gardener-extension-provider-aws/templates/_helpers.tpl
@@ -40,4 +40,28 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 
 {{- define "deploymentversion" -}}
 apps/v1
-{{- end -}}
+{{- end -}}
+
+{{- define "topologyAwareRouting.enabled" -}}
+  {{- if .Values.gardener.seed }}
+{{- .Values.gardener.seed.spec.settings.topologyAwareRouting.enabled }}
+  {{- else -}}
+false
+  {{- end }}
+{{- end -}}
+
+{{- define "seed.provider" -}}
+  {{- if .Values.gardener.seed }}
+{{- .Values.gardener.seed.provider }}
+  {{- else -}}
+""
+  {{- end }}
+{{- end -}}
+
+{{- define "runtimeCluster.enabled" -}}
+  {{- if .Values.gardener.runtimeCluster }}
+{{- .Values.gardener.runtimeCluster.enabled }}
+  {{- else -}}
+false
+  {{- end }}
+{{- end -}}
diff --git a/charts/gardener-extension-provider-aws/templates/daemonset-custom-mtu.yaml b/charts/gardener-extension-provider-aws/templates/daemonset-custom-mtu.yaml
@@ -1,4 +1,4 @@
-{{ if and (eq .Values.gardener.seed.provider "aws") (not .Values.gardener.runtimeCluster.enabled) }}
+{{ if eq (include "seed.provider" .) "aws" }}
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:

diff --git a/charts/gardener-extension-provider-aws/templates/deployment.yaml b/charts/gardener-extension-provider-aws/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         networking.resources.gardener.cloud/to-all-shoots-kube-apiserver-tcp-443: allowed
 {{ include "labels" . | indent 8 }}
     spec:
-      {{- if .Values.gardener.runtimeCluster.enabled }}
+      {{- if eq (include "runtimeCluster.enabled" .) "true" }}
       priorityClassName: {{ .Values.gardener.runtimeCluster.priorityClassName }}
       {{- else }}
       priorityClassName: gardener-system-900
@@ -71,7 +71,7 @@ spec:
         - --webhook-config-namespace={{ .Release.Namespace }}
         - --webhook-config-service-port={{ .Values.webhookConfig.servicePort }}
         - --webhook-config-server-port={{ .Values.webhookConfig.serverPort }}
-        {{- if .Values.gardener.runtimeCluster.enabled }}
+        {{- if eq (include "runtimeCluster.enabled" .) "true" }}
         - --controllers=backupbucket,dnsrecord
         - --disable-webhooks="*"
         - --extension-class=garden

diff --git a/charts/gardener-extension-provider-aws/templates/rbac-runtime.yaml b/charts/gardener-extension-provider-aws/templates/rbac-runtime.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.gardener.runtimeCluster.enabled }}
+{{ if eq (include "runtimeCluster.enabled" .) "true" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/charts/gardener-extension-provider-aws/templates/rbac.yaml b/charts/gardener-extension-provider-aws/templates/rbac.yaml
@@ -1,4 +1,4 @@
-{{ if not .Values.gardener.runtimeCluster.enabled }}
+{{ if eq (include "runtimeCluster.enabled" .) "false" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/charts/gardener-extension-provider-aws/templates/service.yaml b/charts/gardener-extension-provider-aws/templates/service.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- if .Values.ignoreResources }}
     resources.gardener.cloud/ignore: "true"
     {{- end }}
-    {{- if .Values.gardener.seed.spec.settings.topologyAwareRouting.enabled }}
+    {{- if eq (include "topologyAwareRouting.enabled" .) "true" }}
     {{- if semverCompare ">= 1.27-0" .Capabilities.KubeVersion.Version }}
     service.kubernetes.io/topology-mode: "auto"
     {{- else }}
@@ -21,7 +21,7 @@ metadata:
     {{- end }}
   labels:
 {{ include "labels" . | indent 4 }}
-    {{- if .Values.gardener.seed.spec.settings.topologyAwareRouting.enabled }}
+    {{- if eq (include "topologyAwareRouting.enabled" .) "true" }}
     endpoint-slice-hints.resources.gardener.cloud/consider: "true"
     {{- end }}
 spec:

diff --git a/charts/gardener-extension-provider-aws/templates/storageclass.yaml b/charts/gardener-extension-provider-aws/templates/storageclass.yaml
@@ -1,4 +1,4 @@
-{{ if and (eq .Values.gardener.seed.provider "aws") (not .Values.gardener.runtimeCluster.enabled) }}
+{{ if eq (include "seed.provider" . ) "aws" }}
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:

diff --git a/charts/gardener-extension-provider-aws/values.yaml b/charts/gardener-extension-provider-aws/values.yaml
@@ -91,12 +91,12 @@ gardener:
   version: ""
   gardenlet:
     featureGates: {}
-  seed:
-    provider: aws
-    spec:
-      settings:
-        topologyAwareRouting:
-          enabled: false
-  runtimeCluster:
-    enabled: false
-  # priorityClassName: gardener-garden-system-200
+# seed:
+#   provider: aws
+#   spec:
+#     settings:
+#       topologyAwareRouting:
+#         enabled: false
+# runtimeCluster:
+#   enabled: true
+#   priorityClassName: gardener-garden-system-200