fix: make semverCompare handle GKE versions and release 2.16.1 (#735)

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

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/charts/kong/CHANGELOG.md b/charts/kong/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Changelog
 
-## Unreleased
+## 2.16.1
 
-Nothing yet.
+### Fixed 
+
+* serviceAccount projected volume is properly provisioned for GKE clusters >= 1.20.
+  [#735](https://github.com/Kong/charts/pull/735)
 
 ## 2.16.0
 

diff --git a/charts/kong/Chart.yaml b/charts/kong/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.16.0
+version: 2.16.1
 appVersion: "3.1"
 dependencies:
 - name: postgresql

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: