From 30b6f3737a97f058ee8e3093596ab9d424772351 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Wed, 14 Apr 2021 11:25:46 +0200 Subject: [PATCH] Fix DOMAIN bug, Prevent the use of NodePort and enforce Reverse Proxy (#342) --- docs/apps/stable/bitwarden/notes.md | 4 + stable/bitwarden/{1.0.0 => 1.0.1}/.helmignore | 0 stable/bitwarden/{1.0.0 => 1.0.1}/CONFIG.md | 0 stable/bitwarden/{1.0.0 => 1.0.1}/Chart.lock | 0 stable/bitwarden/{1.0.0 => 1.0.1}/Chart.yaml | 2 +- stable/bitwarden/{1.0.0 => 1.0.1}/README.md | 0 .../bitwarden/{1.0.0 => 1.0.1}/app-readme.md | 0 .../{1.0.0 => 1.0.1}/charts/common-2.2.2.tgz | Bin .../charts/postgresql-10.3.15.tgz | Bin .../bitwarden/{1.0.0 => 1.0.1}/ix_values.yaml | 2 +- .../bitwarden/{1.0.0 => 1.0.1}/questions.yaml | 161 +++++++++--------- .../templates/_specialingress.tpl | 0 .../{1.0.0 => 1.0.1}/templates/_validate.tpl | 0 .../{1.0.0 => 1.0.1}/templates/common.yaml | 0 .../{1.0.0 => 1.0.1}/templates/configmap.yaml | 0 .../{1.0.0 => 1.0.1}/templates/secrets.yaml | 0 .../{1.0.0 => 1.0.1}/test_values.yaml | 0 stable/bitwarden/{1.0.0 => 1.0.1}/values.yaml | 0 18 files changed, 86 insertions(+), 83 deletions(-) create mode 100644 docs/apps/stable/bitwarden/notes.md rename stable/bitwarden/{1.0.0 => 1.0.1}/.helmignore (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/CONFIG.md (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/Chart.lock (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/Chart.yaml (98%) rename stable/bitwarden/{1.0.0 => 1.0.1}/README.md (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/app-readme.md (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/charts/common-2.2.2.tgz (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/charts/postgresql-10.3.15.tgz (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/ix_values.yaml (88%) rename stable/bitwarden/{1.0.0 => 1.0.1}/questions.yaml (89%) rename stable/bitwarden/{1.0.0 => 1.0.1}/templates/_specialingress.tpl (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/templates/_validate.tpl (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/templates/common.yaml (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/templates/configmap.yaml (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/templates/secrets.yaml (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/test_values.yaml (100%) rename stable/bitwarden/{1.0.0 => 1.0.1}/values.yaml (100%) diff --git a/docs/apps/stable/bitwarden/notes.md b/docs/apps/stable/bitwarden/notes.md new file mode 100644 index 00000000000..ac32b4213c3 --- /dev/null +++ b/docs/apps/stable/bitwarden/notes.md @@ -0,0 +1,4 @@ +# Installation Notes + +* NodePort is not available as an option, as Bitwarden_rs requires HTTPS and a proxy to split webtraffic from https. ( https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-HTTPS ) +* NodePort not being an option, means Ingress is a requirement too. diff --git a/stable/bitwarden/1.0.0/.helmignore b/stable/bitwarden/1.0.1/.helmignore similarity index 100% rename from stable/bitwarden/1.0.0/.helmignore rename to stable/bitwarden/1.0.1/.helmignore diff --git a/stable/bitwarden/1.0.0/CONFIG.md b/stable/bitwarden/1.0.1/CONFIG.md similarity index 100% rename from stable/bitwarden/1.0.0/CONFIG.md rename to stable/bitwarden/1.0.1/CONFIG.md diff --git a/stable/bitwarden/1.0.0/Chart.lock b/stable/bitwarden/1.0.1/Chart.lock similarity index 100% rename from stable/bitwarden/1.0.0/Chart.lock rename to stable/bitwarden/1.0.1/Chart.lock diff --git a/stable/bitwarden/1.0.0/Chart.yaml b/stable/bitwarden/1.0.1/Chart.yaml similarity index 98% rename from stable/bitwarden/1.0.0/Chart.yaml rename to stable/bitwarden/1.0.1/Chart.yaml index 7e4d4334382..528ab60c177 100644 --- a/stable/bitwarden/1.0.0/Chart.yaml +++ b/stable/bitwarden/1.0.1/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: bitwarden -version: 1.0.0 +version: 1.0.1 upstream_version: 2.1.5 appVersion: "auto" description: Unofficial Bitwarden compatible server written in Rust diff --git a/stable/bitwarden/1.0.0/README.md b/stable/bitwarden/1.0.1/README.md similarity index 100% rename from stable/bitwarden/1.0.0/README.md rename to stable/bitwarden/1.0.1/README.md diff --git a/stable/bitwarden/1.0.0/app-readme.md b/stable/bitwarden/1.0.1/app-readme.md similarity index 100% rename from stable/bitwarden/1.0.0/app-readme.md rename to stable/bitwarden/1.0.1/app-readme.md diff --git a/stable/bitwarden/1.0.0/charts/common-2.2.2.tgz b/stable/bitwarden/1.0.1/charts/common-2.2.2.tgz similarity index 100% rename from stable/bitwarden/1.0.0/charts/common-2.2.2.tgz rename to stable/bitwarden/1.0.1/charts/common-2.2.2.tgz diff --git a/stable/bitwarden/1.0.0/charts/postgresql-10.3.15.tgz b/stable/bitwarden/1.0.1/charts/postgresql-10.3.15.tgz similarity index 100% rename from stable/bitwarden/1.0.0/charts/postgresql-10.3.15.tgz rename to stable/bitwarden/1.0.1/charts/postgresql-10.3.15.tgz diff --git a/stable/bitwarden/1.0.0/ix_values.yaml b/stable/bitwarden/1.0.1/ix_values.yaml similarity index 88% rename from stable/bitwarden/1.0.0/ix_values.yaml rename to stable/bitwarden/1.0.1/ix_values.yaml index bc81215cb88..e660de58d10 100644 --- a/stable/bitwarden/1.0.0/ix_values.yaml +++ b/stable/bitwarden/1.0.1/ix_values.yaml @@ -10,7 +10,7 @@ image: tag: 1.20.0 envTpl: - DOMAIN: "{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}https://{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ end }}{{ end }}" + DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}" envFrom: - configMapRef: diff --git a/stable/bitwarden/1.0.0/questions.yaml b/stable/bitwarden/1.0.1/questions.yaml similarity index 89% rename from stable/bitwarden/1.0.0/questions.yaml rename to stable/bitwarden/1.0.1/questions.yaml index ddca9cfbb2e..3d19b79e922 100644 --- a/stable/bitwarden/1.0.0/questions.yaml +++ b/stable/bitwarden/1.0.1/questions.yaml @@ -429,18 +429,21 @@ questions: schema: type: boolean default: false + hidden: true - variable: services group: "Networking" label: "Configure Service" schema: type: dict + hidden: true attrs: - variable: main label: "Main service" description: "The Primary service on which the healthcheck runs, often the webUI" schema: type: dict + hidden: true attrs: - variable: enabled label: "Enable the service" @@ -454,9 +457,8 @@ questions: schema: type: string default: "ClusterIP" + hidden: true enum: - - value: "NodePort" - description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - variable: port @@ -469,12 +471,10 @@ questions: schema: type: string default: "HTTP" - hidden: false + hidden: true enum: - value: HTTP description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - variable: port label: "container port" schema: @@ -499,11 +499,13 @@ questions: max: 65535 default: 36052 required: true + hidden: true - variable: ws label: "Websocket service" description: "Websocket Service" schema: type: dict + hidden: true attrs: - variable: enabled label: "Enable the service" @@ -517,9 +519,8 @@ questions: schema: type: string default: "ClusterIP" + hidden: true enum: - - value: "NodePort" - description: "NodePort" - value: "ClusterIP" description: "ClusterIP" - variable: port @@ -532,12 +533,10 @@ questions: schema: type: string default: "HTTP" - hidden: false + hidden: true enum: - value: HTTP description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - variable: port label: "container port" schema: @@ -562,6 +561,7 @@ questions: max: 65535 default: 36053 required: true + hidden: true ## TrueCharts Specific @@ -813,77 +813,76 @@ questions: label: "Enable Web Reverse Proxy" schema: type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: type - label: "Reverse Proxy Type" + default: true + hidden: true + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: hosts + label: "Hosts" + schema: + type: list + default: [] + items: + - variable: host + label: "Host" schema: - type: string - default: "HTTP" - hidden: true - editable: false - required: true - - variable: serviceName - label: "Service name to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - - variable: entrypoint - label: "Select Entrypoint" - schema: - type: string - default: "websecure" - required: true - enum: - - value: "websecure" - description: "Websecure: HTTPS/TLS port 443" - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: + type: dict + attrs: - variable: host - label: "Host" + label: "Domain Name" + required: true schema: - type: dict - attrs: - - variable: host - label: "Domain Name" - required: true - schema: - type: string - - variable: path - label: "path" - schema: - type: string - required: true - hidden: true - default: "/" - - variable: certType - label: "Select Certificate Type" - schema: - type: string - default: "selfsigned" - enum: - - value: "" - description: "No Encryption/TLS/Certificates" - - value: "selfsigned" - description: "Self-Signed Certificate" - - value: "ixcert" - description: "TrueNAS SCALE Certificate" - - variable: certificate - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - show_if: [["certType", "=", "ixcert"]] - $ref: - - "definitions/certificate" - - variable: authForwardURL - label: "Forward Authentication URL" - schema: - type: string - default: "" + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: true + default: "/" + - variable: certType + label: "Select Certificate Type" + schema: + type: string + default: "selfsigned" + enum: + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + type: string + default: "" diff --git a/stable/bitwarden/1.0.0/templates/_specialingress.tpl b/stable/bitwarden/1.0.1/templates/_specialingress.tpl similarity index 100% rename from stable/bitwarden/1.0.0/templates/_specialingress.tpl rename to stable/bitwarden/1.0.1/templates/_specialingress.tpl diff --git a/stable/bitwarden/1.0.0/templates/_validate.tpl b/stable/bitwarden/1.0.1/templates/_validate.tpl similarity index 100% rename from stable/bitwarden/1.0.0/templates/_validate.tpl rename to stable/bitwarden/1.0.1/templates/_validate.tpl diff --git a/stable/bitwarden/1.0.0/templates/common.yaml b/stable/bitwarden/1.0.1/templates/common.yaml similarity index 100% rename from stable/bitwarden/1.0.0/templates/common.yaml rename to stable/bitwarden/1.0.1/templates/common.yaml diff --git a/stable/bitwarden/1.0.0/templates/configmap.yaml b/stable/bitwarden/1.0.1/templates/configmap.yaml similarity index 100% rename from stable/bitwarden/1.0.0/templates/configmap.yaml rename to stable/bitwarden/1.0.1/templates/configmap.yaml diff --git a/stable/bitwarden/1.0.0/templates/secrets.yaml b/stable/bitwarden/1.0.1/templates/secrets.yaml similarity index 100% rename from stable/bitwarden/1.0.0/templates/secrets.yaml rename to stable/bitwarden/1.0.1/templates/secrets.yaml diff --git a/stable/bitwarden/1.0.0/test_values.yaml b/stable/bitwarden/1.0.1/test_values.yaml similarity index 100% rename from stable/bitwarden/1.0.0/test_values.yaml rename to stable/bitwarden/1.0.1/test_values.yaml diff --git a/stable/bitwarden/1.0.0/values.yaml b/stable/bitwarden/1.0.1/values.yaml similarity index 100% rename from stable/bitwarden/1.0.0/values.yaml rename to stable/bitwarden/1.0.1/values.yaml