From 49f9262181ccdd9279d660de41bc0860c8297b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfred=20G=C3=B6ppel?=
 <43101280+alfi0812@users.noreply.github.com>
Date: Tue, 21 Apr 2026 17:33:35 +0200
Subject: [PATCH] fix(etherpad): Update etherpad to ghcr image  (#47306)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code
- [ ] 📜 Documentation Changes

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ 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 changes to the documentation
- [ ] 🧪 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
- [x] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or
`fix(docs):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ 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/stable/etherpad/Chart.yaml  | 6 +++---
 charts/stable/etherpad/values.yaml | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/charts/stable/etherpad/Chart.yaml b/charts/stable/etherpad/Chart.yaml
index 224106dbbfa..c279b5f2418 100644
--- a/charts/stable/etherpad/Chart.yaml
+++ b/charts/stable/etherpad/Chart.yaml
@@ -9,7 +9,7 @@ annotations:
   trueforge.org/min_helm_version: "3.14"
   trueforge.org/train: stable
 apiVersion: v2
-appVersion: 1.8.14
+appVersion: 2.6.1
 dependencies:
   - name: common
     version: 29.1.0
@@ -35,9 +35,9 @@ maintainers:
 name: etherpad
 sources:
   - https://etherpad.org/
-  - https://ghcr.io/nicholaswilde/etherpad
+  - https://ghcr.io/ether/etherpad
   - https://github.com/ether/etherpad-lite
   - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/etherpad
 type: application
-version: 20.1.0
+version: 21.0.0
 
diff --git a/charts/stable/etherpad/values.yaml b/charts/stable/etherpad/values.yaml
index 873f510cb8b..0482f5372c7 100644
--- a/charts/stable/etherpad/values.yaml
+++ b/charts/stable/etherpad/values.yaml
@@ -1,8 +1,8 @@
 # yaml-language-server: $schema=./values.schema.json
 image:
-  repository: ghcr.io/nicholaswilde/etherpad
+  repository: ghcr.io/ether/etherpad
   pullPolicy: IfNotPresent
-  tag: version-1.8.14@sha256:26bbd45110d5b4d70246fafe40d4c4a7047b7b4fde409763a125324fa93b2d73
+  tag: 2.6.1@sha256:69a697fe6bf75aecf8748d734bcca5f0e596a6eeec8342ab030d0da8a6f224d5
 securityContext:
   container:
     readOnlyRootFilesystem: false
@@ -44,9 +44,6 @@ persistence:
   data:
     enabled: true
     mountPath: "/opt/etherpad-lite/var"
-  app:
-    enabled: true
-    mountPath: "/opt/etherpad-lite/app"
 cnpg:
   main:
     enabled: true