From 8a8269cd74534315e85fefd39287e1b77ee89daa Mon Sep 17 00:00:00 2001 From: MaverickD650 <92877124+MaverickD650@users.noreply.github.com> Date: Mon, 29 May 2023 02:45:00 +0100 Subject: [PATCH] feat(cryptpad): Cryptpad port (#9240) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Port Cryptpad to new common. ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [X] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** Tested with CI on my fork prior to creating PR. **📃 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 - [X] ⚠️ 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._ --- charts/incubator/cryptpad/Chart.yaml | 6 +-- charts/incubator/cryptpad/questions.yaml | 1 + charts/incubator/cryptpad/templates/NOTES.txt | 1 + .../incubator/cryptpad/templates/common.yaml | 2 +- charts/incubator/cryptpad/values.yaml | 40 ++++++++++++++----- 5 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 charts/incubator/cryptpad/templates/NOTES.txt diff --git a/charts/incubator/cryptpad/Chart.yaml b/charts/incubator/cryptpad/Chart.yaml index 922c0629845..86b0d2f0e52 100644 --- a/charts/incubator/cryptpad/Chart.yaml +++ b/charts/incubator/cryptpad/Chart.yaml @@ -8,9 +8,9 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.10.4 deprecated: false -description: CryptPad is the Zero Knowledge realtime collaborative editor.[br]mkdir -p /mnt/user/appdata/cryptpad/config [/br]wget -O /mnt/user/appdata/cryptpad/config/config.js https://raw.githubusercontent.com/xwiki-labs/cryptpad/main/config/config.example.js +description: CryptPad is the Zero Knowledge realtime collaborative editor. home: https://truecharts.org/charts/incubator/cryptpad icon: https://truecharts.org/img/hotlink-ok/chart-icons/cryptpad.png keywords: @@ -27,4 +27,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/cryptpad - https://cryptpad.fr/ type: application -version: 2.0.26 +version: 3.0.0 diff --git a/charts/incubator/cryptpad/questions.yaml b/charts/incubator/cryptpad/questions.yaml index 55d87559de5..d11d63a8d07 100644 --- a/charts/incubator/cryptpad/questions.yaml +++ b/charts/incubator/cryptpad/questions.yaml @@ -14,6 +14,7 @@ questions: # Include{containerAdvanced} # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" diff --git a/charts/incubator/cryptpad/templates/NOTES.txt b/charts/incubator/cryptpad/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/cryptpad/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/cryptpad/templates/common.yaml b/charts/incubator/cryptpad/templates/common.yaml index cbf66c20818..78d963fb168 100644 --- a/charts/incubator/cryptpad/templates/common.yaml +++ b/charts/incubator/cryptpad/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/cryptpad/values.yaml b/charts/incubator/cryptpad/values.yaml index 4160ef3a10d..1e53fec9308 100644 --- a/charts/incubator/cryptpad/values.yaml +++ b/charts/incubator/cryptpad/values.yaml @@ -1,8 +1,32 @@ -env: {} image: pullPolicy: IfNotPresent repository: tccr.io/truecharts/cryptpad tag: latest@sha256:34094a8d0491a70f4debb669779a2fef671b1c25d58daf55e5b446e03420a52b + +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsGroup: 0 + runAsUser: 0 + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: http + path: / + readiness: + type: http + path: / + startup: + type: http + path: / + env: {} + persistence: blobpath: enabled: true @@ -22,18 +46,13 @@ persistence: datastorepath: enabled: true mountPath: /cryptpad/datastore -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + service: main: ports: main: port: 3000 - protocol: HTTP + protocol: http targetPort: 3000 port2: enabled: true @@ -41,8 +60,9 @@ service: port2: enabled: true port: 3001 - protocol: TCP + protocol: tcp targetPort: 3001 portal: - enabled: true + open: + enabled: true