fix: make semverCompare handle GKE versions

Kong · Feb 6, 2023 · fb2b9b1 · fb2b9b1
1 parent 1c5242f
commit fb2b9b1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 ## Unreleased
 
-Nothing yet.
+### Fixed 
+
+* serviceAccount projected volume is properly provisioned for GKE clusters >= 1.20.
+  [#735735735735735735735735735](https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)(https://github.com/Kong/charts/pull/735)
 
 ## 2.16.0
 

diff --git a/charts/kong/templates/deployment.yaml b/charts/kong/templates/deployment.yaml
@@ -298,7 +298,11 @@ spec:
       {{- include "kong.userDefinedVolumes" . | nindent 8 -}}
       {{- if (and (not .Values.deployment.serviceAccount.automountServiceAccountToken) (or .Values.deployment.serviceAccount.create .Values.deployment.serviceAccount.name)) }}
         - name: {{ template "kong.serviceAccountTokenName" . }}
-          {{- if semverCompare ">=1.20" .Capabilities.KubeVersion.Version }}
+          {{- /* Due to GKE versions (e.g. v1.23.15-gke.1900) we need to handle pre-release part of the version as well.
+          See the related documentation of semver module that Helm depends on for semverCompare:
+          https://github.com/Masterminds/semver#working-with-prerelease-versions
+          Related Helm issue: https://github.com/helm/helm/issues/3810 */}}
+          {{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
           projected:
             sources:
             - serviceAccountToken:

diff --git a/charts/kong/templates/secret-sa-token.yaml b/charts/kong/templates/secret-sa-token.yaml
@@ -1,4 +1,8 @@
-{{- if and (or .Values.deployment.serviceAccount.create .Values.deployment.serviceAccount.name) (semverCompare "<1.20" .Capabilities.KubeVersion.Version) }}
+{{- /* Due to GKE versions (e.g. v1.23.15-gke.1900) we need to handle pre-release part of the version as well.
+See the related documentation of semver module that Helm depends on for semverCompare:
+https://github.com/Masterminds/semver#working-with-prerelease-versions
+Related Helm issue: https://github.com/helm/helm/issues/3810 */}}
+{{- if and (or .Values.deployment.serviceAccount.create .Values.deployment.serviceAccount.name) (semverCompare "<1.20.0-0" .Capabilities.KubeVersion.Version) }}
 apiVersion: v1
 kind: Secret
 metadata: