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
@@ -21,7 +21,7 @@ sources:
- https://github.com/pi-hole
- https://github.com/pi-hole/docker-pi-hole
type: application
version: 6.0.10
version: 6.0.11
annotations:
truecharts.org/catagories: |
- networking
+56 -47
View File
@@ -184,6 +184,62 @@ questions:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns
label: "DNS 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: 53
required: true
- variable: advanced
label: "Show Advanced settings"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: protocol
label: "Port Type"
schema:
type: string
default: "UDP"
enum:
- value: HTTP
description: "HTTP"
- value: "HTTPS"
description: "HTTPS"
- value: TCP
description: "TCP"
- value: "UDP"
description: "UDP"
- variable: nodePort
label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
schema:
type: int
min: 9000
max: 65535
- variable: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 53
- variable: dns-tcp
label: "DNS-TCP Service"
description: "The Primary service on which the healthcheck runs, often the webUI"
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: dns-tcp
label: "DNS-TCP Service Port Configuration"
@@ -232,53 +288,6 @@ questions:
schema:
type: int
default: 53
- variable: dns-udp
label: "DNS 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: 53
required: true
- variable: advanced
label: "Show Advanced settings"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: protocol
label: "Port Type"
schema:
type: string
default: "UDP"
enum:
- value: HTTP
description: "HTTP"
- value: "HTTPS"
description: "HTTPS"
- value: TCP
description: "TCP"
- value: "UDP"
description: "UDP"
- variable: nodePort
label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
schema:
type: int
min: 9000
max: 65535
- variable: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 53
- variable: serviceexpert
group: "Networking and Services"
+5 -2
View File
@@ -22,14 +22,17 @@ service:
main:
port: 9089
targetPort: 80
dns:
dns-tcp:
enabled: true
ports:
dns-tcp:
enabled: true
port: 53
targetPort: 53
dns-udp:
dns:
enabled: true
ports:
dns:
enabled: true
protocol: UDP
port: 53