DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases 1 Wiki Activity

fix(adguard-home): Change port on main service (#3987)

Browse Source 
* fix(adguard-home): Change port on main service

* add docs

* probes

* add --port in args

* again

* unquote

* hmm

* whops

* cleanup
This commit is contained in:
Stavros Kois
2022-10-02 13:39:53 +03:00
committed by GitHub
parent f3384a6e0d
commit cf2da88b37
4 changed files with 108 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/adguard-home/Chart.yaml
+1 -1
View File
@@ -19,7 +19,7 @@ name: adguard-home
sources: sources:
- https://github.com/truecharts/charts/tree/master/charts/stable/adguard-home - https://github.com/truecharts/charts/tree/master/charts/stable/adguard-home
- https://hub.docker.com/r/adguard/adguardhome - https://hub.docker.com/r/adguard/adguardhome
version: 2.0.6 version: 2.0.7
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
charts/stable/adguard-home/questions.yaml
+82 -111
View File
@@ -15,8 +15,8 @@ questions:
# Include{containerConfig} # Include{containerConfig}
# Include{serviceRoot} # Include{serviceRoot}
- variable: main - 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: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -24,28 +24,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: main - variable: main
label: "Main Service Port Configuration" label: Main Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 10232 default: 10232
required: true required: true
# Include{advancedPortHTTP} # Include{advancedPortHTTP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 3000 default: 80
- variable: dns-tcp - variable: dns-tcp
label: "dns-tcp Service" label: dns-tcp Service
description: "dns-tcp service" description: dns-tcp service
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -53,28 +53,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-tcp - variable: dns-tcp
label: "dns-tcp Service Port Configuration" label: dns-tcp Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 53 default: 53
required: true required: true
# Include{advancedPortTCP} # Include{advancedPortTCP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 53 default: 53
- variable: dns-udp - variable: dns-udp
label: "dns-udp Service" label: dns-udp Service
description: "dns-udp service" description: dns-udp service
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -82,57 +82,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-udp - variable: dns-udp
label: "dns-udp Service Port Configuration" label: dns-udp Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 53 default: 53
required: true required: true
# Include{advancedPortUDP} # Include{advancedPortUDP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 53 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 - variable: dns-https
label: "dns-https Service" label: dns-https Service
description: "The dns-https service." description: The dns-https service.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -140,28 +111,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-https - variable: dns-https
label: "dns-https Service Port Configuration" label: dns-https Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 10234 default: 10234
required: true required: true
# Include{advancedPortHTTPS} # Include{advancedPortHTTPS}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 443 default: 443
- variable: dns-https-udp - variable: dns-https-udp
label: "dns-https-udp Service" label: dns-https-udp Service
description: "The dns-https-udp service." description: The dns-https-udp service.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -169,28 +140,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-https-udp - variable: dns-https-udp
label: "dns-https-udp Service Port Configuration" label: dns-https-udp Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 10234 default: 10234
required: true required: true
# Include{advancedPortUDP} # Include{advancedPortUDP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 443 default: 443
- variable: dns-crypt - variable: dns-crypt
label: "dns-crypt Service" label: dns-crypt Service
description: "The dns-crypt service." description: The dns-crypt service.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -198,28 +169,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-crypt - variable: dns-crypt
label: "dns-crypt Service Port Configuration" label: dns-crypt Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 5443 default: 5443
required: true required: true
# Include{advancedPortHTTP} # Include{advancedPortHTTP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 5443 default: 5443
- variable: dns-crypt-udp - variable: dns-crypt-udp
label: "dns-crypt-udp Service" label: dns-crypt-udp Service
description: "The dns-crypt-udp service." description: The dns-crypt-udp service.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -227,28 +198,28 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-crypt-udp - variable: dns-crypt-udp
label: "dns-crypt-udp Service Port Configuration" label: dns-crypt-udp Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 5443 default: 5443
required: true required: true
# Include{advancedPortUDP} # Include{advancedPortUDP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 5443 default: 5443
- variable: dns-quic-udp-1 - variable: dns-quic-udp-1
label: "dns-quic-udp-1 Service" label: dns-quic-udp-1 Service
description: "The dns-quic-udp-1 service." description: The dns-quic-udp-1 service.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -256,62 +227,62 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: dns-quic-udp-1 - variable: dns-quic-udp-1
label: "dns-quic-udp-1 Service Port Configuration" label: dns-quic-udp-1 Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 784 default: 784
required: true required: true
# Include{advancedPortUDP} # Include{advancedPortUDP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 784 default: 784
- variable: dns-quic-udp-2 - variable: dns-quic-udp-2
label: "dns-quic-udp-2 Service Port Configuration" label: dns-quic-udp-2 Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 853 default: 853
required: true required: true
# Include{advancedPortUDP} # Include{advancedPortUDP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 853 default: 853
- variable: dns-quic-udp-3 - variable: dns-quic-udp-3
label: "dns-quic-udp-3 Service Port Configuration" label: dns-quic-udp-3 Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - 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: schema:
type: int type: int
default: 8853 default: 8853
required: true required: true
# Include{advancedPortUDP} # Include{advancedPortUDP}
- variable: targetPort - variable: targetPort
label: "Target Port" label: Target Port
description: "The internal(!) port on the container the Application runs on" description: The internal(!) port on the container the Application runs on
schema: schema:
type: int type: int
default: 8853 default: 8853
@@ -321,8 +292,8 @@ questions:
# Include{serviceList} # Include{serviceList}
# Include{persistenceRoot} # Include{persistenceRoot}
- variable: config - variable: config
label: "App Config Storage" label: App Config Storage
description: "Stores the Application Configuration." description: Stores the Application Configuration.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -330,8 +301,8 @@ questions:
# Include{persistenceBasic} # Include{persistenceBasic}
# Include{persistenceAdvanced} # Include{persistenceAdvanced}
- variable: data - variable: data
label: "App Data Storage" label: App Data Storage
description: "Stores the Application Data." description: Stores the Application Data.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -341,7 +312,7 @@ questions:
# Include{persistenceList} # Include{persistenceList}
# Include{ingressRoot} # Include{ingressRoot}
- variable: main - variable: main
label: "Main Ingress" label: Main Ingress
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -354,42 +325,42 @@ questions:
# Include{security} # Include{security}
# Include{securityContextAdvancedRoot} # Include{securityContextAdvancedRoot}
- variable: privileged - variable: privileged
label: "Privileged mode" label: Privileged mode
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: readOnlyRootFilesystem - variable: readOnlyRootFilesystem
label: "ReadOnly Root Filesystem" label: ReadOnly Root Filesystem
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: allowPrivilegeEscalation - variable: allowPrivilegeEscalation
label: "Allow Privilege Escalation" label: Allow Privilege Escalation
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: runAsNonRoot - variable: runAsNonRoot
label: "runAsNonRoot" label: runAsNonRoot
schema: schema:
type: boolean type: boolean
default: false default: false
# Include{securityContextAdvanced} # Include{securityContextAdvanced}
# Include{podSecurityContextRoot} # Include{podSecurityContextRoot}
- variable: runAsUser - 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: schema:
type: int type: int
default: 0 default: 0
- variable: runAsGroup - 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: schema:
type: int type: int
default: 0 default: 0
- variable: fsGroup - variable: fsGroup
label: "fsGroup" label: fsGroup
description: "The group that should own ALL storage." description: The group that should own ALL storage.
schema: schema:
type: int type: int
default: 568 default: 568
charts/stable/adguard-home/values.yaml
+24 -9
View File
@@ -3,6 +3,19 @@ image:
tag: 0.107.14@sha256:25de77dee1dca14ecb8842e81da2a8690093142dce673207fbe95cc8eb0b0e6d tag: 0.107.14@sha256:25de77dee1dca14ecb8842e81da2a8690093142dce673207fbe95cc8eb0b0e6d
pullPolicy: IfNotPresent 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: securityContext:
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
runAsNonRoot: false runAsNonRoot: false
@@ -11,13 +24,23 @@ podSecurityContext:
runAsUser: 0 runAsUser: 0
runAsGroup: 0 runAsGroup: 0
probes:
liveness:
type: HTTP
path: /
readiness:
type: HTTP
path: /
startup:
type: HTTP
path: /
service: service:
main: main:
ports: ports:
main: main:
port: 10232 port: 10232
protocol: HTTP protocol: HTTP
targetPort: 3000
dns-tcp: dns-tcp:
enabled: true enabled: true
ports: ports:
@@ -33,14 +56,6 @@ service:
protocol: UDP protocol: UDP
port: 53 port: 53
targetPort: 53 targetPort: 53
dns-http:
enabled: true
ports:
dns-http:
enabled: true
protocol: HTTP
port: 10233
targetPort: 80
dns-https: dns-https:
enabled: true enabled: true
ports: ports:
cspell.config.yaml
+1
View File
@@ -1,5 +1,6 @@
version: "0.2" version: "0.2"
words: words:
- adguard
- adlist - adlist
- airsonic - airsonic
- akadmin - akadmin