fix(adguardhome-sync) update env + change upstream (#7360)

charts/incubator/adguardhome-sync/Chart.yaml

@@ -1,15 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Other
 apiVersion: v2
-appVersion: "latest"
+appVersion: "0.4.12"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
     version: 11.1.2
 deprecated: false
-description: Adguardhome-sync(https://github.com/bakito/adguardhome-sync/) is a tool to synchronize AdGuardHome config to replica instances.
+description: Synchronize AdGuardHome config to replica instances.
 home: https://truecharts.org/charts/incubator/adguardhome-sync
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/adguardhome-sync.png
 keywords:
@@ -23,9 +19,12 @@ maintainers:
 name: adguardhome-sync
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/adguardhome-sync
-  - https://ghcr.io/bakito/adguardhome-sync
   - https://github.com/bakito/adguardhome-sync/
-  - https://github.com/orgs/linuxserver/packages/container/package/adguardhome-sync
+  - https://ghcr.io/bakito/adguardhome-sync
-  - https://github.com/linuxserver/docker-adguardhome-sync#readme
 type: application
-version: 2.0.13
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - Other
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U

charts/incubator/adguardhome-sync/questions.yaml

@@ -9,29 +9,152 @@ questions:
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
   - variable: env
-    group: "App Configuration"
+    group: App Configuration
-    label: "Image Environment"
+    label: Image Environment
     schema:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: CONFIGFILE
+        - variable: original
-          label: "CONFIGFILE"
+          label: Original Server Settings
-          description: "Set a custom config file."
+          schema:
+            type: boolean
+            default: true
+            show_subquestions_if: true
+            subquestions:
+              - variable: ORIGIN_URL
+                label: Origin Url
+                schema:
+                  type: string
+                  required: true
+                  default: ""
+              - variable: ORIGIN_USERNAME
+                label: Origin Username
+                schema:
+                  type: string
+                  required: true
+                  default: ""
+              - variable: ORIGIN_PASSWORD
+                label: Origin Password
+                schema:
+                  type: string
+                  required: true
+                  private: true
+                  default: ""
+        - variable: replica
+          label: Replica Server Settings
+          schema:
+            type: boolean
+            default: true
+            show_subquestions_if: true
+            subquestions:
+              - variable: REPLICA_URL
+                label: Replica Url
+                schema:
+                  type: string
+                  required: true
+                  default: ""
+              - variable: REPLICA_USERNAME
+                label: Replica Username
+                schema:
+                  type: string
+                  required: true
+                  default: ""
+              - variable: REPLICA_PASSWORD
+                label: Replica Password
+                schema:
+                  type: string
+                  required: true
+                  private: true
+                  default: ""
+              - variable: REPLICA_AUTOSETUP
+                label: Replica Auto Setup
+                schema:
+                  type: boolean
+                  default: false
+              - variable: REPLICA_INTERFACENAME
+                label: Replica Interface Name
+                schema:
+                  type: string
+                  default: ""
+        - variable: CRON
+          label: CRON
+          description: Set a cron task.
           schema:
             type: string
-            default: ""
+            default: "*/10 * * * *"
-        - variable: UMASK
+        - variable: RUNONSTART
-          label: "UMASK"
+          label: Run On Start
-          description: "Container Variable UMASK"
           schema:
-            type: string
+            type: boolean
-            default: ""
+            default: true
+        - variable: sync
+          label: Sync Features Settings
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: FEATURES_GENERALSETTINGS
+                label: Features General Settings
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_QUERYLOGCONFIG
+                label: Features Query Log Config
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_STATSCONFIG
+                label: Features Stats Config
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_CLIENTSETTINGS
+                label: Features Clients Settings
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_SERVICES
+                label: Features Services
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_FILTERS
+                label: Features Filters
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_DHCP_SERVERCONFIG
+                label: Features DHCP Server Config
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_DHCP_STATICLEASES
+                label: Features DHCP Static Leases
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_DNS_SERVERCONFIG
+                label: Features DNS Server Config
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_DNS_ACCESSLISTS
+                label: Features DNS Access Lists
+                schema:
+                  type: boolean
+                  default: true
+              - variable: FEATURES_DNS_REWRITES
+                label: Features DNS Rewrites
+                schema:
+                  type: boolean
+                  default: true
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
-          label: "Main Service"
+          label: Main Service
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
@@ -39,14 +162,14 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: "Port"
+                            label: Port
-                            description: "This port exposes the container port on the service"
+                            description: This port exposes the container port on the service
                             schema:
                               type: int
                               default: 8080
@@ -55,19 +178,10 @@ questions:
             default: false
 # Include{serviceExpert}
 # Include{serviceList}
-# Include{persistenceRoot}
-        - variable: config
-          label: "config Storage"
-          description: "Contains all relevant configuration files."
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{persistenceBasic}
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -79,41 +193,41 @@ questions:
 # Include{security}
 # Include{securityContextAdvancedRoot}
               - variable: privileged
-                label: "Privileged mode"
+                label: Privileged mode
                 schema:
                   type: boolean
                   default: false
               - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                label: ReadOnly Root Filesystem
                 schema:
                   type: boolean
                   default: false
               - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                label: Allow Privilege Escalation
                 schema:
                   type: boolean
                   default: false
               - variable: runAsNonRoot
-                label: "runAsNonRoot"
+                label: runAsNonRoot
                 schema:
                   type: boolean
                   default: false
 # Include{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
+          label: runAsUser
-          description: "The UserID of the user running the application"
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
+          label: runAsGroup
-          description: The groupID this App of the user running the application"
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
+          label: fsGroup
-          description: "The group that should own ALL storage."
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568

charts/incubator/adguardhome-sync/values.yaml

@@ -1,26 +1,41 @@
-env:
-  CONFIGFILE: ""
-  UMASK: ""
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/adguardhome-sync
-  tag: latest@sha256:b180e316545dc3ab12b620a20b3c07b7b40b8dfc121f60fbdbfa045840136bd3
+  tag: 0.4.12@sha256:2470e0383ffffd9208b3149015f8ac383d60acc878585df9d6db6110af2ac43d
-persistence:
+
-  config:
+args:
-    enabled: true
+  - run
-    mountPath: /config
+
-podSecurityContext:
+env:
-  runAsGroup: 0
+  ORIGIN_URL: "https://192.168.1.2:3000"
-  runAsUser: 0
+  ORIGIN_USERNAME: "username"
-securityContext:
+  ORIGIN_PASSWORD: "password"
-  readOnlyRootFilesystem: false
+  REPLICA_URL: "http://192.168.1.3"
-  runAsNonRoot: false
+  REPLICA_USERNAME: "username"
+  REPLICA_PASSWORD: "password"
+  CRON: "*/10 * * * *"
+  RUNONSTART: true
+  REPLICA_AUTOSETUP: false
+  REPLICA_INTERFACENAME: ""
+  # Configure sync features; by default all features are enabled.
+  FEATURES_GENERALSETTINGS: true
+  FEATURES_QUERYLOGCONFIG: true
+  FEATURES_STATSCONFIG: true
+  FEATURES_CLIENTSETTINGS: true
+  FEATURES_SERVICES: true
+  FEATURES_FILTERS: true
+  FEATURES_DHCP_SERVERCONFIG: true
+  FEATURES_DHCP_STATICLEASES: true
+  FEATURES_DNS_SERVERCONFIG: true
+  FEATURES_DNS_ACCESSLISTS: true
+  FEATURES_DNS_REWRITES: true
+
 service:
   main:
     ports:
       main:
         port: 8080
-        protocol: TCP
+        protocol: HTTP
         targetPort: 8080
 
 portal: