fix(Apps): prevent duplicate port use and fix some questions.yaml mistakes

This commit is contained in:
kjeld Schouten-Lebbing
2021-11-07 11:49:14 +01:00
parent d648f10e94
commit dcb6d8e3e1
20 changed files with 187 additions and 288 deletions
+33 -26
View File
@@ -102,38 +102,45 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled - variable: advanced
label: "Enable the port" label: "Show Advanced settings"
schema: schema:
type: boolean type: boolean
default: true default: false
hidden: true show_subquestions_if: true
- variable: protocol subquestions:
label: "Port Type" - variable: protocol
schema: label: "Port Type"
type: string schema:
default: "HTTP" type: string
enum: default: "HTTP"
- value: HTTP enum:
description: "HTTP" - value: HTTP
- value: "HTTPS" description: "HTTP"
description: "HTTPS" - value: "HTTPS"
- value: TCP description: "HTTPS"
description: "TCP" - value: TCP
- value: "UDP" description: "TCP"
description: "UDP" - value: "UDP"
- variable: targetPort description: "UDP"
label: "Target Port" - variable: nodePort
description: "This port exposes the container port on the service" label: "Node Port (Optional)"
schema: description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
type: int schema:
default: 80 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: 80
- variable: port - variable: port
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 80 default: 10001
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -170,7 +170,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10021
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -151,7 +151,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10018
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -141,7 +141,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10017
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -215,7 +215,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10016
editable: true editable: true
required: true required: true
-1
View File
@@ -16,7 +16,6 @@ service:
main: main:
targetPort: 9117 targetPort: 9117
port: 9117 port: 9117
targetPort: 9117
probes: probes:
liveness: liveness:
+1 -1
View File
@@ -140,7 +140,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10015
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -170,7 +170,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10014
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -141,7 +141,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10013
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -140,7 +140,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10012
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -140,7 +140,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10011
editable: true editable: true
required: true required: true
@@ -140,7 +140,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10010
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -140,7 +140,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10009
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -193,7 +193,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10005
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -195,7 +195,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10004
editable: true editable: true
required: true required: true
+133 -245
View File
@@ -525,78 +525,46 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled # Include{serviceSelector}
label: "Enable the service"
schema:
type: boolean
default: true
hidden: true
- variable: type
label: "Service Type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
schema:
type: string
default: "NodePort"
enum:
- value: "NodePort"
description: "NodePort"
- value: "ClusterIP"
description: "ClusterIP"
- value: "LoadBalancer"
description: "LoadBalancer"
- variable: loadBalancerIP
label: "LoadBalancer IP"
description: "LoadBalancerIP"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: string
default: ""
- variable: externalIPs
label: "External IP's"
description: "External IP's"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: list
default: []
items:
- variable: externalIP
label: "External IP"
schema:
type: string
- variable: ports
label: "Service's Entrypoints Configurations"
schema:
type: dict
attrs:
- variable: main - variable: main
label: "Main Entrypoint Configuration" label: "Main Entrypoint Configuration"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled - variable: advanced
label: "Enable the port" label: "Show Advanced settings"
schema: schema:
type: boolean type: boolean
default: true default: false
hidden: true show_subquestions_if: true
- variable: protocol subquestions:
label: "Port Type" - variable: protocol
schema: label: "Port Type"
type: string schema:
default: "HTTP" type: string
enum: default: "HTTP"
- value: HTTP enum:
description: "HTTP" - value: HTTP
- value: "HTTPS" description: "HTTP"
description: "HTTPS" - value: "HTTPS"
- value: TCP description: "HTTPS"
description: "TCP" - value: TCP
- variable: targetPort description: "TCP"
label: "Target Port" - value: "UDP"
description: "This port exposes the container port on the service" description: "UDP"
schema: - variable: nodePort
type: int label: "Node Port (Optional)"
default: 9000 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: 9000
- variable: port - variable: port
label: "Entrypoints Port" label: "Entrypoints Port"
@@ -605,78 +573,52 @@ questions:
default: 9000 default: 9000
editable: true editable: true
required: true required: true
default: 9000
- variable: tcp - variable: tcp
label: "Main Service" label: "TCP Service"
description: "The tcp Entrypoint service" description: "The tcp Entrypoint service"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled # Include{serviceSelector}
label: "Enable the service"
schema:
type: boolean
default: true
hidden: true
- variable: type
label: "Service Type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
schema:
type: string
default: "LoadBalancer"
enum:
- value: "ClusterIP"
description: "ClusterIP"
- value: "LoadBalancer"
description: "LoadBalancer"
- variable: loadBalancerIP
label: "LoadBalancer IP"
description: "LoadBalancerIP"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: string
default: ""
- variable: externalIPs
label: "External IP's"
description: "External IP's"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: list
default: []
items:
- variable: externalIP
label: "External IP"
schema:
type: string
- variable: ports
label: "Service's Entrypoints Configurations"
schema:
type: dict
attrs:
- variable: web - variable: web
label: "web Entrypoint Configuration" label: "web Entrypoint Configuration"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled - variable: advanced
label: "Enable the port" label: "Show Advanced settings"
schema: schema:
type: boolean type: boolean
default: true default: false
hidden: true show_subquestions_if: true
- variable: protocol subquestions:
label: "Port Type" - variable: protocol
schema: label: "Port Type"
type: string schema:
default: "HTTP" type: string
enum: default: "HTTP"
- value: HTTP enum:
description: "HTTP" - value: HTTP
- value: "HTTPS" description: "HTTP"
description: "HTTPS" - value: "HTTPS"
- value: TCP description: "HTTPS"
description: "TCP" - 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: 9080
- variable: port - variable: port
label: "Entrypoints Port" label: "Entrypoints Port"
schema: schema:
@@ -694,24 +636,40 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled - variable: advanced
label: "Enable the port" label: "Show Advanced settings"
schema: schema:
type: boolean type: boolean
default: true default: false
hidden: true show_subquestions_if: true
- variable: protocol subquestions:
label: "Port Type" - variable: protocol
schema: label: "Port Type"
type: string schema:
default: "HTTPS" type: string
enum: default: "HTTPS"
- value: HTTP enum:
description: "HTTP" - value: HTTP
- value: "HTTPS" description: "HTTP"
description: "HTTPS" - value: "HTTPS"
- value: TCP description: "HTTPS"
description: "TCP" - 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: 9443
- variable: port - variable: port
label: "Entrypoints Port" label: "Entrypoints Port"
schema: schema:
@@ -726,7 +684,6 @@ questions:
hidden: true hidden: true
attrs: attrs:
- variable: enabled - variable: enabled
label: "Enable the port"
schema: schema:
type: boolean type: boolean
default: true default: true
@@ -776,7 +733,6 @@ questions:
type: dict type: dict
attrs: attrs:
- variable: enabled - variable: enabled
label: "Enable the port"
schema: schema:
type: boolean type: boolean
default: true default: true
@@ -786,43 +742,7 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled # Include{serviceSelector}
label: "Enable the service"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: type
label: "Service Type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
schema:
type: string
default: "LoadBalancer"
enum:
- value: "ClusterIP"
description: "ClusterIP"
- value: "LoadBalancer"
description: "LoadBalancer"
- variable: loadBalancerIP
label: "LoadBalancer IP"
description: "LoadBalancerIP"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: string
default: ""
- variable: externalIPs
label: "External IP's"
description: "External IP's"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: list
default: []
items:
- variable: externalIP
label: "External IP"
schema:
type: string
- variable: portsList - variable: portsList
label: "Additional TCP Entrypoints" label: "Additional TCP Entrypoints"
schema: schema:
@@ -864,78 +784,46 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled # Include{serviceSelector}
label: "Enable the service"
schema:
type: boolean
default: true
hidden: true
- variable: type
label: "Service Type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
schema:
type: string
default: "NodePort"
enum:
- value: "NodePort"
description: "NodePort"
- value: "ClusterIP"
description: "ClusterIP"
- value: "LoadBalancer"
description: "LoadBalancer"
- variable: loadBalancerIP
label: "LoadBalancer IP"
description: "LoadBalancerIP"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: string
default: ""
- variable: externalIPs
label: "External IP's"
description: "External IP's"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: list
default: []
items:
- variable: externalIP
label: "External IP"
schema:
type: string
- variable: ports
label: "Service's Entrypoints Configuration"
schema:
type: dict
attrs:
- variable: metrics - variable: metrics
label: "metrics Entrypoints Configurations" label: "metrics Entrypoints Configurations"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled - variable: advanced
label: "Enable the port" label: "Show Advanced settings"
schema: schema:
type: boolean type: boolean
default: true default: false
hidden: true show_subquestions_if: true
- variable: protocol subquestions:
label: "Port Type" - variable: protocol
schema: label: "Port Type"
type: string schema:
default: "HTTP" type: string
enum: default: "HTTP"
- value: HTTP enum:
description: "HTTP" - value: HTTP
- value: "HTTPS" description: "HTTP"
description: "HTTPS" - value: "HTTPS"
- value: TCP description: "HTTPS"
description: "TCP" - value: TCP
- variable: targetPort description: "TCP"
label: "Target Port" - value: "UDP"
description: "This port exposes the container port on the service" description: "UDP"
schema: - variable: nodePort
type: int label: "Node Port (Optional)"
default: 9100 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: 9100
- variable: port - variable: port
label: "Container Port" label: "Container Port"
+1 -1
View File
@@ -146,7 +146,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10003
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -435,7 +435,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10023
editable: true editable: true
required: true required: true
+1 -1
View File
@@ -146,7 +146,7 @@ questions:
label: "Container Port" label: "Container Port"
schema: schema:
type: int type: int
default: 8080 default: 10022
editable: true editable: true
required: true required: true
+5
View File
@@ -16,6 +16,11 @@
type: boolean type: boolean
default: true default: true
hidden: true hidden: true
- variable: name
label: "Name (optional)"
description: "Not required, please set to config when mounting /config or temp when mounting /tmp"
schema:
type: string
- variable: type - variable: type
label: "Type of Storage" label: "Type of Storage"
description: "Sets the persistence type, Anything other than PVC could break rollback!" description: "Sets the persistence type, Anything other than PVC could break rollback!"