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]>
openfaas · Nov 24, 2024 · cd64953 · cd64953
1 parent 6ed2e1d
commit cd64953
Show file tree

Hide file tree

Showing 14 changed files with 296 additions and 271 deletions.
diff --git a/chart/openfaas/Chart.yaml b/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

diff --git a/chart/openfaas/templates/_helpers.tpl b/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 */}}

diff --git a/docs/cron-connector-0.6.11.tgz b/docs/cron-connector-0.6.11.tgz
diff --git a/docs/federated-gateway-0.1.0.tgz b/docs/federated-gateway-0.1.0.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
diff --git a/docs/kafka-connector-0.7.11.tgz b/docs/kafka-connector-0.7.11.tgz
diff --git a/docs/mqtt-connector-0.4.7.tgz b/docs/mqtt-connector-0.4.7.tgz
diff --git a/docs/nats-connector-0.3.2.tgz b/docs/nats-connector-0.3.2.tgz
diff --git a/docs/openfaas-14.2.82.tgz b/docs/openfaas-14.2.82.tgz
diff --git a/docs/postgres-connector-0.1.1.tgz b/docs/postgres-connector-0.1.1.tgz
diff --git a/docs/pro-builder-0.4.15.tgz b/docs/pro-builder-0.4.15.tgz
diff --git a/docs/queue-worker-0.2.10.tgz b/docs/queue-worker-0.2.10.tgz
diff --git a/docs/sns-connector-0.1.3.tgz b/docs/sns-connector-0.1.3.tgz
diff --git a/docs/sqs-connector-0.2.6.tgz b/docs/sqs-connector-0.2.6.tgz