From cc371396eb702fc7c1d652f247d572d53e677b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?=
 =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= <me@bjw-s.dev>
Date: Thu, 14 Jul 2022 16:56:46 +0200
Subject: [PATCH] [pod-gateway]: Proper default tags in webhook deployment

---
 charts/stable/pod-gateway/Chart.yaml                      | 8 +++-----
 .../stable/pod-gateway/templates/webhook-deployment.yaml  | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/stable/pod-gateway/Chart.yaml b/charts/stable/pod-gateway/Chart.yaml
index 321b6465..ad57ac97 100644
--- a/charts/stable/pod-gateway/Chart.yaml
+++ b/charts/stable/pod-gateway/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 appVersion: v1.6.0
 description: Admision controller to change the default gateway and DNS server of PODs
 name: pod-gateway
-version: 5.5.0
+version: 5.5.1
 kubeVersion: ">=1.16.0-0"
 keywords:
   - pod-gateway
@@ -21,7 +21,5 @@ dependencies:
     version: 4.4.2
 annotations:
   artifacthub.io/changes: |-
-    - kind: changed
-      description: Upgraded `pod-gateway` tag dependency to v1.6.0
-    - kind: changed
-      description: Upgraded `gateway-admision-controller` tag dependency to v3.5.0
+    - kind: fixed
+      description: Set proper defaults for image tags in webhook deployment.
diff --git a/charts/stable/pod-gateway/templates/webhook-deployment.yaml b/charts/stable/pod-gateway/templates/webhook-deployment.yaml
index 51c7cb3e..365f60bc 100644
--- a/charts/stable/pod-gateway/templates/webhook-deployment.yaml
+++ b/charts/stable/pod-gateway/templates/webhook-deployment.yaml
@@ -54,12 +54,12 @@ spec:
             - --tls-key-file-path=/tls/tls.key
             - --DNSPolicy={{ .Values.DNSPolicy }}
             # Init container
-            - --initImage={{ .Values.image.repository }}:{{ .Values.image.tag }}
+            - --initImage={{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
             - --initImagePullPol={{ .Values.image.pullPolicy }}
             - --initCmd=/bin/client_init.sh
             - --initMountPoint=/config
             # Sidecar container
-            - --sidecarImage={{ .Values.image.repository }}:{{ .Values.image.tag }}
+            - --sidecarImage={{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
             - --sidecarImagePullPol={{ .Values.image.pullPolicy }}
             - --sidecarCmd=/bin/client_sidecar.sh
             - --sidecarMountPoint=/config