From 679feda58d4753d654ba6bb5a4fa99d8d3c6d0cd Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:23:02 -0500 Subject: [PATCH] fix(cryptpad): Rework chart to new container (#15191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** User reported this out of date, it was migrated, but upstream changed ownership or something, so might as well update the tags and all now ⚒️ 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?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 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 - [ ] ⬆️ 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 | 4 +-- charts/incubator/cryptpad/questions.yaml | 35 ++++++++++++++++++++++++ charts/incubator/cryptpad/values.yaml | 19 +++++++++---- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/charts/incubator/cryptpad/Chart.yaml b/charts/incubator/cryptpad/Chart.yaml index b4c20da3c50..f5b1c2134e6 100644 --- a/charts/incubator/cryptpad/Chart.yaml +++ b/charts/incubator/cryptpad/Chart.yaml @@ -6,7 +6,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 13.2.2 + version: 14.3.5 deprecated: false description: CryptPad is the Zero Knowledge realtime collaborative editor. home: https://truecharts.org/charts/incubator/cryptpad @@ -25,4 +25,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/cryptpad - https://cryptpad.fr/ type: application -version: 3.0.9 +version: 4.0.0 diff --git a/charts/incubator/cryptpad/questions.yaml b/charts/incubator/cryptpad/questions.yaml index d11d63a8d07..c3454f63c24 100644 --- a/charts/incubator/cryptpad/questions.yaml +++ b/charts/incubator/cryptpad/questions.yaml @@ -10,6 +10,19 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: CPAD_MAIN_DOMAIN + label: CPAD_MAIN_DOMAIN + description: Enter your main Cryptpad Main Domain here + schema: + type: string + default: "" # Include{containerBasic} # Include{containerAdvanced} @@ -60,6 +73,28 @@ questions: type: int default: 3001 required: true + - variable: websocket + label: 'Websocket Port' + description: "Port for Websocket connections" + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} + - variable: websocket + label: "Websocket 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: 3003 + required: true # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} diff --git a/charts/incubator/cryptpad/values.yaml b/charts/incubator/cryptpad/values.yaml index 1e53fec9308..0e1b8176e0e 100644 --- a/charts/incubator/cryptpad/values.yaml +++ b/charts/incubator/cryptpad/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent - repository: tccr.io/truecharts/cryptpad - tag: latest@sha256:34094a8d0491a70f4debb669779a2fef671b1c25d58daf55e5b446e03420a52b + repository: cryptpad/cryptpad + tag: version-5.5.0@sha256:e39fefe674fd5b6c61029a8e233fcb50237acf60e60ac677f9b76446b23104ef securityContext: container: @@ -25,7 +25,9 @@ workload: startup: type: http path: / - env: {} + env: + CPAD_MAIN_DOMAIN: "https://your-main-domain.com" + CPAD_CONF: /cryptpad/config/config.js persistence: blobpath: @@ -34,9 +36,6 @@ persistence: blockpath: enabled: true mountPath: /cryptpad/block - configpath: - enabled: true - mountPath: /cryptpad/config/config.js customizepath: enabled: true mountPath: /cryptpad/customize @@ -62,6 +61,14 @@ service: port: 3001 protocol: tcp targetPort: 3001 + websocket: + enabled: true + ports: + websocket: + enabled: true + port: 3003 + protocol: tcp + targetPort: 3003 portal: open: