Merge pull request #349 from richardcase/fix_eks_install

fix: installation on eks
rancher · Jan 17, 2024 · 81ca0ea · 81ca0ea
2 parents 2627ed4 + a1f4a94
commit 81ca0ea
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/charts/rancher-turtles/templates/_helpers.tpl b/charts/rancher-turtles/templates/_helpers.tpl
@@ -1,9 +1,22 @@
 {{/*
     This removes the part after the + in the kubernetes version string.
     v1.27.4+k3s1 -> v1.27.4
+    v1.26.12-eks-5e0fdde -> v1.26.12
+    v1.26.12-gke.1 -> v1.26.12
     v1.28.0 -> v1.28.0
 */}}
 {{- define "strippedKubeVersion" -}}
-{{- $parts := split "+" .Capabilities.KubeVersion.Version -}}
-{{- print $parts._0 -}}
+    {{- if (.Capabilities.KubeVersion.Version | contains "-eks-") -}}
+        {{- $parts := split "-eks-" .Capabilities.KubeVersion.Version -}}
+        {{- print $parts._0 -}}
+    {{- else if (.Capabilities.KubeVersion.Version | contains "-gke.") -}}
+        {{- $parts := split "-gke." .Capabilities.KubeVersion.Version -}}
+        {{- print $parts._0 -}}
+    {{- else if (.Capabilities.KubeVersion.Version | contains "-aks") -}}
+        {{- $parts := split "-aks" .Capabilities.KubeVersion.Version -}}
+        {{- print $parts._0 -}}
+    {{- else -}}
+        {{- $parts := split "+" .Capabilities.KubeVersion.Version -}}
+        {{- print $parts._0 -}}
+    {{- end -}}
 {{- end -}}