diff --git a/charts/stable/adguard-home/Chart.yaml b/charts/stable/adguard-home/Chart.yaml index aa93d88195c..c5a255bdbf8 100644 --- a/charts/stable/adguard-home/Chart.yaml +++ b/charts/stable/adguard-home/Chart.yaml @@ -19,7 +19,7 @@ name: adguard-home sources: - https://github.com/truecharts/charts/tree/master/charts/stable/adguard-home - https://hub.docker.com/r/adguard/adguardhome -version: 2.0.6 +version: 2.0.7 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/adguard-home/questions.yaml b/charts/stable/adguard-home/questions.yaml index 2092a33a73c..94d79ccc0ec 100644 --- a/charts/stable/adguard-home/questions.yaml +++ b/charts/stable/adguard-home/questions.yaml @@ -15,8 +15,8 @@ questions: # Include{containerConfig} # Include{serviceRoot} - variable: main - label: "Main Service" - description: "The Primary service on which the healthcheck runs, often the webUI" + label: Main Service + description: The Primary service on which the healthcheck runs, often the webUI schema: additional_attrs: true type: dict @@ -24,28 +24,28 @@ 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" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 10232 required: true # Include{advancedPortHTTP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int - default: 3000 + default: 80 - variable: dns-tcp - label: "dns-tcp Service" - description: "dns-tcp service" + label: dns-tcp Service + description: dns-tcp service schema: additional_attrs: true type: dict @@ -53,28 +53,28 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-tcp - label: "dns-tcp Service Port Configuration" + label: dns-tcp Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 53 required: true # Include{advancedPortTCP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 53 - variable: dns-udp - label: "dns-udp Service" - description: "dns-udp service" + label: dns-udp Service + description: dns-udp service schema: additional_attrs: true type: dict @@ -82,57 +82,28 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-udp - label: "dns-udp Service Port Configuration" + label: dns-udp Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 53 required: true # Include{advancedPortUDP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 53 - - variable: dns-http - label: "dns-http Service" - description: "The dns-http service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: dns-http - label: "dns-http Service Port Configuration" - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: "Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 10233 - required: true -# Include{advancedPortHTTP} - - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" - schema: - type: int - default: 80 - variable: dns-https - label: "dns-https Service" - description: "The dns-https service." + label: dns-https Service + description: The dns-https service. schema: additional_attrs: true type: dict @@ -140,28 +111,28 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-https - label: "dns-https Service Port Configuration" + label: dns-https Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 10234 required: true # Include{advancedPortHTTPS} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 443 - variable: dns-https-udp - label: "dns-https-udp Service" - description: "The dns-https-udp service." + label: dns-https-udp Service + description: The dns-https-udp service. schema: additional_attrs: true type: dict @@ -169,28 +140,28 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-https-udp - label: "dns-https-udp Service Port Configuration" + label: dns-https-udp Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 10234 required: true # Include{advancedPortUDP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 443 - variable: dns-crypt - label: "dns-crypt Service" - description: "The dns-crypt service." + label: dns-crypt Service + description: The dns-crypt service. schema: additional_attrs: true type: dict @@ -198,28 +169,28 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-crypt - label: "dns-crypt Service Port Configuration" + label: dns-crypt Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 5443 required: true # Include{advancedPortHTTP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 5443 - variable: dns-crypt-udp - label: "dns-crypt-udp Service" - description: "The dns-crypt-udp service." + label: dns-crypt-udp Service + description: The dns-crypt-udp service. schema: additional_attrs: true type: dict @@ -227,28 +198,28 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-crypt-udp - label: "dns-crypt-udp Service Port Configuration" + label: dns-crypt-udp Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 5443 required: true # Include{advancedPortUDP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 5443 - variable: dns-quic-udp-1 - label: "dns-quic-udp-1 Service" - description: "The dns-quic-udp-1 service." + label: dns-quic-udp-1 Service + description: The dns-quic-udp-1 service. schema: additional_attrs: true type: dict @@ -256,62 +227,62 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: dns-quic-udp-1 - label: "dns-quic-udp-1 Service Port Configuration" + label: dns-quic-udp-1 Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 784 required: true # Include{advancedPortUDP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 784 - variable: dns-quic-udp-2 - label: "dns-quic-udp-2 Service Port Configuration" + label: dns-quic-udp-2 Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 853 required: true # Include{advancedPortUDP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 853 - variable: dns-quic-udp-3 - label: "dns-quic-udp-3 Service Port Configuration" + label: dns-quic-udp-3 Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 8853 required: true # Include{advancedPortUDP} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 8853 @@ -321,8 +292,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: config - label: "App Config Storage" - description: "Stores the Application Configuration." + label: App Config Storage + description: Stores the Application Configuration. schema: additional_attrs: true type: dict @@ -330,8 +301,8 @@ questions: # Include{persistenceBasic} # Include{persistenceAdvanced} - variable: data - label: "App Data Storage" - description: "Stores the Application Data." + label: App Data Storage + description: Stores the Application Data. schema: additional_attrs: true type: dict @@ -341,7 +312,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -354,42 +325,42 @@ 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{securityContextAdvanced} # Include{podSecurityContextRoot} - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" + label: runAsUser + description: The UserID of the user running the application schema: type: int default: 0 - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" + label: runAsGroup + description: The groupID this App of the user running the application schema: type: int default: 0 - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." + label: fsGroup + description: The group that should own ALL storage. schema: type: int default: 568 diff --git a/charts/stable/adguard-home/values.yaml b/charts/stable/adguard-home/values.yaml index 7e422d3de66..38e1e7eaebd 100644 --- a/charts/stable/adguard-home/values.yaml +++ b/charts/stable/adguard-home/values.yaml @@ -3,6 +3,19 @@ image: tag: 0.107.14@sha256:25de77dee1dca14ecb8842e81da2a8690093142dce673207fbe95cc8eb0b0e6d pullPolicy: IfNotPresent +# Those args are copied from the upstream Dockerfile. +# Only port was added. So Adguard won't change port after initial setup +args: + - --no-check-update + - --host + - "0.0.0.0" + - --config + - /opt/adguardhome/conf/AdGuardHome.yaml + - --work-dir + - /opt/adguardhome/work + - --port + - "{{ .Values.service.main.ports.main.port }}" + securityContext: readOnlyRootFilesystem: false runAsNonRoot: false @@ -11,13 +24,23 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 +probes: + liveness: + type: HTTP + path: / + readiness: + type: HTTP + path: / + startup: + type: HTTP + path: / + service: main: ports: main: port: 10232 protocol: HTTP - targetPort: 3000 dns-tcp: enabled: true ports: @@ -33,14 +56,6 @@ service: protocol: UDP port: 53 targetPort: 53 - dns-http: - enabled: true - ports: - dns-http: - enabled: true - protocol: HTTP - port: 10233 - targetPort: 80 dns-https: enabled: true ports: diff --git a/cspell.config.yaml b/cspell.config.yaml index 98cb72837a2..083945f34a7 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -1,5 +1,6 @@ version: "0.2" words: + - adguard - adlist - airsonic - akadmin