From af0f2181e7131a9375536b0e8f324f97f7ff1260 Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Wed, 28 Sep 2022 02:10:48 -0400 Subject: [PATCH] fix(keeweb) code cleanup + add http port (#3941) * fix(keeweb) code cleanup + add http port * remove excess space * fix advancedPortHTTP * some changes * some more Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/incubator/keeweb/Chart.yaml | 21 ++++--- charts/incubator/keeweb/questions.yaml | 83 +++++++++++++++++++------- charts/incubator/keeweb/values.yaml | 27 +++++++-- 3 files changed, 92 insertions(+), 39 deletions(-) diff --git a/charts/incubator/keeweb/Chart.yaml b/charts/incubator/keeweb/Chart.yaml index f9685dfc997..90ea84e3a8f 100644 --- a/charts/incubator/keeweb/Chart.yaml +++ b/charts/incubator/keeweb/Chart.yaml @@ -1,18 +1,10 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - Productivity - - Tools-Utilities - - Network-Web - - Network-Management apiVersion: v2 appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org version: 10.6.4 -deprecated: false -description: "This webapp is a browser and desktop password manager compatible with KeePass databases. It doesn't require any server or additional resources. The app can run either in browser, or as a desktop app." +description: This webapp is a browser and desktop password manager compatible with KeePass databases. It doesn't require any server or additional resources. The app can run either in browser, or as a desktop app. home: https://truecharts.org/docs/charts/incubator/keeweb icon: https://truecharts.org/img/hotlink-ok/chart-icons/keeweb.png keywords: @@ -31,5 +23,12 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/keeweb - https://github.com/keeweb/keeweb - https://hub.docker.com/r/antelle/keeweb -type: application -version: 0.0.26 +version: 0.0.27 +annotations: + truecharts.org/catagories: | + - Productivity + - Tools-Utilities + - Network-Web + - Network-Management + truecharts.org/SCALE-support: "true" + truecharts.org/grade: U diff --git a/charts/incubator/keeweb/questions.yaml b/charts/incubator/keeweb/questions.yaml index 8c8bba89a2c..0cb12fbd598 100644 --- a/charts/incubator/keeweb/questions.yaml +++ b/charts/incubator/keeweb/questions.yaml @@ -15,8 +15,8 @@ questions: # Include{containerConfig} # Include{serviceRoot} - variable: main - label: "Main Service" - description: "The Primary service on which the healthcheck runs, often the webUI" + label: Main Service + description: The Primary service on which the healthcheck runs, often the webUI schema: additional_attrs: true type: dict @@ -24,33 +24,62 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: main - label: "Main Service Port Configuration" + label: Main Service Port Configuration schema: additional_attrs: true type: dict attrs: - variable: port - label: "Port" - description: "This port exposes the container port on the service" + label: Port + description: This port exposes the container port on the service schema: type: int default: 8003 required: true -# Include{advancedPortTCP} +# Include{advancedPortHTTPS} - variable: targetPort - label: "Target Port" - description: "The internal(!) port on the container the Application runs on" + label: Target Port + description: The internal(!) port on the container the Application runs on schema: type: int default: 443 + - variable: http + label: HTTP Service + description: The HTTP service + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} + - variable: http + label: HTTP 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: 8004 + required: true +# Include{advancedPortHTTP} + - variable: targetPort + label: Target Port + description: The internal(!) port on the container the Application runs on + schema: + type: int + default: 80 # Include{serviceExpertRoot} default: false # Include{serviceExpert} # Include{serviceList} # Include{persistenceRoot} - - variable: storagenginx - label: "storagenginx Storage" - description: "Place here your files dh.pem, cert.pem and key.pem." + - variable: nginx + label: nginx Storage + description: Place here your files dh.pem, cert.pem and key.pem. schema: additional_attrs: true type: dict @@ -60,7 +89,17 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress + schema: + additional_attrs: true + type: dict + attrs: +# Include{ingressDefault} +# Include{ingressTLS} +# Include{ingressTraefik} +# Include{ingressExpert} + - variable: http + label: HTTP Ingress schema: additional_attrs: true type: dict @@ -73,42 +112,42 @@ questions: # Include{security} # Include{securityContextAdvancedRoot} - variable: privileged - label: "Privileged mode" + label: Privileged mode schema: type: boolean default: false - variable: readOnlyRootFilesystem - label: "ReadOnly Root Filesystem" + label: ReadOnly Root Filesystem schema: type: boolean default: false - variable: allowPrivilegeEscalation - label: "Allow Privilege Escalation" + label: Allow Privilege Escalation schema: type: boolean default: false - variable: runAsNonRoot - label: "runAsNonRoot" + label: runAsNonRoot schema: type: boolean default: false # Include{securityContextAdvanced} # Include{podSecurityContextRoot} - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" + label: runAsUser + description: The UserID of the user running the application schema: type: int default: 0 - variable: runAsGroup - label: "runAsGroup" - description: The groupID this App of the user running the application" + label: runAsGroup + description: The groupID this App of the user running the application schema: type: int default: 0 - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." + label: fsGroup + description: The group that should own ALL storage. schema: type: int default: 568 diff --git a/charts/incubator/keeweb/values.yaml b/charts/incubator/keeweb/values.yaml index b40e96425f0..ffe8446cd87 100644 --- a/charts/incubator/keeweb/values.yaml +++ b/charts/incubator/keeweb/values.yaml @@ -1,25 +1,40 @@ -env: {} image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/keeweb tag: latest@sha256:0a32848c665a36a3c3e06fd97fa6cc2b929aaa158677344f24c8ce369b780f3b -persistence: - storagenginx: - enabled: true - mountPath: /etc/nginx/external/ + podSecurityContext: runAsGroup: 0 runAsUser: 0 + securityContext: readOnlyRootFilesystem: false runAsNonRoot: false + service: main: ports: main: port: 8003 - protocol: TCP + protocol: HTTPS targetPort: 443 + http: + enabled: true + ports: + http: + enabled: true + port: 8004 + protocol: HTTP + targetPort: 80 + +ingress: + http: + autoLink: true + +persistence: + nginx: + enabled: true + mountPath: /etc/nginx/external portal: enabled: true