From dcb6d8e3e13d801e7031d2e6cf7bc182606c1211 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 7 Nov 2021 11:49:14 +0100 Subject: [PATCH] fix(Apps): prevent duplicate port use and fix some questions.yaml mistakes --- .../stable/apache-musicindex/questions.yaml | 59 +-- charts/stable/calibre/questions.yaml | 2 +- charts/stable/fireflyiii/questions.yaml | 2 +- charts/stable/fossil/questions.yaml | 2 +- charts/stable/gotify/questions.yaml | 2 +- charts/stable/jackett/values.yaml | 1 - charts/stable/komga/questions.yaml | 2 +- charts/stable/miniflux/questions.yaml | 2 +- charts/stable/openkm/questions.yaml | 2 +- charts/stable/owncast/questions.yaml | 2 +- charts/stable/piaware/questions.yaml | 2 +- .../stable/pretend-youre-xyzzy/questions.yaml | 2 +- charts/stable/qbittorrent/questions.yaml | 2 +- charts/stable/statping/questions.yaml | 2 +- charts/stable/teedy/questions.yaml | 2 +- charts/stable/traefik/questions.yaml | 378 ++++++------------ charts/stable/tt-rss/questions.yaml | 2 +- charts/stable/vaultwarden/questions.yaml | 2 +- charts/stable/zigbee2mqtt/questions.yaml | 2 +- templates/questions/persistenceList.yaml | 5 + 20 files changed, 187 insertions(+), 288 deletions(-) diff --git a/charts/stable/apache-musicindex/questions.yaml b/charts/stable/apache-musicindex/questions.yaml index fb621e3df46..8a86c2bd078 100644 --- a/charts/stable/apache-musicindex/questions.yaml +++ b/charts/stable/apache-musicindex/questions.yaml @@ -102,38 +102,45 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable the port" + - variable: advanced + label: "Show Advanced settings" schema: type: boolean - default: true - hidden: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: targetPort - label: "Target Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 80 - + default: false + show_subquestions_if: true + subquestions: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + 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: 80 - variable: port label: "Container Port" schema: type: int - default: 80 + default: 10001 editable: true required: true diff --git a/charts/stable/calibre/questions.yaml b/charts/stable/calibre/questions.yaml index c3cbf289f00..f70e0ef593c 100644 --- a/charts/stable/calibre/questions.yaml +++ b/charts/stable/calibre/questions.yaml @@ -170,7 +170,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10021 editable: true required: true diff --git a/charts/stable/fireflyiii/questions.yaml b/charts/stable/fireflyiii/questions.yaml index 94b7a4e4641..4975572da4c 100644 --- a/charts/stable/fireflyiii/questions.yaml +++ b/charts/stable/fireflyiii/questions.yaml @@ -151,7 +151,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10018 editable: true required: true diff --git a/charts/stable/fossil/questions.yaml b/charts/stable/fossil/questions.yaml index b537ccddcf2..db1850eaac4 100644 --- a/charts/stable/fossil/questions.yaml +++ b/charts/stable/fossil/questions.yaml @@ -141,7 +141,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10017 editable: true required: true diff --git a/charts/stable/gotify/questions.yaml b/charts/stable/gotify/questions.yaml index f3d1d6f1283..153fe32d31b 100644 --- a/charts/stable/gotify/questions.yaml +++ b/charts/stable/gotify/questions.yaml @@ -215,7 +215,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10016 editable: true required: true diff --git a/charts/stable/jackett/values.yaml b/charts/stable/jackett/values.yaml index 2ba768c3c2b..39476bc054f 100644 --- a/charts/stable/jackett/values.yaml +++ b/charts/stable/jackett/values.yaml @@ -16,7 +16,6 @@ service: main: targetPort: 9117 port: 9117 - targetPort: 9117 probes: liveness: diff --git a/charts/stable/komga/questions.yaml b/charts/stable/komga/questions.yaml index 8c5156125da..5824b69ac8a 100644 --- a/charts/stable/komga/questions.yaml +++ b/charts/stable/komga/questions.yaml @@ -140,7 +140,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10015 editable: true required: true diff --git a/charts/stable/miniflux/questions.yaml b/charts/stable/miniflux/questions.yaml index 381457e3417..a9c89eceb3d 100644 --- a/charts/stable/miniflux/questions.yaml +++ b/charts/stable/miniflux/questions.yaml @@ -170,7 +170,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10014 editable: true required: true diff --git a/charts/stable/openkm/questions.yaml b/charts/stable/openkm/questions.yaml index de8ea4c1bb6..397fe431e7c 100644 --- a/charts/stable/openkm/questions.yaml +++ b/charts/stable/openkm/questions.yaml @@ -141,7 +141,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10013 editable: true required: true diff --git a/charts/stable/owncast/questions.yaml b/charts/stable/owncast/questions.yaml index 005a4ab2d21..eed6d12ffe7 100644 --- a/charts/stable/owncast/questions.yaml +++ b/charts/stable/owncast/questions.yaml @@ -140,7 +140,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10012 editable: true required: true diff --git a/charts/stable/piaware/questions.yaml b/charts/stable/piaware/questions.yaml index 553f1be659d..2a1c9c8cfa2 100644 --- a/charts/stable/piaware/questions.yaml +++ b/charts/stable/piaware/questions.yaml @@ -140,7 +140,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10011 editable: true required: true diff --git a/charts/stable/pretend-youre-xyzzy/questions.yaml b/charts/stable/pretend-youre-xyzzy/questions.yaml index 1a27c0911dc..26f73394cec 100644 --- a/charts/stable/pretend-youre-xyzzy/questions.yaml +++ b/charts/stable/pretend-youre-xyzzy/questions.yaml @@ -140,7 +140,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10010 editable: true required: true diff --git a/charts/stable/qbittorrent/questions.yaml b/charts/stable/qbittorrent/questions.yaml index e5ab80c1177..cbea2ae4e86 100644 --- a/charts/stable/qbittorrent/questions.yaml +++ b/charts/stable/qbittorrent/questions.yaml @@ -140,7 +140,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10009 editable: true required: true diff --git a/charts/stable/statping/questions.yaml b/charts/stable/statping/questions.yaml index 8461804ec7e..f109f52633c 100644 --- a/charts/stable/statping/questions.yaml +++ b/charts/stable/statping/questions.yaml @@ -193,7 +193,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10005 editable: true required: true diff --git a/charts/stable/teedy/questions.yaml b/charts/stable/teedy/questions.yaml index bf2bd5806ee..9d91b309c7a 100644 --- a/charts/stable/teedy/questions.yaml +++ b/charts/stable/teedy/questions.yaml @@ -195,7 +195,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10004 editable: true required: true diff --git a/charts/stable/traefik/questions.yaml b/charts/stable/traefik/questions.yaml index e735e5e9854..871bf7e2d10 100644 --- a/charts/stable/traefik/questions.yaml +++ b/charts/stable/traefik/questions.yaml @@ -525,78 +525,46 @@ questions: schema: type: dict attrs: - - variable: enabled - 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: +# Include{serviceSelector} - variable: main label: "Main Entrypoint Configuration" schema: type: dict attrs: - - variable: enabled - label: "Enable the port" + - variable: advanced + label: "Show Advanced settings" schema: type: boolean - default: true - hidden: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - variable: targetPort - label: "Target Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 9000 + default: false + show_subquestions_if: true + subquestions: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + 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: 9000 - variable: port label: "Entrypoints Port" @@ -605,78 +573,52 @@ questions: default: 9000 editable: true required: true - - default: 9000 - variable: tcp - label: "Main Service" + label: "TCP Service" description: "The tcp Entrypoint service" schema: type: dict attrs: - - variable: enabled - 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: +# Include{serviceSelector} - variable: web label: "web Entrypoint Configuration" schema: type: dict attrs: - - variable: enabled - label: "Enable the port" + - variable: advanced + label: "Show Advanced settings" schema: type: boolean - default: true - hidden: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" + default: false + show_subquestions_if: true + subquestions: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + 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: 9080 - variable: port label: "Entrypoints Port" schema: @@ -694,24 +636,40 @@ questions: schema: type: dict attrs: - - variable: enabled - label: "Enable the port" + - variable: advanced + label: "Show Advanced settings" schema: type: boolean - default: true - hidden: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTPS" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" + default: false + show_subquestions_if: true + subquestions: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTPS" + 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: 9443 - variable: port label: "Entrypoints Port" schema: @@ -726,7 +684,6 @@ questions: hidden: true attrs: - variable: enabled - label: "Enable the port" schema: type: boolean default: true @@ -776,7 +733,6 @@ questions: type: dict attrs: - variable: enabled - label: "Enable the port" schema: type: boolean default: true @@ -786,43 +742,7 @@ questions: schema: type: dict attrs: - - variable: enabled - 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 +# Include{serviceSelector} - variable: portsList label: "Additional TCP Entrypoints" schema: @@ -864,78 +784,46 @@ questions: schema: type: dict attrs: - - variable: enabled - 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: +# Include{serviceSelector} - variable: metrics label: "metrics Entrypoints Configurations" schema: type: dict attrs: - - variable: enabled - label: "Enable the port" + - variable: advanced + label: "Show Advanced settings" schema: type: boolean - default: true - hidden: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - variable: targetPort - label: "Target Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 9100 + default: false + show_subquestions_if: true + subquestions: + - variable: protocol + label: "Port Type" + schema: + type: string + default: "HTTP" + 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: 9100 - variable: port label: "Container Port" diff --git a/charts/stable/tt-rss/questions.yaml b/charts/stable/tt-rss/questions.yaml index 0e794cf2adc..17ee8f8d222 100644 --- a/charts/stable/tt-rss/questions.yaml +++ b/charts/stable/tt-rss/questions.yaml @@ -146,7 +146,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10003 editable: true required: true diff --git a/charts/stable/vaultwarden/questions.yaml b/charts/stable/vaultwarden/questions.yaml index 807ca390503..b35e0f95433 100644 --- a/charts/stable/vaultwarden/questions.yaml +++ b/charts/stable/vaultwarden/questions.yaml @@ -435,7 +435,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10023 editable: true required: true diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml index 801441b1d49..106cc4ea86b 100644 --- a/charts/stable/zigbee2mqtt/questions.yaml +++ b/charts/stable/zigbee2mqtt/questions.yaml @@ -146,7 +146,7 @@ questions: label: "Container Port" schema: type: int - default: 8080 + default: 10022 editable: true required: true diff --git a/templates/questions/persistenceList.yaml b/templates/questions/persistenceList.yaml index cd534c522c9..65064df6892 100644 --- a/templates/questions/persistenceList.yaml +++ b/templates/questions/persistenceList.yaml @@ -16,6 +16,11 @@ type: boolean default: 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 label: "Type of Storage" description: "Sets the persistence type, Anything other than PVC could break rollback!"