From 49483137973ebbb61788a18ea1745f20dc1da24d Mon Sep 17 00:00:00 2001
From: Rafael Gaspar <rafael.gaspar@me.com>
Date: Thu, 18 Nov 2021 11:12:25 +0100
Subject: [PATCH] Update pihole and make use of appVersion (#195)

---
 charts/pihole/Chart.yaml                | 3 ++-
 charts/pihole/README.md                 | 2 +-
 charts/pihole/templates/deployment.yaml | 2 +-
 charts/pihole/values.yaml               | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/charts/pihole/Chart.yaml b/charts/pihole/Chart.yaml
index 8b8c3f40..4d08ea04 100644
--- a/charts/pihole/Chart.yaml
+++ b/charts/pihole/Chart.yaml
@@ -2,7 +2,8 @@ apiVersion: v1
 description: Installs pihole in kubernetes
 home: https://github.com/MoJo2600/pihole-kubernetes/tree/master/charts/pihole
 name: pihole
-version: 2.5.2
+appVersion: 2021.10.1
+version: 2.5.3
 sources:
   - https://github.com/MoJo2600/pihole-kubernetes/tree/master/charts/pihole
   - https://pi-hole.net/
diff --git a/charts/pihole/README.md b/charts/pihole/README.md
index a71f4442..f3b26d5e 100644
--- a/charts/pihole/README.md
+++ b/charts/pihole/README.md
@@ -205,7 +205,7 @@ The following table lists the configurable parameters of the pihole chart and th
 | hostname | string | `""` | hostname of pod |
 | image.pullPolicy | string | `"IfNotPresent"` | the pull policy |
 | image.repository | string | `"pihole/pihole"` | the repostory to pull the image from |
-| image.tag | string | `"2021.10"` | the docker tag |
+| image.tag | string | `""` | the docker tag, if left empty it will get it from the chart's appVersion |
 | ingress | object | `{"annotations":{},"enabled":false,"hosts":["chart-example.local"],"path":"/","tls":[]}` | Configuration for the Ingress |
 | ingress.annotations | object | `{}` | Annotations for the ingress |
 | ingress.enabled | bool | `false` | Generate a Ingress resource |
diff --git a/charts/pihole/templates/deployment.yaml b/charts/pihole/templates/deployment.yaml
index f46387b0..6e7f99aa 100644
--- a/charts/pihole/templates/deployment.yaml
+++ b/charts/pihole/templates/deployment.yaml
@@ -156,7 +156,7 @@ spec:
             value: {{ if .Values.DNS2 }}{{ ( printf "%v;%v" .Values.DNS1 .Values.DNS2 ) | squote }}{{ else }}{{ .Values.DNS1 | squote }}{{ end }}
          {{- end }}
          {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           securityContext:
             privileged: {{ .Values.privileged }}
diff --git a/charts/pihole/values.yaml b/charts/pihole/values.yaml
index 056e5a5a..13e77d57 100644
--- a/charts/pihole/values.yaml
+++ b/charts/pihole/values.yaml
@@ -17,8 +17,8 @@ maxUnavailable: 1
 image:
   # -- the repostory to pull the image from
   repository: "pihole/pihole"
-  # -- the docker tag
-  tag: "2021.10"
+  # -- the docker tag, if left empty it will get it from the chart's appVersion
+  tag: ""
   # -- the pull policy
   pullPolicy: IfNotPresent