From e3308054020d3d821adc5c8cdbd1b04b188e950a Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Fri, 11 Nov 2022 14:54:11 +0200 Subject: [PATCH] fix(traefik): fix questions. Remove protocol selector globally (#4375) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove sdvanced q from http too * fix traefik * remove traefik * put protocol behind checkbox * bump * remove advanced * remove protocol selector * bump patch🤞 * add desc * dec --- charts/stable/traefik/Chart.yaml | 2 +- charts/stable/traefik/questions.yaml | 17 ++++++++++++--- .../persistence/persistenceAdvanced.yaml | 6 ------ .../persistence/persistenceBasic.yaml | 3 ++- .../questions/service/advancedPortHTTP.yaml | 21 ------------------- .../questions/service/advancedPortHTTPS.yaml | 14 ------------- .../questions/service/advancedPortTCP.yaml | 14 ------------- .../questions/service/advancedPortUDP.yaml | 14 ------------- 8 files changed, 17 insertions(+), 74 deletions(-) delete mode 100644 templates/questions/persistence/persistenceAdvanced.yaml delete mode 100644 templates/questions/service/advancedPortHTTP.yaml delete mode 100644 templates/questions/service/advancedPortHTTPS.yaml delete mode 100644 templates/questions/service/advancedPortTCP.yaml delete mode 100644 templates/questions/service/advancedPortUDP.yaml diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml index b0352e5f692..27f7301c91a 100644 --- a/charts/stable/traefik/Chart.yaml +++ b/charts/stable/traefik/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 14.0.1 +version: 14.1.0 annotations: truecharts.org/catagories: | - network diff --git a/charts/stable/traefik/questions.yaml b/charts/stable/traefik/questions.yaml index 245187272b2..3cc96055b81 100644 --- a/charts/stable/traefik/questions.yaml +++ b/charts/stable/traefik/questions.yaml @@ -209,7 +209,6 @@ questions: additional_attrs: true type: dict attrs: -# Include{advancedPortHTTP} - variable: port label: "Entrypoints Port" schema: @@ -237,7 +236,13 @@ questions: type: int default: 9080 required: true -# Include{advancedPortHTTP} + - variable: advanced + label: Show Advanced Settings + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: - variable: redirectPort label: "Redirect to Port" schema: @@ -261,7 +266,13 @@ questions: type: int default: 9443 required: true -# Include{advancedPortHTTPS} + - variable: advanced + label: Show Advanced Settings + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: - variable: redirectPort label: "Redirect to Port" schema: diff --git a/templates/questions/persistence/persistenceAdvanced.yaml b/templates/questions/persistence/persistenceAdvanced.yaml deleted file mode 100644 index 3430b392015..00000000000 --- a/templates/questions/persistence/persistenceAdvanced.yaml +++ /dev/null @@ -1,6 +0,0 @@ - - variable: size - label: Size quotum of Storage - schema: - show_if: [["type", "=", "pvc"]] - type: string - default: 256Gi diff --git a/templates/questions/persistence/persistenceBasic.yaml b/templates/questions/persistence/persistenceBasic.yaml index c3c139b14e8..ebc1f9a229f 100644 --- a/templates/questions/persistence/persistenceBasic.yaml +++ b/templates/questions/persistence/persistenceBasic.yaml @@ -55,7 +55,8 @@ - value: Memory description: Memory - variable: size - label: Size quotum of Storage + label: Size quotum of Storage (Do NOT REDUCE after installation) + description: This value can ONLY be INCREASED after the installation schema: show_if: [["type", "=", "pvc"]] type: string diff --git a/templates/questions/service/advancedPortHTTP.yaml b/templates/questions/service/advancedPortHTTP.yaml deleted file mode 100644 index d49170758e9..00000000000 --- a/templates/questions/service/advancedPortHTTP.yaml +++ /dev/null @@ -1,21 +0,0 @@ - - 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: HTTP - enum: - - value: HTTP - description: HTTP - - value: HTTPS - description: HTTPS - - value: TCP - description: TCP - - value: UDP - description: UDP diff --git a/templates/questions/service/advancedPortHTTPS.yaml b/templates/questions/service/advancedPortHTTPS.yaml deleted file mode 100644 index 1bb6496fca5..00000000000 --- a/templates/questions/service/advancedPortHTTPS.yaml +++ /dev/null @@ -1,14 +0,0 @@ - - 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 diff --git a/templates/questions/service/advancedPortTCP.yaml b/templates/questions/service/advancedPortTCP.yaml deleted file mode 100644 index 54a891c99d0..00000000000 --- a/templates/questions/service/advancedPortTCP.yaml +++ /dev/null @@ -1,14 +0,0 @@ - - variable: protocol - label: Port Type - schema: - type: string - default: TCP - enum: - - value: HTTP - description: HTTP - - value: HTTPS - description: HTTPS - - value: TCP - description: TCP - - value: UDP - description: UDP diff --git a/templates/questions/service/advancedPortUDP.yaml b/templates/questions/service/advancedPortUDP.yaml deleted file mode 100644 index 9688e3549c8..00000000000 --- a/templates/questions/service/advancedPortUDP.yaml +++ /dev/null @@ -1,14 +0,0 @@ - - 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