use helper function for tls cipher suites

giantswarm · Nov 29, 2024 · 0318c56 · 0318c56
1 parent 6bde3f0
commit 0318c56
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/helm/cluster/files/etc/kubernetes/patches/kubeletconfiguration.yaml b/helm/cluster/files/etc/kubernetes/patches/kubeletconfiguration.yaml
@@ -22,23 +22,7 @@ systemReserved:
   memory: {{ $.Values.internal.advancedConfiguration.kubelet.systemReserved.memory }}
 systemReservedCgroup: /system.slice
 tlsCipherSuites:
-- TLS_AES_128_GCM_SHA256
-- TLS_AES_256_GCM_SHA384
-- TLS_CHACHA20_POLY1305_SHA256
-- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
-- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-- TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
-- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
-- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
-- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-- TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
-- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-- TLS_RSA_WITH_AES_128_CBC_SHA
-- TLS_RSA_WITH_AES_128_GCM_SHA256
-- TLS_RSA_WITH_AES_256_CBC_SHA
-- TLS_RSA_WITH_AES_256_GCM_SHA384
+{{ include "kubelet.tlsCipherSuites" . | indent 2 }}
 serializeImagePulls: false
 streamingConnectionIdleTimeout: 1h
 allowedUnsafeSysctls:

diff --git a/helm/cluster/templates/clusterapi/_helpers_tlsciphersuites.tpl b/helm/cluster/templates/clusterapi/_helpers_tlsciphersuites.tpl
@@ -0,0 +1,22 @@
+{{- define "kubelet.tlsCipherSuites" -}}
+{{- $k8sVersion := include "cluster.component.kubernetes.version" . -}}
+- TLS_AES_128_GCM_SHA256
+- TLS_AES_256_GCM_SHA384
+- TLS_CHACHA20_POLY1305_SHA256
+- TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+- TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+- TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
+- TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+- TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+- TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
+- TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+- TLS_RSA_WITH_AES_128_CBC_SHA
+- TLS_RSA_WITH_AES_128_GCM_SHA256
+{{- if semverCompare "<1.30.0" $k8sVersion }}
+- TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+- TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305
+{{- end }}
+{{- end }}