Skip to content

Commit f952583

Browse files
authored
[nethgate] fix: kong proxy semver issue to use latest tag (#150)
* fix: kong proxy semver issue to use latest tag * fix: kong proxy semver issue to use latest tag
1 parent df0de57 commit f952583

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

charts/nethgate/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ maintainers:
88
name: nethgate
99
sources:
1010
- https://github.com/Kong/charts/tree/main/charts/kong
11-
version: 2.33.6
11+
version: 2.33.7
1212
appVersion: "3.5"
1313
dependencies:
1414
- name: postgresql

charts/nethgate/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ directory.
610610
| Parameter | Description | Default |
611611
| ---------------------------------- | ------------------------------------------------------------------------------------- | ------------------- |
612612
| image.repository | Kong image | `kong` |
613-
| image.tag | Kong image version | `3.5` |
613+
| image.tag | Kong image version (proxy can use latest tag) | `3.5` |
614614
| image.effectiveSemver | Semantic version to use for version-dependent features (if `tag` is not a semver) | |
615615
| image.pullPolicy | Image pull policy | `IfNotPresent` |
616616
| image.pullSecrets | Image pull secrets | `null` |

charts/nethgate/templates/_helpers.tpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,12 @@ extensions/v1beta1
18001800
18011801
{{- define "kong.proxy.compatibleReadiness" -}}
18021802
{{- $proxyReadiness := .Values.readinessProbe -}}
1803-
{{- 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)))) -}}
1803+
{{- $effectiveVersion := include "kong.effectiveVersion" .Values.image | default "0.0.0" -}}
1804+
{{- $ingressVersion := include "kong.effectiveVersion" .Values.ingressController.image | default "0.0.0" -}}
1805+
1806+
{{- if (or (and (not (eq .Values.image.tag "latest")) (semverCompare "< 3.3.0" $effectiveVersion))
1807+
(and .Values.ingressController.enabled (not (eq .Values.ingressController.image.tag "latest")) (semverCompare "< 2.11.0" $ingressVersion))
1808+
(eq .Values.image.tag "latest")) -}}
18041809
{{- if (eq $proxyReadiness.httpGet.path "/status/ready") -}}
18051810
{{- $_ := set $proxyReadiness.httpGet "path" "/status" -}}
18061811
{{- end -}}

0 commit comments

Comments
 (0)