From 77d8b810b3cebb23176165cf766ef58a1938a2e7 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Mon, 31 Jul 2023 05:15:12 -0400 Subject: [PATCH] feat(Joplin-Server): Return to Stable (#11067) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Solid team effort on the initial migration to new common, it's good for Stable again, modified the doc to remove the unnecessary :443 port that's not needed anymore ⚒️ Fixes # **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ 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._ --- .../{incubator => stable}/joplin-server/.helmignore | 0 .../joplin-server/CHANGELOG.md | 0 .../{incubator => stable}/joplin-server/Chart.yaml | 6 +++--- .../{incubator => stable}/joplin-server/README.md | 0 .../joplin-server/ci/test-values.yaml | 0 .../joplin-server/docs/installation_notes.md | 3 +-- charts/{incubator => stable}/joplin-server/icon.png | Bin .../joplin-server/questions.yaml | 2 +- .../joplin-server/templates/NOTES.txt | 0 .../joplin-server/templates/common.yaml | 0 .../{incubator => stable}/joplin-server/values.yaml | 0 11 files changed, 5 insertions(+), 6 deletions(-) rename charts/{incubator => stable}/joplin-server/.helmignore (100%) rename charts/{incubator => stable}/joplin-server/CHANGELOG.md (100%) rename charts/{incubator => stable}/joplin-server/Chart.yaml (81%) rename charts/{incubator => stable}/joplin-server/README.md (100%) rename charts/{incubator => stable}/joplin-server/ci/test-values.yaml (100%) rename charts/{incubator => stable}/joplin-server/docs/installation_notes.md (85%) rename charts/{incubator => stable}/joplin-server/icon.png (100%) rename charts/{incubator => stable}/joplin-server/questions.yaml (99%) rename charts/{incubator => stable}/joplin-server/templates/NOTES.txt (100%) rename charts/{incubator => stable}/joplin-server/templates/common.yaml (100%) rename charts/{incubator => stable}/joplin-server/values.yaml (100%) diff --git a/charts/incubator/joplin-server/.helmignore b/charts/stable/joplin-server/.helmignore similarity index 100% rename from charts/incubator/joplin-server/.helmignore rename to charts/stable/joplin-server/.helmignore diff --git a/charts/incubator/joplin-server/CHANGELOG.md b/charts/stable/joplin-server/CHANGELOG.md similarity index 100% rename from charts/incubator/joplin-server/CHANGELOG.md rename to charts/stable/joplin-server/CHANGELOG.md diff --git a/charts/incubator/joplin-server/Chart.yaml b/charts/stable/joplin-server/Chart.yaml similarity index 81% rename from charts/incubator/joplin-server/Chart.yaml rename to charts/stable/joplin-server/Chart.yaml index aba7260bed9..f5870e276d3 100644 --- a/charts/incubator/joplin-server/Chart.yaml +++ b/charts/stable/joplin-server/Chart.yaml @@ -6,7 +6,7 @@ dependencies: version: 13.2.2 deprecated: false description: Allows you to sync any Joplin client. -home: https://truecharts.org/charts/incubator/joplin-server +home: https://truecharts.org/charts/stable/joplin-server icon: https://truecharts.org/img/hotlink-ok/chart-icons/joplin-server.png keywords: - joplin @@ -18,11 +18,11 @@ maintainers: url: https://truecharts.org name: joplin-server sources: - - https://github.com/truecharts/charts/tree/master/charts/incubator/joplin-server + - https://github.com/truecharts/charts/tree/master/charts/stable/joplin-server - https://github.com/laurent22/joplin/tree/dev/packages/server - https://github.com/laurent22/joplin type: application -version: 13.0.2 +version: 13.0.3 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/joplin-server/README.md b/charts/stable/joplin-server/README.md similarity index 100% rename from charts/incubator/joplin-server/README.md rename to charts/stable/joplin-server/README.md diff --git a/charts/incubator/joplin-server/ci/test-values.yaml b/charts/stable/joplin-server/ci/test-values.yaml similarity index 100% rename from charts/incubator/joplin-server/ci/test-values.yaml rename to charts/stable/joplin-server/ci/test-values.yaml diff --git a/charts/incubator/joplin-server/docs/installation_notes.md b/charts/stable/joplin-server/docs/installation_notes.md similarity index 85% rename from charts/incubator/joplin-server/docs/installation_notes.md rename to charts/stable/joplin-server/docs/installation_notes.md index 361fb894bed..2facba06ed4 100644 --- a/charts/incubator/joplin-server/docs/installation_notes.md +++ b/charts/stable/joplin-server/docs/installation_notes.md @@ -2,8 +2,7 @@ - To set the variable `App Base Url` correctly: - If you are accessing it _without_ ingress/domain -> `http://IP:PORT`. - - If ingress is enabled, set it to `https://app.mydomain.tld:443`. - - No matter which option you choose it **must** end with the correct `:PORT`. + - If ingress is enabled, set it to `https://app.mydomain.tld`. --- diff --git a/charts/incubator/joplin-server/icon.png b/charts/stable/joplin-server/icon.png similarity index 100% rename from charts/incubator/joplin-server/icon.png rename to charts/stable/joplin-server/icon.png diff --git a/charts/incubator/joplin-server/questions.yaml b/charts/stable/joplin-server/questions.yaml similarity index 99% rename from charts/incubator/joplin-server/questions.yaml rename to charts/stable/joplin-server/questions.yaml index 8a5d9c275ca..6cec4b86446 100644 --- a/charts/incubator/joplin-server/questions.yaml +++ b/charts/stable/joplin-server/questions.yaml @@ -20,7 +20,7 @@ questions: attrs: - variable: APP_BASE_URL label: App Base Url - description: Sets the APP BASE URL, eg http://ip:port | https://app.mydomain.tld:443 + description: Sets the APP BASE URL, eg http://ip:port | https://app.mydomain.tld schema: type: string required: true diff --git a/charts/incubator/joplin-server/templates/NOTES.txt b/charts/stable/joplin-server/templates/NOTES.txt similarity index 100% rename from charts/incubator/joplin-server/templates/NOTES.txt rename to charts/stable/joplin-server/templates/NOTES.txt diff --git a/charts/incubator/joplin-server/templates/common.yaml b/charts/stable/joplin-server/templates/common.yaml similarity index 100% rename from charts/incubator/joplin-server/templates/common.yaml rename to charts/stable/joplin-server/templates/common.yaml diff --git a/charts/incubator/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml similarity index 100% rename from charts/incubator/joplin-server/values.yaml rename to charts/stable/joplin-server/values.yaml