From 98d442673dab379e1e2594d21dc84cfed508cb78 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Tue, 29 Aug 2023 13:08:45 -0400 Subject: [PATCH] feat(servas) move servas to stable (#11981) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Move app to stable ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- .../{incubator => stable}/servas/.helmignore | 0 .../{incubator => stable}/servas/CHANGELOG.md | 0 .../{incubator => stable}/servas/Chart.yaml | 8 +-- charts/{incubator => stable}/servas/README.md | 0 charts/{incubator => stable}/servas/icon.png | Bin .../servas/questions.yaml | 57 ++++++------------ .../servas/templates/NOTES.txt | 0 .../servas/templates/_secrets.tpl | 0 .../servas/templates/common.yaml | 2 +- .../{incubator => stable}/servas/values.yaml | 32 +++++----- 10 files changed, 40 insertions(+), 59 deletions(-) rename charts/{incubator => stable}/servas/.helmignore (100%) rename charts/{incubator => stable}/servas/CHANGELOG.md (100%) rename charts/{incubator => stable}/servas/Chart.yaml (80%) rename charts/{incubator => stable}/servas/README.md (100%) rename charts/{incubator => stable}/servas/icon.png (100%) rename charts/{incubator => stable}/servas/questions.yaml (63%) rename charts/{incubator => stable}/servas/templates/NOTES.txt (100%) rename charts/{incubator => stable}/servas/templates/_secrets.tpl (100%) rename charts/{incubator => stable}/servas/templates/common.yaml (83%) rename charts/{incubator => stable}/servas/values.yaml (93%) diff --git a/charts/incubator/servas/.helmignore b/charts/stable/servas/.helmignore similarity index 100% rename from charts/incubator/servas/.helmignore rename to charts/stable/servas/.helmignore diff --git a/charts/incubator/servas/CHANGELOG.md b/charts/stable/servas/CHANGELOG.md similarity index 100% rename from charts/incubator/servas/CHANGELOG.md rename to charts/stable/servas/CHANGELOG.md diff --git a/charts/incubator/servas/Chart.yaml b/charts/stable/servas/Chart.yaml similarity index 80% rename from charts/incubator/servas/Chart.yaml rename to charts/stable/servas/Chart.yaml index 2401d2f3398..7d6f182e8fc 100644 --- a/charts/incubator/servas/Chart.yaml +++ b/charts/stable/servas/Chart.yaml @@ -3,14 +3,14 @@ appVersion: "0.0.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 13.2.2 + version: 14.0.3 - condition: mariadb.enabled name: mariadb repository: https://deps.truecharts.org/ version: 7.0.70 deprecated: false description: A self-hosted bookmark management tool. -home: https://truecharts.org/charts/incubator/servas +home: https://truecharts.org/charts/stable/servas icon: https://truecharts.org/img/hotlink-ok/chart-icons/servas.png keywords: - servas @@ -22,10 +22,10 @@ maintainers: url: https://truecharts.org name: servas sources: - - https://github.com/truecharts/charts/tree/master/charts/incubator/servas + - https://github.com/truecharts/charts/tree/master/charts/stable/servas - https://github.com/beromir/Servas type: application -version: 0.0.12 +version: 0.0.13 annotations: truecharts.org/catagories: | - bookmarks diff --git a/charts/incubator/servas/README.md b/charts/stable/servas/README.md similarity index 100% rename from charts/incubator/servas/README.md rename to charts/stable/servas/README.md diff --git a/charts/incubator/servas/icon.png b/charts/stable/servas/icon.png similarity index 100% rename from charts/incubator/servas/icon.png rename to charts/stable/servas/icon.png diff --git a/charts/incubator/servas/questions.yaml b/charts/stable/servas/questions.yaml similarity index 63% rename from charts/incubator/servas/questions.yaml rename to charts/stable/servas/questions.yaml index 3810418e518..23965645a7a 100644 --- a/charts/incubator/servas/questions.yaml +++ b/charts/stable/servas/questions.yaml @@ -23,36 +23,26 @@ questions: schema: type: string default: "Servas" - - variable: APP_DEBUG - label: App Debug - schema: - type: string - default: "true" - enum: - - value: "true" - description: "True" - - value: "false" - description: "False" - variable: APP_URL label: App Url - description: "set as http://ip:port or https://mydomain.tld" + description: "Configure it either as http://ip:port or as https://mydomain.tld." schema: type: string default: "" + - variable: APP_DEBUG + label: App Debug + description: App Debug + schema: + type: boolean + default: true - variable: SERVAS_ENABLE_REGISTRATION label: Servas Enable Registration schema: - type: string - default: "true" - enum: - - value: "true" - description: "True" - - value: "false" - description: "False" + type: boolean + default: true # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} # Include{podOptions} # Include{serviceRoot} @@ -60,14 +50,14 @@ 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: 11080 @@ -75,19 +65,10 @@ questions: # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} -# Include{persistenceRoot} - - variable: nginx - label: "App Nginx Storage" - description: "Stores the Application Nginx." - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -100,14 +81,14 @@ questions: # Include{securityContextRoot} - 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 @@ -115,8 +96,8 @@ questions: # Include{securityContextAdvanced} # Include{securityContextPod} - 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/servas/templates/NOTES.txt b/charts/stable/servas/templates/NOTES.txt similarity index 100% rename from charts/incubator/servas/templates/NOTES.txt rename to charts/stable/servas/templates/NOTES.txt diff --git a/charts/incubator/servas/templates/_secrets.tpl b/charts/stable/servas/templates/_secrets.tpl similarity index 100% rename from charts/incubator/servas/templates/_secrets.tpl rename to charts/stable/servas/templates/_secrets.tpl diff --git a/charts/incubator/servas/templates/common.yaml b/charts/stable/servas/templates/common.yaml similarity index 83% rename from charts/incubator/servas/templates/common.yaml rename to charts/stable/servas/templates/common.yaml index 31d108371d4..fffbc90f30a 100644 --- a/charts/incubator/servas/templates/common.yaml +++ b/charts/stable/servas/templates/common.yaml @@ -4,7 +4,7 @@ {{/* Render secrets for servas */}} {{- $secrets := include "servas.secrets" . | fromYaml -}} {{- if $secrets -}} - {{- $_ := set .Values.secret "secrets" $secrets -}} + {{- $_ := set .Values.secret "servas-secrets" $secrets -}} {{- end -}} {{/* Render the templates */}} diff --git a/charts/incubator/servas/values.yaml b/charts/stable/servas/values.yaml similarity index 93% rename from charts/incubator/servas/values.yaml rename to charts/stable/servas/values.yaml index bebf3fa9123..1f83045581b 100644 --- a/charts/incubator/servas/values.yaml +++ b/charts/stable/servas/values.yaml @@ -9,7 +9,14 @@ securityContext: readOnlyRootFilesystem: false runAsUser: 0 runAsGroup: 0 - fsGroup: 568 + +service: + main: + ports: + main: + protocol: http + targetPort: 80 + port: 11080 workload: main: @@ -30,10 +37,10 @@ workload: APP_NAME: Servas APP_KEY: secretKeyRef: - name: secrets + name: servas-secrets key: APP_KEY APP_ENV: production - APP_DEBUG: true + APP_DEBUG: false # APP_URL: "http://localhost:{{ .Values.service.main.ports.main.port }}" SERVAS_ENABLE_REGISTRATION: true DB_CONNECTION: mysql @@ -51,24 +58,17 @@ workload: name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' key: mariadb-password -service: - main: - ports: - main: - protocol: http - targetPort: 80 - port: 11080 - persistence: nginx: enabled: true - mountPath: /var/run/nginx - -portal: - open: - enabled: true + mountPath: "/var/run/nginx" + type: emptyDir mariadb: enabled: true mariadbUsername: servas mariadbDatabase: servas + +portal: + open: + enabled: true