fix: kong proxy semver issue to use latest tag

NethermindEth · Oct 10, 2024 · e585207 · e585207
1 parent df0de57
commit e585207
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/charts/nethgate/Chart.yaml b/charts/nethgate/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 name: nethgate
 sources:
   - https://github.com/Kong/charts/tree/main/charts/kong
-version: 2.33.6
+version: 2.33.7
 appVersion: "3.5"
 dependencies:
   - name: postgresql

diff --git a/charts/nethgate/README.md b/charts/nethgate/README.md
@@ -610,7 +610,7 @@ directory.
 | Parameter                          | Description                                                                           | Default             |
 | ---------------------------------- | ------------------------------------------------------------------------------------- | ------------------- |
 | image.repository                   | Kong image                                                                            | `kong`              |
-| image.tag                          | Kong image version                                                                    | `3.5`               |
+| image.tag                          | Kong image version (proxy can use latest tag)                                                                    | `3.5`               |
 | image.effectiveSemver              | Semantic version to use for version-dependent features (if `tag` is not a semver)     |                     |
 | image.pullPolicy                   | Image pull policy                                                                     | `IfNotPresent`      |
 | image.pullSecrets                  | Image pull secrets                                                                    | `null`              |

diff --git a/charts/nethgate/templates/_helpers.tpl b/charts/nethgate/templates/_helpers.tpl
@@ -1800,10 +1800,16 @@ extensions/v1beta1
 
 {{- define "kong.proxy.compatibleReadiness" -}}
 {{- $proxyReadiness := .Values.readinessProbe -}}
-{{- if (or (semverCompare "< 3.3.0" (include "kong.effectiveVersion" .Values.image)) (and .Values.ingressController.enabled (semverCompare "< 2.11.0" (include "kong.effectiveVersion" .Values.ingressController.image)))) -}}
+{{- $effectiveVersion := include "kong.effectiveVersion" .Values.image | default "0.0.0" -}}
+{{- $ingressVersion := include "kong.effectiveVersion" .Values.ingressController.image | default "0.0.0" -}}
+
+{{- if (or (and (not (eq .Values.image.tag "latest")) (semverCompare "< 3.3.0" $effectiveVersion)) 
+           (and .Values.ingressController.enabled (not (eq .Values.ingressController.image.tag "latest")) (semverCompare "< 2.11.0" $ingressVersion)) 
+           (eq .Values.image.tag "latest")) -}}
     {{- if (eq $proxyReadiness.httpGet.path "/status/ready") -}}
         {{- $_ := set $proxyReadiness.httpGet "path" "/status" -}}
     {{- end -}}
 {{- end -}}
-{{- (toYaml $proxyReadiness) -}}
+
+{{- (toYaml $proxyReadiness) | nindent 2 -}}
 {{- end -}}