From 1e5bbd85fe4bf6034358bb7ab099c79d27e4d2cf Mon Sep 17 00:00:00 2001 From: yougotborked Date: Thu, 28 Dec 2023 04:39:45 -0600 Subject: [PATCH] migrate(awesome-ttrss) migrate awesome-ttrss to new common **BREAKING CHANGES** (#13418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Update awesome-ttrss to the new common and update the app version ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [x] ⚠️ 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 - [ ] 👀 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> Co-authored-by: Stavros kois --- .github/renovate.json5 | 6 ++ charts/incubator/awesome-ttrss/Chart.yaml | 43 +++++----- charts/incubator/awesome-ttrss/questions.yaml | 17 ++-- .../awesome-ttrss/templates/NOTES.txt | 0 charts/incubator/awesome-ttrss/values.yaml | 86 ++++++++++++------- 5 files changed, 95 insertions(+), 57 deletions(-) create mode 100644 charts/incubator/awesome-ttrss/templates/NOTES.txt diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 512c42dd752..ee393527e5f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -371,6 +371,12 @@ "matchPackagePatterns": ["^jitsi\\/.*$"], "automerge": true, }, + { + "matchDatasources": ["docker"], + "versioning": "regex:^latest-(?\\d{4})-(?\\d{2})-(?\\d{2})$", + "matchPackagePatterns": ["^wangqiru/ttrss$"], + "automerge": true, + }, { "matchDatasources": ["docker"], "versioning": "regex:^(?\\d+)\\.(?\\d+)\\.(?\\d+)$", diff --git a/charts/incubator/awesome-ttrss/Chart.yaml b/charts/incubator/awesome-ttrss/Chart.yaml index 5f30d14892a..2139d844e24 100644 --- a/charts/incubator/awesome-ttrss/Chart.yaml +++ b/charts/incubator/awesome-ttrss/Chart.yaml @@ -1,37 +1,36 @@ -kubeVersion: ">=1.24.0-0" +kubeVersion: '>=1.24.0' apiVersion: v2 name: awesome-ttrss -version: 5.0.9 -appVersion: latest +version: 4.0.0 +appVersion: "v2023-06" description: Awesome TTRSS aims to provide a powerful Chartized all-in-one solution for Tiny Tiny RSS +type: application +deprecated: false home: https://truecharts.org/charts/incubator/awesome-ttrss icon: https://truecharts.org/img/hotlink-ok/chart-icons/awesome-ttrss.png -deprecated: false sources: - - https://github.com/HenryQW/Awesome-TTRSS - - https://github.com/truecharts/charts/tree/master/charts/incubator/awesome-ttrss - - https://hub.docker.com/r/wangqiru/ttrss +- https://github.com/HenryQW/Awesome-TTRSS +- https://github.com/truecharts/charts/tree/master/charts/incubator/awesome-ttrss maintainers: - - name: TrueCharts - email: info@truecharts.org - url: https://truecharts.org +- name: TrueCharts + email: info@truecharts.org + url: https://truecharts.org keywords: - - tt-rss - - awesome-ttrss +- tt-rss +- awesome-ttrss dependencies: - - name: common - version: 16.2.7 - repository: https://library-charts.truecharts.org - condition: "" - alias: "" - tags: [] - import-values: [] +- name: common + version: 17.1.4 + repository: https://library-charts.truecharts.org + condition: "" + alias: "" + tags: [] + import-values: [] annotations: - max_scale_version: 23.10.2 - min_scale_version: 23.10.0 + max_scale_version: 23.10.1 + min_scale_version: 22.12.4 truecharts.org/SCALE-support: "true" truecharts.org/category: media truecharts.org/max_helm_version: "3.13" truecharts.org/min_helm_version: "3.12" truecharts.org/train: incubator -type: application diff --git a/charts/incubator/awesome-ttrss/questions.yaml b/charts/incubator/awesome-ttrss/questions.yaml index fb41f52047d..7c3fcbd8e3e 100644 --- a/charts/incubator/awesome-ttrss/questions.yaml +++ b/charts/incubator/awesome-ttrss/questions.yaml @@ -6,13 +6,12 @@ questions: # Include{global} # Include{workload} # Include{workloadDeployment} - # Include{replicas1} # Include{podSpec} # Include{containerMain} - - variable: env - label: Image Environment + group: "App Configuration" + label: "Image Environment" schema: additional_attrs: true type: dict @@ -28,7 +27,13 @@ questions: # Include{containerConfig} # Include{podOptions} # Include{serviceRoot} -# Include{serviceMain} + - variable: main + label: "Main Service" + description: "The Primary service on which the healthcheck runs, often the webUI" + schema: + additional_attrs: true + type: dict + attrs: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: main @@ -86,7 +91,6 @@ questions: # Include{ingressAdvanced} # Include{ingressList} # Include{securityContextRoot} - - variable: runAsUser label: "runAsUser" description: "The UserID of the user running the application" @@ -110,7 +114,8 @@ questions: default: 568 # Include{resources} -# Include{postgresql} +# Include{metrics} +# Include{prometheusRule} # Include{advanced} # Include{addons} # Include{codeserver} diff --git a/charts/incubator/awesome-ttrss/templates/NOTES.txt b/charts/incubator/awesome-ttrss/templates/NOTES.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/charts/incubator/awesome-ttrss/values.yaml b/charts/incubator/awesome-ttrss/values.yaml index a02e298bd03..05c90d1b9d4 100644 --- a/charts/incubator/awesome-ttrss/values.yaml +++ b/charts/incubator/awesome-ttrss/values.yaml @@ -1,53 +1,81 @@ -cnpg: - main: - database: awesome-ttrss - enabled: true - user: awesome-ttrss image: - pullPolicy: IfNotPresent repository: wangqiru/ttrss - tag: latest@sha256:b883ac1dad416ecf17cb351f641497348912e9790c3600f36bdd4436c5872b14 -persistence: - icons: - enabled: true - mountPath: /var/www/feed-icons - plugins: - enabled: true - mountPath: /var/www/plugins.local - themes: - enabled: true - mountPath: /var/www/themes.local -portal: - open: - enabled: true + pullPolicy: IfNotPresent + tag: latest-2023-12-18@sha256:24c1332f944d4b156608df29a3222cb0a6a9f1ab6c3d09d4214b168c93b99204 + securityContext: container: - container: - readOnlyRootFilesystem: false - runAsGroup: 0 + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 - runAsUser: 0 service: main: + enabled: true ports: main: + enabled: true port: 10246 targetPort: 80 + workload: main: podSpec: containers: main: + probes: + liveness: + type: http + path: / + readiness: + type: http + path: / + startup: + type: http + path: / env: + # External URL you use to connect to the RSS + # (the one you enter in your browser) + SELF_URL_PATH: "" DB_HOST: secretKeyRef: - key: host name: cnpg-main-urls + key: host + DB_PORT: "5432" DB_NAME: "{{ .Values.cnpg.main.database }}" + DB_USER: "{{ .Values.cnpg.main.user }}" DB_PASS: secretKeyRef: - key: password name: cnpg-main-user - DB_PORT: "5432" - DB_USER: "{{ .Values.cnpg.main.user }}" - SELF_URL_PATH: "" + key: password + +persistence: + icons: + enabled: true + targetSelector: + main: + main: + mountPath: /var/www/feed-icons + plugins: + enabled: true + targetSelector: + main: + main: + mountPath: /var/www/plugins.local + themes: + enabled: true + targetSelector: + main: + main: + mountPath: /var/www/themes.local + +cnpg: + main: + enabled: true + user: awesome-ttrss + database: awesome-ttrss + +portal: + open: + enabled: true