From 0657d0d69a939fe4cd625f6465935ace7f1469eb Mon Sep 17 00:00:00 2001 From: Tim Usner Date: Thu, 6 Feb 2025 10:40:43 +0100 Subject: [PATCH] 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. --- .../templates/_helpers.tpl | 26 ++++++++++++++++++- .../templates/daemonset-custom-mtu.yaml | 2 +- .../templates/deployment.yaml | 4 +-- .../templates/rbac-runtime.yaml | 2 +- .../templates/rbac.yaml | 2 +- .../templates/service.yaml | 4 +-- .../templates/storageclass.yaml | 2 +- .../values.yaml | 18 ++++++------- 8 files changed, 42 insertions(+), 18 deletions(-) diff --git a/charts/gardener-extension-provider-aws/templates/_helpers.tpl b/charts/gardener-extension-provider-aws/templates/_helpers.tpl index b8629c698..242d64560 100644 --- 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 -}} \ No newline at end of file +{{- 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 index cf3c3ff03..095397f45 100644 --- 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 index 0cd62e26e..fb129ada6 100644 --- 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 index e253e0312..4af82eb13 100644 --- 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 index 987dd5558..ed18939c2 100644 --- 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 index 480ecfe9c..19cd56b48 100644 --- 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 index d5b1f7f60..389414162 100644 --- 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 index 6a2d57e17..1cdcb67ce 100644 --- 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