Merge branch 'main' into asdk

giantswarm · Dec 11, 2024 · 565c92a · 565c92a
2 parents 363a11f + cb7e0de
commit 565c92a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/helm/cluster/templates/clusterapi/_helpers_tlsciphersuites.tpl b/helm/cluster/templates/clusterapi/_helpers_tlsciphersuites.tpl
@@ -22,7 +22,7 @@
   "TLS_RSA_WITH_AES_128_CBC_SHA"
   "TLS_RSA_WITH_AES_128_GCM_SHA256"
 }}
-{{- if semverCompare "<1.30.0" $k8sVersion }}
+{{- if or (eq $k8sVersion "N/A") (semverCompare "<1.30.0-0" $k8sVersion) }}
 {{- $ciphers = concat $ciphers (list "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305" "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305") }}
 {{- end }}
 {{- toYaml $ciphers }}