Fix issue with EKS semver suffix

The semver suffix added by EKS indicated a "pre-release"
version, however the EKS team just wanted to add their own
custom tag, not to indicate a pre-release.

The check to print the correct ingress version can probably
be removed now since v1 became stable as of v1.19, that said
this change strips any K8s version suffix so that the
comparison does not fail.

It was failing because semverCompare considered any
pre-release version to be less than v1.19. Tested by
helm template.

We didn't see this issue before because most people
seem to create their own separate ingress records rather
than the one generated by the chart.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

chart/openfaas/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 type: application
 description: OpenFaaS - Serverless Functions Made Simple
 name: openfaas
-version: 14.2.81
+version: 14.2.82
 sources:
 - https://github.com/openfaas/faas
 - https://github.com/openfaas/faas-netes

chart/openfaas/templates/_helpers.tpl

@@ -19,9 +19,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 
-{{/* Way to override KubeVersion. */}}
+{{/* Way to override KubeVersion, with EKS suffix sanitization */}}
 {{- define "openfaas.ingress.kubeVersion" -}}
-  {{- default .Capabilities.KubeVersion.Version .Values.k8sVersionOverride -}}
+  {{- $version := default .Capabilities.KubeVersion.Version .Values.k8sVersionOverride -}}
+  {{- regexReplaceAll "([0-9]+\\.[0-9]+\\.[0-9]+).*" $version "$1" -}}
 {{- end -}}
 
 {{/* Determine Ingress API Version */}}