fix semver check

giantswarm · Dec 11, 2024 · daad372 · daad372
1 parent e17ffbf
commit daad372
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - :warning: Kubernetes >= v1.30 **Remove outdated TLS cipher suites `TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305`.**
 - Changed `teleport` data directory to `/`
 
+### Fixed
+
+- Evaluate semver check for tls cipher suites helper in case value is "N/A".
+
 ## [1.7.0] - 2024-12-06
 
 ### Added

diff --git a/helm/cluster/templates/clusterapi/_helpers_tlsciphersuites.tpl b/helm/cluster/templates/clusterapi/_helpers_tlsciphersuites.tpl
@@ -5,6 +5,7 @@
 
 {{- define "cluster.internal.kubeadm.tlsCipherSuites" -}}
 {{- $k8sVersion := include "cluster.component.kubernetes.version" . | trimPrefix "v" }}
+
 {{- $ciphers := list
   "TLS_AES_128_GCM_SHA256"
   "TLS_AES_256_GCM_SHA384"
@@ -22,7 +23,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 }}