From 805609ce94a4e850137fe934ad11a1e3761b24ae Mon Sep 17 00:00:00 2001
From: bugclerk <40872210+bugclerk@users.noreply.github.com>
Date: Thu, 13 Jul 2023 08:58:33 -0300
Subject: [PATCH] Upgraded catalog item(s) (#1360)

* Upgraded catalog item(s)

        This commit upgrades adguard-home catalog item(s).

* fix flag

* remove todo, it does not apply anymore

---------

Co-authored-by: sonicaj <waqarsonic1@gmail.com>
Co-authored-by: Stavros kois <s.kois@outlook.com>
---
 library/ix-dev/community/adguard-home/Chart.yaml          | 7 ++++---
 .../ix-dev/community/adguard-home/templates/_adguard.tpl  | 8 ++++----
 library/ix-dev/community/adguard-home/values.yaml         | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/library/ix-dev/community/adguard-home/Chart.yaml b/library/ix-dev/community/adguard-home/Chart.yaml
index 3cf3e3501a..f0bd72dd5b 100644
--- a/library/ix-dev/community/adguard-home/Chart.yaml
+++ b/library/ix-dev/community/adguard-home/Chart.yaml
@@ -1,11 +1,12 @@
 name: adguard-home
-description: Free and open source, powerful network-wide ads & trackers blocking DNS server.
+description: Free and open source, powerful network-wide ads & trackers blocking DNS
+  server.
 annotations:
   title: AdGuard Home
 type: application
-version: 1.0.14
+version: 1.0.15
 apiVersion: v2
-appVersion: 0.107.33
+appVersion: 0.107.34
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas
diff --git a/library/ix-dev/community/adguard-home/templates/_adguard.tpl b/library/ix-dev/community/adguard-home/templates/_adguard.tpl
index f3af37f0be..ee6f4cbc20 100644
--- a/library/ix-dev/community/adguard-home/templates/_adguard.tpl
+++ b/library/ix-dev/community/adguard-home/templates/_adguard.tpl
@@ -22,7 +22,10 @@ workload:
           # to user specified port.
           args:
           # If appVersion is 0.107.29 or above add this flag
-          {{- if semverCompare "~0.107.29" (.Values.image.tag | replace "v" "") }}
+          # AND appVersion is below 0.107.34
+          {{- if and
+            (semverCompare "~0.107.29" (.Values.image.tag | replace "v" ""))
+            (not (semverCompare "~0.107.34" (.Values.image.tag | replace "v" ""))) }}
             - /opt/adguardhome/AdGuardHome
           {{- end }}
             - --no-check-update
@@ -51,9 +54,6 @@ workload:
                 {{ if .Values.adguardNetwork.enableDHCP }}
                 - NET_RAW
                 {{ end }}
-          # FIXME: Switch to exec probe after this issue is solved, also note that healthcheck
-          # is only available on "edge" tag, as of 27/03/2023
-          # https://github.com/AdguardTeam/AdGuardHome/issues/3290#issuecomment-1485451976
           probes:
             liveness:
               enabled: true
diff --git a/library/ix-dev/community/adguard-home/values.yaml b/library/ix-dev/community/adguard-home/values.yaml
index db5d594457..51984448f6 100644
--- a/library/ix-dev/community/adguard-home/values.yaml
+++ b/library/ix-dev/community/adguard-home/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: adguard/adguardhome
-  tag: v0.107.33
+  tag: v0.107.34
   pullPolicy: IfNotPresent
 
 resources: