fix(apps): revert combine ports (#3119)

* Revert "chore(apps): combine some ports"

This reverts commit 6c3a74ab81c77e49a7a115f991862ba920092d51.

* Revert "lints"

This reverts commit b7f3ef949e26b4c4593b69dc2e910ff9dada932f.

* bumps
This commit is contained in:
Stavros Kois
2022-07-10 11:21:55 +02:00
committed by GitHub
parent 9381ef3476
commit a4b896dabf
37 changed files with 355 additions and 152 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ maintainers:
name: adguard-home
sources:
- https://hub.docker.com/r/adguard/adguardhome
version: 1.0.10
version: 1.0.11
annotations:
truecharts.org/catagories: |
- media
+61 -13
View File
@@ -139,9 +139,9 @@ questions:
schema:
type: int
default: 3000
- variable: dns
label: "DNS Service"
description: "DNS service"
- variable: dns-tcp
label: "dns-tcp Service"
description: "dns-tcp service"
schema:
additional_attrs: true
type: dict
@@ -194,6 +194,14 @@ questions:
schema:
type: int
default: 53
- variable: dns-udp
label: "dns-udp Service"
description: "dns-udp service"
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-udp
label: "dns-udp Service Port Configuration"
schema:
@@ -241,9 +249,9 @@ questions:
schema:
type: int
default: 53
- variable: dns-doh
label: "dns-doh Service"
description: "The dns-doh service."
- variable: dns-http
label: "dns-http Service"
description: "The dns-http service."
schema:
additional_attrs: true
type: dict
@@ -296,6 +304,14 @@ questions:
schema:
type: int
default: 80
- variable: dns-https
label: "dns-https Service"
description: "The dns-https service."
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-https
label: "dns-https Service Port Configuration"
schema:
@@ -320,7 +336,7 @@ questions:
label: "Port Type"
schema:
type: string
default: "HTTPS"
default: "HTTP"
enum:
- value: HTTP
description: "HTTP"
@@ -343,6 +359,14 @@ questions:
schema:
type: int
default: 443
- variable: dns-https-udp
label: "dns-https-udp Service"
description: "The dns-https-udp service."
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-https-udp
label: "dns-https-udp Service Port Configuration"
schema:
@@ -398,8 +422,8 @@ questions:
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-crypt-tcp
label: "dns-crypt-tcp Service Port Configuration"
- variable: dns-crypt
label: "dns-crypt Service Port Configuration"
schema:
additional_attrs: true
type: dict
@@ -422,7 +446,7 @@ questions:
label: "Port Type"
schema:
type: string
default: "TCP"
default: "HTTP"
enum:
- value: HTTP
description: "HTTP"
@@ -445,6 +469,14 @@ questions:
schema:
type: int
default: 5443
- variable: dns-crypt-udp
label: "dns-crypt-udp Service"
description: "The dns-crypt-udp service."
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-crypt-udp
label: "dns-crypt-udp Service Port Configuration"
schema:
@@ -492,9 +524,9 @@ questions:
schema:
type: int
default: 5443
- variable: dns-quic
label: "dns-quic Service"
description: "The dns-quic service."
- variable: dns-quic-udp-1
label: "dns-quic-udp-1 Service"
description: "The dns-quic-udp-1 service."
schema:
additional_attrs: true
type: dict
@@ -547,6 +579,14 @@ questions:
schema:
type: int
default: 784
- variable: dns-quic-udp-2
label: "dns-quic-udp-2 Service"
description: "The dns-quic-udp-2 service."
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-quic-udp-2
label: "dns-quic-udp-2 Service Port Configuration"
schema:
@@ -594,6 +634,14 @@ questions:
schema:
type: int
default: 853
- variable: dns-quic-udp-3
label: "dns-quic-udp-3 Service"
description: "The dns-quic-udp-3 service."
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-quic-udp-3
label: "dns-quic-udp-3 Service Port Configuration"
schema:
+22 -4
View File
@@ -18,29 +18,38 @@ service:
main:
port: 10232
targetPort: 3000
dns:
dns-tcp:
enabled: true
ports:
dns-tcp:
enabled: true
port: 53
targetPort: 53
dns-udp:
enabled: true
ports:
dns-udp:
enabled: true
protocol: UDP
port: 53
targetPort: 53
dns-doh:
dns-http:
enabled: true
ports:
dns-http:
enabled: true
port: 10233
targetPort: 80
dns-https:
enabled: true
ports:
dns-https:
enabled: true
port: 10234
targetPort: 443
dns-https-udp:
enabled: true
ports:
dns-https-udp:
enabled: true
protocol: UDP
@@ -49,16 +58,19 @@ service:
dns-crypt:
enabled: true
ports:
dns-crypt-tcp:
dns-crypt:
enabled: true
port: 5443
targetPort: 5443
dns-crypt-udp:
enabled: true
ports:
dns-crypt-udp:
enabled: true
protocol: UDP
port: 5443
targetPort: 5443
dns-quic:
dns-quic-udp-1:
enabled: true
ports:
dns-quic-udp-1:
@@ -66,11 +78,17 @@ service:
protocol: UDP
port: 784
targetPort: 784
dns-quic-udp-2:
enabled: true
ports:
dns-quic-udp-2:
enabled: true
protocol: UDP
port: 853
targetPort: 853
dns-quic-udp-3:
enabled: true
ports:
dns-quic-udp-3:
enabled: true
protocol: UDP