Browse Source

NAS-122254 / 23.10 / Update adguard home to v0.107.29 (#1230)

* Update adguard home to v0.107.29

* bump common

* fix args to match last change https://github.com/AdguardTeam/AdGuardHome/blob/02114241914ad6a09caf7d15aa0bc58e8e38b73c/docker/Dockerfile#L82

* hmm

* Try again

* use appversion

* use the actual tag...

---------

Co-authored-by: Stavros kois <s.kois@outlook.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
xxyzz 2 năm trước cách đây
mục cha
commit
2b933a1cc6

+ 3 - 3
library/ix-dev/community/adguard-home/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../../../common
-  version: 1.0.7
-digest: sha256:919bcf42446fc1748a1b77001ec0161bb7a72a198381794b716a6ebb459ac31b
-generated: "2023-05-10T19:50:39.39174353+03:00"
+  version: 1.0.8
+digest: sha256:254efaa1285f634b7a80b7baadeadbd20a680f7fee49d1d9d3c4618aa0d657ad
+generated: "2023-06-01T15:14:06.332866637+03:00"

+ 3 - 3
library/ix-dev/community/adguard-home/Chart.yaml

@@ -3,9 +3,9 @@ description: Free and open source, powerful network-wide ads & trackers blocking
 annotations:
   title: AdGuard Home
 type: application
-version: 1.0.5
+version: 1.0.6
 apiVersion: v2
-appVersion: 'v0.107.26'
+appVersion: 'v0.107.29'
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.0.7
+    version: 1.0.8
 home: https://github.com/AdguardTeam/AdGuardHome
 icon: https://github.com/AdguardTeam/AdGuardHome/raw/master/doc/adguard_home_darkmode.svg
 sources:

BIN
library/ix-dev/community/adguard-home/charts/common-1.0.7.tgz


BIN
library/ix-dev/community/adguard-home/charts/common-1.0.8.tgz


+ 4 - 0
library/ix-dev/community/adguard-home/templates/_adguard.tpl

@@ -21,6 +21,10 @@ workload:
           # the setup wizard is completed it will switch
           # 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" "") }}
+            - /opt/adguardhome/AdGuardHome
+          {{- end }}
             - --no-check-update
             - --host
             - "0.0.0.0"

+ 1 - 0
library/ix-dev/community/adguard-home/upgrade_info.json

@@ -0,0 +1 @@
+{"filename": "values.yaml", "keys": ["image"]}

+ 1 - 1
library/ix-dev/community/adguard-home/upgrade_strategy

@@ -11,7 +11,7 @@ RE_STABLE_VERSION = re.compile(r'v[0-9]+\.[0-9]+\.[0-9]+')
 
 def newer_mapping(image_tags):
     key = list(image_tags.keys())[0]
-    tags = {t: t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
+    tags = {t.strip("v"): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)}
     version = semantic_versioning(list(tags))
     if not version:
         return {}

+ 1 - 1
library/ix-dev/community/adguard-home/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: adguard/adguardhome
-  tag: v0.107.26
+  tag: v0.107.29
   pullPolicy: IfNotPresent
 
 resources: