From 8f019fbe42ccc626e97cc25c1de5d8e3b312b066 Mon Sep 17 00:00:00 2001
From: kqmaverick <121722567+kqmaverick@users.noreply.github.com>
Date: Thu, 20 Feb 2025 19:30:58 -0700
Subject: [PATCH] feat(pihole): ***BREAKING CHANGES*** update envs for v6
 (#32304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
Update envs for v6, remove configmap, fix probes and switch image to
ghcr.

⚒️ Fixes  #

**⚙️ Type of change**

- [X] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [X] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code
- [ ] 📜 Documentation Changes

**🧪 How Has This Been Tested?**

**📃 Notes:**

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made changes to the documentation
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [X] ⬆️ I increased versions for any altered app according to semantic
versioning
- [X] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or
`fix(docs):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 charts/stable/pihole/Chart.yaml               |  4 ++--
 charts/stable/pihole/templates/_configmap.tpl | 14 -------------
 charts/stable/pihole/templates/common.yaml    | 11 +---------
 charts/stable/pihole/values.yaml              | 20 +++++++------------
 4 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 charts/stable/pihole/templates/_configmap.tpl

diff --git a/charts/stable/pihole/Chart.yaml b/charts/stable/pihole/Chart.yaml
index f44d1bdf583..d6355d03d48 100644
--- a/charts/stable/pihole/Chart.yaml
+++ b/charts/stable/pihole/Chart.yaml
@@ -6,7 +6,7 @@ annotations:
   truecharts.org/min_helm_version: "3.11"
   truecharts.org/train: stable
 apiVersion: v2
-appVersion: 2024.07.0
+appVersion: 2025.02.2
 dependencies:
   - name: common
     version: 25.4.10
@@ -34,4 +34,4 @@ sources:
   - https://hub.docker.com/r/pihole/pihole
   - https://pi-hole.net/
 type: application
-version: 18.7.1
+version: 19.0.0
diff --git a/charts/stable/pihole/templates/_configmap.tpl b/charts/stable/pihole/templates/_configmap.tpl
deleted file mode 100644
index e2d62dd488d..00000000000
--- a/charts/stable/pihole/templates/_configmap.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{/* Define the configmap */}}
-{{- define "pihole.configmap" -}}
-configmap:
-  pihole-env:
-    enabled: true
-    data:
-      WEBPASSWORD: {{ .Values.pihole.webPassword | quote }}
-      {{- with .Values.pihole.dnsServers }}
-        {{- if gt (len .) 2 -}}
-          {{- fail (printf "Pihole - Expected max 2 DNS Servers. But got [%v]" (len .)) -}}
-        {{- end }}
-      PIHOLE_DNS_: {{ join ";" . | quote }}
-      {{- end }}
-{{- end -}}
diff --git a/charts/stable/pihole/templates/common.yaml b/charts/stable/pihole/templates/common.yaml
index 190109ab61f..78d963fb168 100644
--- a/charts/stable/pihole/templates/common.yaml
+++ b/charts/stable/pihole/templates/common.yaml
@@ -1,11 +1,2 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
-
-{{/* Render configmap for pihole */}}
-{{- $config := include "pihole.configmap" . | fromYaml -}}
-{{- if $config -}}
-  {{- $_ := mustMergeOverwrite .Values $config -}}
-{{- end -}}
-
 {{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/stable/pihole/values.yaml b/charts/stable/pihole/values.yaml
index 8d203c589e0..508b5d7a0f4 100644
--- a/charts/stable/pihole/values.yaml
+++ b/charts/stable/pihole/values.yaml
@@ -1,12 +1,7 @@
 image:
-  repository: docker.io/pihole/pihole
+  repository: ghcr.io/pi-hole/pihole
   pullPolicy: IfNotPresent
-  tag: 2024.07.0@sha256:0def896a596e8d45780b6359dbf82fc8c75ef05b97e095452e67a0a4ccc95377
-pihole:
-  webPassword: somepassword"
-  dnsServers:
-    - "9.9.9.9"
-    - "149.112.112.112"
+  tag: 2025.02.2@sha256:8db61ff8b7647a2af225990d14f9209ccf47828f19eb989d59cafb98bb8d8605
 securityContext:
   container:
     readOnlyRootFilesystem: false
@@ -28,19 +23,18 @@ workload:
           env:
             PIHOLE_UID: "{{ .Values.securityContext.container.PUID }}"
             PIHOLE_GID: "{{ .Values.securityContext.pod.fsGroup }}"
-          envFrom:
-            - configMapRef:
-                name: pihole-env
+            FTLCONF_dns_upstreams: "8.8.8.8;8.8.4.4"
+            FTLCONF_webserver_api_password: "somepassword"
           probes:
             liveness:
               type: http
-              path: /admin/index.php
+              path: /admin
             readiness:
               type: http
-              path: /admin/index.php
+              path: /admin
             startup:
               type: http
-              path: /admin/index.php
+              path: /admin
 service:
   main:
     ports: