From 28f1a3e341dd698acc89e6b1d418c3fc133624eb Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Sat, 29 Apr 2023 08:44:01 +0200 Subject: [PATCH] feat(stable): BREAKING CHANGE migrate to new common part 3 (#8151) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ 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._ --- charts/stable/airsonic-advanced/Chart.yaml | 10 +- .../stable/airsonic-advanced/questions.yaml | 57 ++--- .../airsonic-advanced/templates/NOTES.txt | 1 + .../airsonic-advanced/templates/common.yaml | 2 +- charts/stable/airsonic-advanced/values.yaml | 74 +++--- charts/stable/anonaddy/Chart.yaml | 9 +- charts/stable/anonaddy/questions.yaml | 43 ++-- charts/stable/anonaddy/templates/NOTES.txt | 1 + charts/stable/anonaddy/templates/_appkey.tpl | 9 +- charts/stable/anonaddy/templates/common.yaml | 10 +- charts/stable/anonaddy/values.yaml | 98 ++++---- charts/stable/domoticz/Chart.yaml | 5 +- charts/stable/domoticz/questions.yaml | 43 ++-- charts/stable/domoticz/templates/NOTES.txt | 1 + charts/stable/domoticz/templates/common.yaml | 2 +- charts/stable/domoticz/values.yaml | 36 +-- charts/stable/guacd/Chart.yaml | 5 +- charts/stable/guacd/questions.yaml | 17 +- charts/stable/guacd/templates/NOTES.txt | 1 + charts/stable/guacd/templates/common.yaml | 2 +- charts/stable/guacd/values.yaml | 30 ++- charts/stable/healthchecks/Chart.yaml | 5 +- charts/stable/healthchecks/questions.yaml | 108 +++++---- .../stable/healthchecks/templates/NOTES.txt | 1 + .../stable/healthchecks/templates/common.yaml | 2 +- charts/stable/healthchecks/values.yaml | 47 ++-- charts/stable/kodi-headless/Chart.yaml | 5 +- charts/stable/kodi-headless/questions.yaml | 41 ++-- .../stable/kodi-headless/templates/NOTES.txt | 1 + .../kodi-headless/templates/common.yaml | 2 +- charts/stable/kodi-headless/values.yaml | 34 +-- charts/stable/monica/Chart.yaml | 7 +- charts/stable/monica/questions.yaml | 60 ++--- charts/stable/monica/templates/NOTES.txt | 1 + charts/stable/monica/templates/_appkey.tpl | 17 +- charts/stable/monica/templates/common.yaml | 9 +- charts/stable/monica/values.yaml | 70 +++--- charts/stable/nextpvr/Chart.yaml | 5 +- charts/stable/nextpvr/questions.yaml | 44 ++-- charts/stable/nextpvr/templates/NOTES.txt | 1 + charts/stable/nextpvr/templates/common.yaml | 2 +- charts/stable/nextpvr/values.yaml | 28 ++- charts/stable/ngircd/Chart.yaml | 5 +- charts/stable/ngircd/questions.yaml | 18 +- charts/stable/ngircd/templates/NOTES.txt | 1 + charts/stable/ngircd/templates/common.yaml | 2 +- charts/stable/ngircd/values.yaml | 30 ++- charts/stable/nntp2nntp/Chart.yaml | 5 +- charts/stable/nntp2nntp/questions.yaml | 18 +- charts/stable/nntp2nntp/templates/NOTES.txt | 1 + charts/stable/nntp2nntp/templates/common.yaml | 2 +- charts/stable/nntp2nntp/values.yaml | 30 ++- charts/stable/owncloud-ocis/Chart.yaml | 5 +- charts/stable/owncloud-ocis/questions.yaml | 116 +++++----- .../stable/owncloud-ocis/templates/NOTES.txt | 1 + .../owncloud-ocis/templates/_secrets.tpl | 28 +-- .../owncloud-ocis/templates/common.yaml | 11 +- charts/stable/owncloud-ocis/values.yaml | 92 ++++---- charts/stable/smokeping/Chart.yaml | 5 +- charts/stable/smokeping/questions.yaml | 18 +- charts/stable/smokeping/templates/NOTES.txt | 1 + charts/stable/smokeping/templates/common.yaml | 2 +- charts/stable/smokeping/values.yaml | 35 +-- charts/stable/tt-rss/Chart.yaml | 10 +- .../stable/tt-rss/docs/installation_notes.md | 2 +- charts/stable/tt-rss/questions.yaml | 68 +++--- charts/stable/tt-rss/templates/NOTES.txt | 1 + charts/stable/tt-rss/templates/common.yaml | 2 +- charts/stable/tt-rss/values.yaml | 69 +++--- charts/stable/ubooquity/Chart.yaml | 5 +- charts/stable/ubooquity/questions.yaml | 44 ++-- charts/stable/ubooquity/templates/NOTES.txt | 1 + charts/stable/ubooquity/templates/common.yaml | 2 +- charts/stable/ubooquity/values.yaml | 37 +-- .../stable/uptimerobot-prometheus/Chart.yaml | 5 +- .../uptimerobot-prometheus/questions.yaml | 49 ++-- .../templates/NOTES.txt | 1 + .../templates/common.yaml | 2 +- .../stable/uptimerobot-prometheus/values.yaml | 63 +++--- charts/stable/valheim/Chart.yaml | 5 +- charts/stable/valheim/questions.yaml | 214 +++++++++--------- charts/stable/valheim/templates/NOTES.txt | 1 + charts/stable/valheim/templates/common.yaml | 4 +- charts/stable/valheim/values.yaml | 74 +++--- 84 files changed, 1070 insertions(+), 961 deletions(-) create mode 100644 charts/stable/airsonic-advanced/templates/NOTES.txt create mode 100644 charts/stable/anonaddy/templates/NOTES.txt create mode 100644 charts/stable/domoticz/templates/NOTES.txt create mode 100644 charts/stable/guacd/templates/NOTES.txt create mode 100644 charts/stable/healthchecks/templates/NOTES.txt create mode 100644 charts/stable/kodi-headless/templates/NOTES.txt create mode 100644 charts/stable/monica/templates/NOTES.txt create mode 100644 charts/stable/nextpvr/templates/NOTES.txt create mode 100644 charts/stable/ngircd/templates/NOTES.txt create mode 100644 charts/stable/nntp2nntp/templates/NOTES.txt create mode 100644 charts/stable/owncloud-ocis/templates/NOTES.txt create mode 100644 charts/stable/smokeping/templates/NOTES.txt create mode 100644 charts/stable/tt-rss/templates/NOTES.txt create mode 100644 charts/stable/ubooquity/templates/NOTES.txt create mode 100644 charts/stable/uptimerobot-prometheus/templates/NOTES.txt create mode 100644 charts/stable/valheim/templates/NOTES.txt diff --git a/charts/stable/airsonic-advanced/Chart.yaml b/charts/stable/airsonic-advanced/Chart.yaml index 00e31560e2c..0e5a551e303 100644 --- a/charts/stable/airsonic-advanced/Chart.yaml +++ b/charts/stable/airsonic-advanced/Chart.yaml @@ -3,11 +3,8 @@ appVersion: "11.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 - - condition: postgresql.enabled - name: postgresql - repository: https://deps.truecharts.org/ - version: 11.0.31 + version: 12.6.1 + description: Airsonic is a Free and Open Source community driven media server home: https://truecharts.org/charts/stable/airsonic-advanced icon: https://truecharts.org/img/hotlink-ok/chart-icons/airsonic-advanced.png @@ -22,9 +19,8 @@ name: airsonic-advanced sources: - https://github.com/truecharts/charts/tree/master/charts/stable/airsonic-advanced - https://github.com/airsonic/airsonic-advanced -version: 7.0.23 +version: 9.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/airsonic-advanced/questions.yaml b/charts/stable/airsonic-advanced/questions.yaml index 42937b5e15f..fd6e40d36ff 100644 --- a/charts/stable/airsonic-advanced/questions.yaml +++ b/charts/stable/airsonic-advanced/questions.yaml @@ -10,30 +10,31 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: JAVA_OPTS + label: "JAVA_OPTS" + description: "JAVA_OPTS" + schema: + type: string + default: "" + - variable: CONTEXT_PATH + label: "CONTEXT_PATH" + description: "CONTEXT_PATH" + schema: + type: string + required: true + default: "/" # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: JAVA_OPTS - label: "JAVA_OPTS" - description: "JAVA_OPTS" - schema: - type: string - default: "" - - variable: CONTEXT_PATH - label: "CONTEXT_PATH" - description: "CONTEXT_PATH" - schema: - type: string - required: true - default: "/" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -114,16 +115,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/airsonic-advanced/templates/NOTES.txt b/charts/stable/airsonic-advanced/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/airsonic-advanced/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/airsonic-advanced/templates/common.yaml b/charts/stable/airsonic-advanced/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/airsonic-advanced/templates/common.yaml +++ b/charts/stable/airsonic-advanced/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/airsonic-advanced/values.yaml b/charts/stable/airsonic-advanced/values.yaml index 743dd15b51c..d187e150af3 100644 --- a/charts/stable/airsonic-advanced/values.yaml +++ b/charts/stable/airsonic-advanced/values.yaml @@ -4,56 +4,70 @@ image: pullPolicy: IfNotPresent securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + readOnlyRootFilesystem: false + runAsNonRoot: true + runAsUser: 568 + runAsGroup: 568 -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + AIRSONIC_DIR: "/" + # -- For passing additional java options. For some reverse proxies, you may need to pass `JAVA_OPTS=-Dserver.use-forward-headers=true` for airsonic to generate the proper URL schemes. -env: - AIRSONIC_DIR: "/" - # -- For passing additional java options. For some reverse proxies, you may need to pass `JAVA_OPTS=-Dserver.use-forward-headers=true` for airsonic to generate the proper URL schemes. - JAVA_OPTS: - CONTEXT_PATH: "/" - spring_liquibase_parameters_userTableQuote: '"' - spring_datasource_username: "{{ .Values.postgresql.postgresqlUsername }}" - spring_datasource_url: - secretKeyRef: - name: dbcreds - key: jdbc - spring_datasource_password: - secretKeyRef: - name: dbcreds - key: postgresql-password + JAVA_OPTS: + CONTEXT_PATH: "/" + spring_liquibase_parameters_userTableQuote: '"' + spring_datasource_username: "{{ .Values.cnpg.main.user }}" + spring_datasource_url: + secretKeyRef: + name: cnpg-main-urls + key: jdbc + spring_datasource_password: + secretKeyRef: + name: cnpg-main-user + key: password service: main: ports: main: port: 10122 + protocol: http targetPort: 4040 # Enabled postgres -postgresql: - enabled: true - existingSecret: "dbcreds" - postgresqlUsername: airsonic-advanced - postgresqlDatabase: airsonic-advanced +cnpg: + main: + enabled: true + user: airsonic-advanced + database: airsonic-advanced persistence: config: enabled: true - mountPath: "/airsonic" + mountPath: /airsonic music: enabled: true - mountPath: "/music" + mountPath: /music podcasts: enabled: true - mountPath: "/podcasts" + mountPath: /podcasts playlists: enabled: true - mountPath: "/playlists" + mountPath: /playlists portal: - enabled: true + open: + enabled: true diff --git a/charts/stable/anonaddy/Chart.yaml b/charts/stable/anonaddy/Chart.yaml index 120d9675dd6..4f161321ff5 100644 --- a/charts/stable/anonaddy/Chart.yaml +++ b/charts/stable/anonaddy/Chart.yaml @@ -3,15 +3,15 @@ appVersion: "0.13.13" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 - condition: mariadb.enabled name: mariadb repository: https://deps.truecharts.org/ - version: 5.0.35 + version: 7.0.5 - condition: redis.enabled name: redis repository: https://deps.truecharts.org - version: 5.0.33 + version: 6.0.21 description: "Protect your email from spam using disposable addresses." home: https://truecharts.org/charts/stable/anonaddy icon: https://truecharts.org/img/hotlink-ok/chart-icons/anonaddy.png @@ -26,9 +26,8 @@ name: anonaddy sources: - https://github.com/truecharts/charts/tree/master/charts/stable/anonaddy - https://github.com/anonaddy/docker -version: 12.0.24 +version: 13.0.0 annotations: truecharts.org/catagories: | - email truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/anonaddy/questions.yaml b/charts/stable/anonaddy/questions.yaml index a036a609231..503e92f82f9 100644 --- a/charts/stable/anonaddy/questions.yaml +++ b/charts/stable/anonaddy/questions.yaml @@ -10,23 +10,24 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: ANONADDY_DOMAIN + label: "ANONADDY_DOMAIN" + schema: + type: string + default: "" + required: true # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: ANONADDY_DOMAIN - label: "ANONADDY_DOMAIN" - schema: - type: string - default: "" - required: true # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -105,16 +106,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/anonaddy/templates/NOTES.txt b/charts/stable/anonaddy/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/anonaddy/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/anonaddy/templates/_appkey.tpl b/charts/stable/anonaddy/templates/_appkey.tpl index daf70c0c464..9f19b8c7185 100644 --- a/charts/stable/anonaddy/templates/_appkey.tpl +++ b/charts/stable/anonaddy/templates/_appkey.tpl @@ -2,14 +2,7 @@ This template generates a random password and ensures it persists across updates/edits to the chart */}} {{- define "anonaddy.appkey" -}} ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - labels: - {{- include "tc.common.labels" . | nindent 4 }} - name: appkey +enabled: true {{- $keyprevious := lookup "v1" "Secret" .Release.Namespace "appkey" }} {{- $appkey := "" }} {{- $secret := "" }} diff --git a/charts/stable/anonaddy/templates/common.yaml b/charts/stable/anonaddy/templates/common.yaml index 65b6d2f295f..886ce2dd56b 100644 --- a/charts/stable/anonaddy/templates/common.yaml +++ b/charts/stable/anonaddy/templates/common.yaml @@ -1,9 +1,11 @@ {{/* Make sure all variables are set properly */}} -{{- include "tc.common.loader.init" . }} +{{- include "tc.v1.common.loader.init" . }} {{/* Render appkey for anonaddy */}} -{{- include "anonaddy.appkey" . }} - +{{- $secret := include "anonaddy.appkey" . | fromYaml -}} +{{- if $secret -}} + {{- $_ := set .Values.secret "appkey" $secret -}} +{{- end -}} {{/* Render the templates */}} -{{ include "tc.common.loader.apply" . }} +{{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/stable/anonaddy/values.yaml b/charts/stable/anonaddy/values.yaml index 00adc242ee5..60f95532c64 100644 --- a/charts/stable/anonaddy/values.yaml +++ b/charts/stable/anonaddy/values.yaml @@ -7,41 +7,11 @@ strategy: type: Recreate securityContext: - runAsNonRoot: false - readOnlyRootFilesystem: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -env: - ANONADDY_DOMAIN: "chart-example.local" - DB_DATABASE: anonaddy - DB_USERNAME: anonaddy - DB_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - DB_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - REDIS_HOST: - secretKeyRef: - name: rediscreds - key: plainhost - REDIS_PASSWORD: - secretKeyRef: - name: rediscreds - key: redis-password - APP_KEY: - secretKeyRef: - name: appkey - key: appkey - ANONADDY_SECRET: - secretKeyRef: - name: appkey - key: secret + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 service: main: @@ -57,22 +27,64 @@ service: port: 25 targetPort: 25 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + ANONADDY_DOMAIN: "chart-example.local" + DB_DATABASE: anonaddy + DB_USERNAME: anonaddy + DB_HOST: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' + key: plainhost + DB_PASSWORD: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' + key: mariadb-password + REDIS_HOST: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}' + key: plainhost + REDIS_PASSWORD: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}' + key: redis-password + APP_KEY: + secretKeyRef: + name: appkey + key: appkey + ANONADDY_SECRET: + secretKeyRef: + name: appkey + key: secret + persistence: - varrun: - enabled: true config: enabled: true - mountPath: "/config" + mountPath: /config + +portal: + open: + enabled: true redis: enabled: true - existingSecret: "rediscreds" mariadb: enabled: true mariadbUsername: anonaddy mariadbDatabase: anonaddy - existingSecret: "mariadbcreds" - -portal: - enabled: true diff --git a/charts/stable/domoticz/Chart.yaml b/charts/stable/domoticz/Chart.yaml index ece00355724..3ab98add3ca 100644 --- a/charts/stable/domoticz/Chart.yaml +++ b/charts/stable/domoticz/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: domoticz -version: 4.0.20 +version: 5.0.0 appVersion: "2023.1.202" description: "Domoticz is a Home Automation System that lets you monitor and configure various devices like Lights, Switches and much more." type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 # condition: maintainers: - email: info@truecharts.org @@ -25,4 +25,3 @@ annotations: truecharts.org/catagories: | - incubator truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/domoticz/questions.yaml b/charts/stable/domoticz/questions.yaml index a7cf789037b..20628dcc29a 100644 --- a/charts/stable/domoticz/questions.yaml +++ b/charts/stable/domoticz/questions.yaml @@ -10,23 +10,24 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: WEBROOT + label: "WEBROOT" + description: "WEBROOT" + schema: + type: string + default: "domoticz" # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: WEBROOT - label: "WEBROOT" - description: "WEBROOT" - schema: - type: string - default: "domoticz" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -127,16 +128,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/domoticz/templates/NOTES.txt b/charts/stable/domoticz/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/domoticz/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/domoticz/templates/common.yaml b/charts/stable/domoticz/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/domoticz/templates/common.yaml +++ b/charts/stable/domoticz/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/domoticz/values.yaml b/charts/stable/domoticz/values.yaml index c3c074c301a..279ab09197c 100644 --- a/charts/stable/domoticz/values.yaml +++ b/charts/stable/domoticz/values.yaml @@ -4,15 +4,11 @@ image: tag: 2023.1.20230220@sha256:17a4a304da063f445f0b46ca79e4b8827d885b4754b664f8026e11608ea25062 securityContext: - runAsNonRoot: false - readOnlyRootFilesystem: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -env: - WEBROOT: "domoticz" + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 service: main: @@ -35,12 +31,26 @@ service: targetPort: 1443 port: 1443 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + WEBROOT: "domoticz" + persistence: config: enabled: true - mountPath: "/config" - varrun: - enabled: true + mountPath: /config portal: - enabled: true + open: + enabled: true diff --git a/charts/stable/guacd/Chart.yaml b/charts/stable/guacd/Chart.yaml index 13d28154423..126b4989f13 100644 --- a/charts/stable/guacd/Chart.yaml +++ b/charts/stable/guacd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: guacd -version: 4.0.9 +version: 5.0.0 appVersion: "1.5.0" description: Guacd - Apache Guacamole is a clientless remote desktop gateway. type: application @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 # condition: maintainers: - email: info@truecharts.org @@ -28,4 +28,3 @@ annotations: truecharts.org/catagories: | - incubator truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/guacd/questions.yaml b/charts/stable/guacd/questions.yaml index 7f14e8fd8f8..e351456b78c 100644 --- a/charts/stable/guacd/questions.yaml +++ b/charts/stable/guacd/questions.yaml @@ -8,10 +8,11 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -59,16 +60,16 @@ questions: schema: type: int default: 1000 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 1000 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 1000 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/guacd/templates/NOTES.txt b/charts/stable/guacd/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/guacd/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/guacd/templates/common.yaml b/charts/stable/guacd/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/guacd/templates/common.yaml +++ b/charts/stable/guacd/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/guacd/values.yaml b/charts/stable/guacd/values.yaml index c1c1cb144a7..ff4aac6f469 100644 --- a/charts/stable/guacd/values.yaml +++ b/charts/stable/guacd/values.yaml @@ -2,20 +2,30 @@ image: repository: tccr.io/truecharts/guacamole-server pullPolicy: IfNotPresent tag: 1.5.0@sha256:8af58fecf895b6d8e05c5c945ac61fec732f5f5055458a382b7685e035c536ff - -securityContext: - readOnlyRootFilesystem: false - -podSecurityContext: - runAsUser: 1000 - runAsGroup: 1000 - service: main: ports: main: targetPort: 4822 port: 4822 - portal: - enabled: false + open: + enabled: false +securityContext: + container: + readOnlyRootFilesystem: false + runAsUser: 1000 + runAsGroup: 1000 + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp diff --git a/charts/stable/healthchecks/Chart.yaml b/charts/stable/healthchecks/Chart.yaml index 494b7bd7177..a32a47fc748 100644 --- a/charts/stable/healthchecks/Chart.yaml +++ b/charts/stable/healthchecks/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.22.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 description: Healthchecks is a cron job monitoring service. It listens for HTTP requests and email messages ("pings") from your cron jobs and scheduled tasks ("checks"). When a ping does not arrive on time, Healthchecks sends out alerts. home: https://truecharts.org/charts/stable/healthchecks icon: https://truecharts.org/img/hotlink-ok/chart-icons/healthchecks.png @@ -20,9 +20,8 @@ name: healthchecks sources: - https://github.com/truecharts/charts/tree/master/charts/stable/healthchecks - https://github.com/healthchecks/healthchecks -version: 9.0.8 +version: 10.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/healthchecks/questions.yaml b/charts/stable/healthchecks/questions.yaml index 46988faac37..f5e31fe427b 100644 --- a/charts/stable/healthchecks/questions.yaml +++ b/charts/stable/healthchecks/questions.yaml @@ -10,59 +10,53 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: SUPERUSER_EMAIL + label: "SUPERUSER_EMAIL" + description: "Superuser email" + schema: + type: string + required: true + default: "REPLACETHIS" + - variable: SUPERUSER_PASSWORD + label: "SUPERUSER_PASSWORD" + description: "Superuser password" + schema: + type: string + required: true + private: true + default: "REPLACETHIS" + - variable: REGENERATE_SETTINGS + label: "REGENERATE_SETTINGS" + description: "Set to true to always override the local_settings.py file with values from environment variables" + schema: + type: string + default: "True" + - variable: SITE_ROOT + label: "SITE_ROOT" + description: "The site's top-level URL and the port it listens to" + schema: + type: string + required: true + default: "" + - variable: SITE_NAME + label: "SITE_NAME" + description: "The site's name" + schema: + type: string + required: true + default: "" # Include{containerBasic} # Include{containerAdvanced} - - - variable: secretEnv - group: "App Configuration" - label: "Image Secrets" - schema: - additional_attrs: true - type: dict - attrs: - - variable: SUPERUSER_EMAIL - label: "SUPERUSER_EMAIL" - description: "Superuser email" - schema: - type: string - required: true - default: "REPLACETHIS" - - variable: SUPERUSER_PASSWORD - label: "SUPERUSER_PASSWORD" - description: "Superuser password" - schema: - type: string - required: true - private: true - default: "REPLACETHIS" - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: REGENERATE_SETTINGS - label: "REGENERATE_SETTINGS" - description: "Set to true to always override the local_settings.py file with values from environment variables" - schema: - type: string - default: "True" - - variable: SITE_ROOT - label: "SITE_ROOT" - description: "The site's top-level URL and the port it listens to" - schema: - type: string - required: true - default: "" - - variable: SITE_NAME - label: "SITE_NAME" - description: "The site's name" - schema: - type: string - required: true - default: "" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -119,16 +113,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/healthchecks/templates/NOTES.txt b/charts/stable/healthchecks/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/healthchecks/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/healthchecks/templates/common.yaml b/charts/stable/healthchecks/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/healthchecks/templates/common.yaml +++ b/charts/stable/healthchecks/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/healthchecks/values.yaml b/charts/stable/healthchecks/values.yaml index c17d4285d33..50875e104c5 100644 --- a/charts/stable/healthchecks/values.yaml +++ b/charts/stable/healthchecks/values.yaml @@ -2,35 +2,40 @@ image: repository: tccr.io/truecharts/healthchecks tag: version-v1.22.0@sha256:234347d239410227e8d4585c467293f7bb59859f2042bad885633c1ff30c98f2 pullPolicy: IfNotPresent - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - service: main: ports: main: port: 10074 targetPort: 8000 - -secretEnv: - SUPERUSER_EMAIL: "email@healthchecks.io" - SUPERUSER_PASSWORD: "myVeryStrongPassword" - -env: - REGENERATE_SETTINGS: "True" - SITE_ROOT: "https://healthchecks.domain" - SITE_NAME: "" - persistence: config: enabled: true mountPath: "/config" - portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + REGENERATE_SETTINGS: "True" + SITE_ROOT: "https://healthchecks.domain" + SITE_NAME: "" + SUPERUSER_EMAIL: "email@healthchecks.io" + SUPERUSER_PASSWORD: "myVeryStrongPassword" diff --git a/charts/stable/kodi-headless/Chart.yaml b/charts/stable/kodi-headless/Chart.yaml index f240d9ed6eb..5b269cc41bc 100644 --- a/charts/stable/kodi-headless/Chart.yaml +++ b/charts/stable/kodi-headless/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "190" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 deprecated: false description: A headless install of kodi in a docker container. home: https://truecharts.org/charts/stable/kodi-headless @@ -19,9 +19,8 @@ name: kodi-headless sources: - https://github.com/truecharts/charts/tree/master/charts/stable/kodi-headless type: application -version: 4.0.11 +version: 5.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/kodi-headless/questions.yaml b/charts/stable/kodi-headless/questions.yaml index 1ec3ce19786..3d4ae4ada6a 100644 --- a/charts/stable/kodi-headless/questions.yaml +++ b/charts/stable/kodi-headless/questions.yaml @@ -10,10 +10,11 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: Main Service @@ -107,28 +108,28 @@ questions: # Include{ingressTraefik} # Include{ingressList} -# Include{podSecurityContextRoot} - - variable: runAsUser - label: runAsUser - description: The UserID of the user running the application - schema: - type: int - default: 0 - - variable: runAsGroup - label: runAsGroup - description: The groupID this App of the user running the application - schema: - type: int - default: 0 +# Include{securityContextRoot} + - variable: runAsUser + label: "runAsUser" + description: "The UserID of the user running the application" + schema: + type: int + default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup - label: fsGroup - description: The group that should own ALL storage. - schema: - type: int - default: 568 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 # Include{resources} # Include{advanced} diff --git a/charts/stable/kodi-headless/templates/NOTES.txt b/charts/stable/kodi-headless/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/kodi-headless/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/kodi-headless/templates/common.yaml b/charts/stable/kodi-headless/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/kodi-headless/templates/common.yaml +++ b/charts/stable/kodi-headless/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/kodi-headless/values.yaml b/charts/stable/kodi-headless/values.yaml index bac91b39478..b06dd6a811a 100644 --- a/charts/stable/kodi-headless/values.yaml +++ b/charts/stable/kodi-headless/values.yaml @@ -2,15 +2,6 @@ image: repository: tccr.io/truecharts/kodi-headless pullPolicy: IfNotPresent tag: v190@sha256:491de04856e5f90698deaf06b598cff46791944719713183062c2c97905a437e - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - service: main: ports: @@ -29,16 +20,33 @@ service: ports: esall: enabled: true - protocol: UDP + protocol: udp targetPort: 9777 port: 9777 - persistence: config: enabled: true mountPath: "/config/.kodi" varrun: enabled: true - portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp diff --git a/charts/stable/monica/Chart.yaml b/charts/stable/monica/Chart.yaml index f0925e6c7a4..b61837e82ca 100644 --- a/charts/stable/monica/Chart.yaml +++ b/charts/stable/monica/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "4.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 - condition: mariadb.enabled name: mariadb repository: https://deps.truecharts.org/ - version: 5.0.35 + version: 7.0.5 description: "Monica is a great open source personal relationship management system." home: https://truecharts.org/charts/stable/monica icon: https://truecharts.org/img/hotlink-ok/chart-icons/monica.png @@ -22,9 +22,8 @@ name: monica sources: - https://github.com/truecharts/charts/tree/master/charts/stable/monica - https://github.com/monicahq/monica -version: 6.0.30 +version: 7.0.0 annotations: truecharts.org/catagories: | - crm truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/monica/questions.yaml b/charts/stable/monica/questions.yaml index d21bb89ea06..e6b8511373e 100644 --- a/charts/stable/monica/questions.yaml +++ b/charts/stable/monica/questions.yaml @@ -10,31 +10,33 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: APP_ENV + label: "APP_ENV" + description: "Use `local` if you want to install Monica as a development version. Use `production` otherwise." + schema: + type: string + default: "production" + required: true + - variable: APP_URL + label: "APP_URL" + description: "The URL of your application." + schema: + type: string + default: "" + required: true # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: APP_ENV - label: "APP_ENV" - description: "Use `local` if you want to install Monica as a development version. Use `production` otherwise." - schema: - type: string - default: "production" - required: true - - variable: APP_URL - label: "APP_URL" - description: "The URL of your application." - schema: - type: string - default: "" - required: true # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -91,16 +93,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/monica/templates/NOTES.txt b/charts/stable/monica/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/monica/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/monica/templates/_appkey.tpl b/charts/stable/monica/templates/_appkey.tpl index 337c6a503cf..58e071b9ca3 100644 --- a/charts/stable/monica/templates/_appkey.tpl +++ b/charts/stable/monica/templates/_appkey.tpl @@ -2,21 +2,16 @@ This template generates a random appkey and ensures it persists across updates/edits to the chart */}} {{- define "monica.appkey" -}} ---- -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: appkey - labels: - {{- include "tc.common.labels" . | nindent 4 }} -{{- $keyprevious := lookup "v1" "Secret" .Release.Namespace "appkey" }} +enabled: true +{{- $basename := include "tc.v1.common.lib.chart.names.fullname" $ -}} +{{- $fetchname := printf "%s-appkey" $basename -}} +{{- $keyprevious := lookup "v1" "Secret" .Release.Namespace $fetchname }} {{- $appkey := "" }} data: {{- if $keyprevious }} - appkey: {{ ( index $keyprevious.data "appkey" ) }} + appkey: {{ ( index $keyprevious.data "appkey" ) | b64dec }} {{- else }} {{- $appkey = randAlphaNum 32 }} - appkey: {{ $appkey | b64enc }} + appkey: {{ $appkey }} {{- end }} {{- end -}} diff --git a/charts/stable/monica/templates/common.yaml b/charts/stable/monica/templates/common.yaml index 181c028a3c6..655744eb4c8 100644 --- a/charts/stable/monica/templates/common.yaml +++ b/charts/stable/monica/templates/common.yaml @@ -1,8 +1,11 @@ {{/* Make sure all variables are set properly */}} -{{- include "tc.common.loader.init" . }} +{{- include "tc.v1.common.loader.init" . }} {{/* Render appkey for monica */}} -{{- include "monica.appkey" . }} +{{- $secret := include "monica.appkey" . | fromYaml -}} +{{- if $secret -}} + {{- $_ := set .Values.secret "appkey" $secret -}} +{{- end -}} {{/* Render the templates */}} -{{ include "tc.common.loader.apply" . }} +{{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/stable/monica/values.yaml b/charts/stable/monica/values.yaml index e286e820950..e36af03cfa2 100644 --- a/charts/stable/monica/values.yaml +++ b/charts/stable/monica/values.yaml @@ -2,50 +2,58 @@ image: repository: tccr.io/truecharts/monica tag: 4.0.0@sha256:e0dbcc09a91affbbdddb6fb6fc8cb90b3502c7d781a23ae491602b97841ddb5b pullPolicy: IfNotPresent - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -env: - APP_ENV: production - APP_URL: https://crm.k8s-at-home.com - DB_DATABASE: monica - DB_USERNAME: monica - DB_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - DB_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - APP_KEY: - secretKeyRef: - name: appkey - key: appkey - service: main: ports: main: port: 10119 targetPort: 80 - persistence: config: enabled: true mountPath: "/var/www/html/storage" - mariadb: enabled: true mariadbUsername: monica mariadbDatabase: monica - existingSecret: "mariadbcreds" portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + APP_ENV: production + APP_URL: https://crm.k8s-at-home.com + DB_DATABASE: monica + DB_USERNAME: monica + DB_HOST: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' + key: plainhost + DB_PASSWORD: + secretKeyRef: + expandObjectName: false + name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}' + key: mariadb-password + APP_KEY: + secretKeyRef: + name: appkey + key: appkey diff --git a/charts/stable/nextpvr/Chart.yaml b/charts/stable/nextpvr/Chart.yaml index 039791b028c..ea8c2d1bbcd 100644 --- a/charts/stable/nextpvr/Chart.yaml +++ b/charts/stable/nextpvr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 description: NextPVR is a personal video recorder application, with the goal making it easy to watch or record live TV. home: https://truecharts.org/charts/stable/nextpvr icon: https://truecharts.org/img/hotlink-ok/chart-icons/nextpvr.png @@ -19,9 +19,8 @@ name: nextpvr sources: - https://github.com/truecharts/charts/tree/master/charts/stable/nextpvr - https://github.com/sub3/NextPVR/wiki/Install-Docker -version: 4.1.3 +version: 5.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/nextpvr/questions.yaml b/charts/stable/nextpvr/questions.yaml index ac3224b2f28..2eb48272d2c 100644 --- a/charts/stable/nextpvr/questions.yaml +++ b/charts/stable/nextpvr/questions.yaml @@ -10,23 +10,25 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: HOST_IP + label: "HOST_IP" + schema: + type: string + $ref: + - "definitions/nodeIP" # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: HOST_IP - label: "HOST_IP" - schema: - type: string - $ref: - - "definitions/nodeIP" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -136,16 +138,16 @@ questions: schema: type: int default: 568 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 568 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 568 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/nextpvr/templates/NOTES.txt b/charts/stable/nextpvr/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/nextpvr/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/nextpvr/templates/common.yaml b/charts/stable/nextpvr/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/nextpvr/templates/common.yaml +++ b/charts/stable/nextpvr/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/nextpvr/values.yaml b/charts/stable/nextpvr/values.yaml index b6a6f306dfd..269bedc14d7 100644 --- a/charts/stable/nextpvr/values.yaml +++ b/charts/stable/nextpvr/values.yaml @@ -2,10 +2,6 @@ image: repository: tccr.io/truecharts/nextpvr tag: latest@sha256:ad85cc1edb266ade491bc710057cce3087103644e1660b8a335bac2af8db8214 pullPolicy: IfNotPresent - -env: - HOST_IP: "localhost" - service: main: ports: @@ -17,15 +13,14 @@ service: ports: nextpvr-udp1: enabled: true - protocol: UDP + protocol: udp port: 16891 targetPort: 16891 nextpvr-udp2: enabled: true - protocol: UDP + protocol: udp port: 8026 targetPort: 8026 - persistence: config: enabled: true @@ -36,6 +31,21 @@ persistence: buffer: enabled: true mountPath: "/buffer" - portal: - enabled: true + open: + enabled: true + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + HOST_IP: "localhost" diff --git a/charts/stable/ngircd/Chart.yaml b/charts/stable/ngircd/Chart.yaml index 66f5ba7759f..37949f482b1 100644 --- a/charts/stable/ngircd/Chart.yaml +++ b/charts/stable/ngircd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ngircd -version: 4.0.9 +version: 5.0.0 appVersion: "2021.11.21" description: Ngircd is a free, portable and lightweight Internet Relay Chat server for small or private networks. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 # condition: maintainers: - email: info@truecharts.org @@ -25,4 +25,3 @@ annotations: truecharts.org/catagories: | - incubator truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/ngircd/questions.yaml b/charts/stable/ngircd/questions.yaml index 601d395b2b9..d3c5377e3d6 100644 --- a/charts/stable/ngircd/questions.yaml +++ b/charts/stable/ngircd/questions.yaml @@ -10,10 +10,12 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -70,16 +72,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/ngircd/templates/NOTES.txt b/charts/stable/ngircd/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/ngircd/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/ngircd/templates/common.yaml b/charts/stable/ngircd/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/ngircd/templates/common.yaml +++ b/charts/stable/ngircd/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/ngircd/values.yaml b/charts/stable/ngircd/values.yaml index 8bac68ba04b..91a8668fa7b 100644 --- a/charts/stable/ngircd/values.yaml +++ b/charts/stable/ngircd/values.yaml @@ -2,27 +2,35 @@ image: repository: tccr.io/truecharts/ngircd pullPolicy: IfNotPresent tag: v2021.11.21@sha256:205a56ca8fc82b25b42c84bad0cb088e0b56804d181ab0e5c32f339df7502806 - -securityContext: - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - service: main: ports: main: targetPort: 6667 port: 6667 - persistence: config: enabled: true mountPath: "/config" varrun: enabled: true - portal: - enabled: true + open: + enabled: true +securityContext: + container: + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp diff --git a/charts/stable/nntp2nntp/Chart.yaml b/charts/stable/nntp2nntp/Chart.yaml index 8f99cbd5413..5d8d0358666 100644 --- a/charts/stable/nntp2nntp/Chart.yaml +++ b/charts/stable/nntp2nntp/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: nntp2nntp -version: 4.0.9 +version: 5.0.0 appVersion: "0.3.202210" description: Nntp2nntp proxy allow you to use your NNTP Account from multiple systems, each with own user name and password. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 # condition: maintainers: - email: info@truecharts.org @@ -25,4 +25,3 @@ annotations: truecharts.org/catagories: | - incubator truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/nntp2nntp/questions.yaml b/charts/stable/nntp2nntp/questions.yaml index 5c229b60a12..546d1e69fbe 100644 --- a/charts/stable/nntp2nntp/questions.yaml +++ b/charts/stable/nntp2nntp/questions.yaml @@ -10,10 +10,12 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -70,16 +72,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/nntp2nntp/templates/NOTES.txt b/charts/stable/nntp2nntp/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/nntp2nntp/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/nntp2nntp/templates/common.yaml b/charts/stable/nntp2nntp/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/nntp2nntp/templates/common.yaml +++ b/charts/stable/nntp2nntp/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/nntp2nntp/values.yaml b/charts/stable/nntp2nntp/values.yaml index b5a5e1e0dcd..d9ea0bb9295 100644 --- a/charts/stable/nntp2nntp/values.yaml +++ b/charts/stable/nntp2nntp/values.yaml @@ -2,27 +2,35 @@ image: repository: tccr.io/truecharts/nntp2nntp pullPolicy: IfNotPresent tag: 0.3.20221013@sha256:c5e1743c1d921a23ee96858d8eed4e9b05d55c85c7d4149d6f1e69e3fa3c77c3 - -securityContext: - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - service: main: ports: main: targetPort: 1563 port: 1563 - persistence: config: enabled: true mountPath: "/config" varrun: enabled: true - portal: - enabled: true + open: + enabled: true +securityContext: + container: + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp diff --git a/charts/stable/owncloud-ocis/Chart.yaml b/charts/stable/owncloud-ocis/Chart.yaml index 0db6d9d92a4..e98b4e34240 100644 --- a/charts/stable/owncloud-ocis/Chart.yaml +++ b/charts/stable/owncloud-ocis/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 description: ownCloud Infinite Scale is a self-hosted file sync and share server. home: https://truecharts.org/charts/stable/owncloud-ocis icon: https://truecharts.org/img/hotlink-ok/chart-icons/owncloud-ocis.png @@ -25,9 +25,8 @@ name: owncloud-ocis sources: - https://github.com/truecharts/charts/tree/master/charts/stable/owncloud-ocis - https://owncloud.dev/ocis/ -version: 10.0.9 +version: 11.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/owncloud-ocis/questions.yaml b/charts/stable/owncloud-ocis/questions.yaml index 78e721d26d2..627b3c5045c 100644 --- a/charts/stable/owncloud-ocis/questions.yaml +++ b/charts/stable/owncloud-ocis/questions.yaml @@ -10,59 +10,61 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: OCIS_INSECURE + label: "OCIS_INSECURE" + description: "Set to true if you are using self signed certs" + schema: + type: boolean + default: false + - variable: PROXY_TLS + label: "PROXY_TLS" + description: "Set to true if you are traefik" + schema: + type: boolean + default: true + - variable: ACCOUNTS_DEMO_USERS_AND_GROUPS + label: "ACCOUNTS_DEMO_USERS_AND_GROUPS" + description: "Set to false to skip the generation of demo users in the first place" + schema: + type: boolean + default: false + - variable: OCIS_LOG_PRETTY + label: "OCIS_LOG_PRETTY" + description: "OCIS_LOG_PRETTY" + schema: + type: boolean + default: true + - variable: OCIS_LOG_COLOR + label: "OCIS_LOG_COLOR" + description: "OCIS_LOG_COLOR" + schema: + type: boolean + default: true + - variable: PROXY_HTTP_ADDR + label: "PROXY_HTTP_ADDR" + description: "PROXY_HTTP_ADDR" + schema: + type: string + default: "0.0.0.0:9200" + - variable: OCIS_URL + label: "OCIS_URL" + description: "OCIS_URL" + schema: + type: string + default: "https://localhost:9200" # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: OCIS_INSECURE - label: "OCIS_INSECURE" - description: "Set to true if you are using self signed certs" - schema: - type: boolean - default: false - - variable: PROXY_TLS - label: "PROXY_TLS" - description: "Set to true if you are traefik" - schema: - type: boolean - default: true - - variable: ACCOUNTS_DEMO_USERS_AND_GROUPS - label: "ACCOUNTS_DEMO_USERS_AND_GROUPS" - description: "Set to false to skip the generation of demo users in the first place" - schema: - type: boolean - default: false - - variable: OCIS_LOG_PRETTY - label: "OCIS_LOG_PRETTY" - description: "OCIS_LOG_PRETTY" - schema: - type: boolean - default: true - - variable: OCIS_LOG_COLOR - label: "OCIS_LOG_COLOR" - description: "OCIS_LOG_COLOR" - schema: - type: boolean - default: true - - variable: PROXY_HTTP_ADDR - label: "PROXY_HTTP_ADDR" - description: "PROXY_HTTP_ADDR" - schema: - type: string - default: "0.0.0.0:9200" - - variable: OCIS_URL - label: "OCIS_URL" - description: "OCIS_URL" - schema: - type: string - default: "https://localhost:9200" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -127,16 +129,16 @@ questions: schema: type: int default: 568 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 568 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 568 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/owncloud-ocis/templates/NOTES.txt b/charts/stable/owncloud-ocis/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/owncloud-ocis/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/owncloud-ocis/templates/_secrets.tpl b/charts/stable/owncloud-ocis/templates/_secrets.tpl index deea14a33fc..13123276c09 100644 --- a/charts/stable/owncloud-ocis/templates/_secrets.tpl +++ b/charts/stable/owncloud-ocis/templates/_secrets.tpl @@ -1,28 +1,20 @@ {{/* Define the secrets */}} {{- define "ocis.secrets" -}} ---- - -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: ocis-secrets -{{- $ocisprevious := lookup "v1" "Secret" .Release.Namespace "ocis-secrets" }} -{{- $ocis_jwt_secret := "" }} -{{- $storage_transfer_secret := "" }} -{{- $ocis_machine_auth_api_Key := "" }} +{{- $secretName := (printf "%s-ocis-secrets" (include "tc.v1.common.lib.chart.names.fullname" $)) }} +{{- $ocisprevious := lookup "v1" "Secret" .Release.Namespace $secretName }} +enabled: true data: - {{- if $ocisprevious}} - OCIS_JWT_SECRET: {{ index $ocisprevious.data "OCIS_JWT_SECRET" }} - STORAGE_TRANSFER_SECRET: {{ index $ocisprevious.data "STORAGE_TRANSFER_SECRET" }} - OCIS_MACHINE_AUTH_API_KEY: {{ index $ocisprevious.data "OCIS_MACHINE_AUTH_API_KEY" }} + {{- if $ocisprevious }} + OCIS_JWT_SECRET: {{ index $ocisprevious.data "OCIS_JWT_SECRET" | b64dec }} + STORAGE_TRANSFER_SECRET: {{ index $ocisprevious.data "STORAGE_TRANSFER_SECRET" | b64dec }} + OCIS_MACHINE_AUTH_API_KEY: {{ index $ocisprevious.data "OCIS_MACHINE_AUTH_API_KEY" | b64dec }} {{- else }} {{- $ocis_jwt_secret := randAlphaNum 32 }} {{- $storage_transfer_secret := randAlphaNum 32 }} {{- $ocis_machine_auth_api_Key := randAlphaNum 32 }} - OCIS_JWT_SECRET: {{ $ocis_jwt_secret | b64enc }} - STORAGE_TRANSFER_SECRET: {{ $storage_transfer_secret | b64enc }} - OCIS_MACHINE_AUTH_API_KEY: {{ $ocis_machine_auth_api_Key | b64enc }} + OCIS_JWT_SECRET: {{ $ocis_jwt_secret }} + STORAGE_TRANSFER_SECRET: {{ $storage_transfer_secret }} + OCIS_MACHINE_AUTH_API_KEY: {{ $ocis_machine_auth_api_Key }} {{- end }} {{- end -}} diff --git a/charts/stable/owncloud-ocis/templates/common.yaml b/charts/stable/owncloud-ocis/templates/common.yaml index f8dc48fa8d6..08b3f985901 100644 --- a/charts/stable/owncloud-ocis/templates/common.yaml +++ b/charts/stable/owncloud-ocis/templates/common.yaml @@ -1,8 +1,11 @@ {{/* Make sure all variables are set properly */}} -{{- include "tc.common.loader.init" . }} +{{- include "tc.v1.common.loader.init" . }} -{{/* Render secrets for fireflyiii */}} -{{- include "ocis.secrets" . }} +{{/* Render secrets for owncloud-ocis */}} +{{- $secrets := include "ocis.secrets" . | fromYaml -}} +{{- if $secrets -}} +{{- $_ := set .Values.secret "secrets" $secrets -}} +{{- end -}} {{/* Render the templates */}} -{{ include "tc.common.loader.apply" . }} +{{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/stable/owncloud-ocis/values.yaml b/charts/stable/owncloud-ocis/values.yaml index 70eeeba1f18..2aa817b2fda 100644 --- a/charts/stable/owncloud-ocis/values.yaml +++ b/charts/stable/owncloud-ocis/values.yaml @@ -2,53 +2,13 @@ image: repository: tccr.io/truecharts/ocis tag: 2.0.0@sha256:37f5482b80d2776d26c7cec2c0de06c143652f723299b789846216fa2dc4c738 pullPolicy: IfNotPresent - -securityContext: - readOnlyRootFilesystem: false - -env: - OCIS_INSECURE: true - ACCOUNTS_DEMO_USERS_AND_GROUPS: false - OCIS_LOG_PRETTY: true - OCIS_LOG_COLOR: true - PROXY_TLS: false - PROXY_HTTP_ADDR: "0.0.0.0:{{ .Values.service.main.ports.main.port }}" - OCIS_URL: "https://localhost:{{ .Values.service.main.ports.main.port }}" - OCIS_JWT_SECRET: - secretKeyRef: - name: ocis-secrets - key: OCIS_JWT_SECRET - STORAGE_TRANSFER_SECRET: - secretKeyRef: - name: ocis-secrets - key: STORAGE_TRANSFER_SECRET - OCIS_MACHINE_AUTH_API_KEY: - secretKeyRef: - name: ocis-secrets - key: OCIS_MACHINE_AUTH_API_KEY - service: main: ports: main: - protocol: HTTPS + protocol: https port: 9200 targetPort: 9200 - -installContainers: - init: - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - volumeMounts: - - name: config - mountPath: "/etc/ocis" - command: - - "/bin/sh" - - "-c" - - | - /usr/bin/ocis init > /etc/ocis/password <<'EOF' - yes - EOF - persistence: data: enabled: true @@ -56,6 +16,52 @@ persistence: config: enabled: true mountPath: "/etc/ocis" - + targetSelectAll: true portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false +workload: + main: + podSpec: + initContainers: + init: + type: install + enabled: true + imageSelector: image + command: + - "/bin/sh" + - "-c" + - | + /usr/bin/ocis init > /etc/ocis/password <<'EOF' + yes + EOF + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + OCIS_INSECURE: true + ACCOUNTS_DEMO_USERS_AND_GROUPS: false + OCIS_LOG_PRETTY: true + OCIS_LOG_COLOR: true + PROXY_TLS: false + PROXY_HTTP_ADDR: "0.0.0.0:{{ .Values.service.main.ports.main.port }}" + OCIS_URL: "https://localhost:{{ .Values.service.main.ports.main.port }}" + OCIS_JWT_SECRET: + secretKeyRef: + name: secrets + key: OCIS_JWT_SECRET + STORAGE_TRANSFER_SECRET: + secretKeyRef: + name: secrets + key: STORAGE_TRANSFER_SECRET + OCIS_MACHINE_AUTH_API_KEY: + secretKeyRef: + name: secrets + key: OCIS_MACHINE_AUTH_API_KEY diff --git a/charts/stable/smokeping/Chart.yaml b/charts/stable/smokeping/Chart.yaml index a70f8bb8f17..f96416fd700 100644 --- a/charts/stable/smokeping/Chart.yaml +++ b/charts/stable/smokeping/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.7.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 description: Keep track of your network latency. home: https://truecharts.org/charts/stable/smokeping icon: https://truecharts.org/img/hotlink-ok/chart-icons/smokeping.png @@ -21,9 +21,8 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/smokeping - https://oss.oetiker.ch/smokeping/ type: application -version: 5.0.8 +version: 6.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/smokeping/questions.yaml b/charts/stable/smokeping/questions.yaml index 3f1da3dd254..c5dcb0a77da 100644 --- a/charts/stable/smokeping/questions.yaml +++ b/charts/stable/smokeping/questions.yaml @@ -10,10 +10,12 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -78,16 +80,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/smokeping/templates/NOTES.txt b/charts/stable/smokeping/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/smokeping/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/smokeping/templates/common.yaml b/charts/stable/smokeping/templates/common.yaml index 76759c7a0c9..992373e7501 100644 --- a/charts/stable/smokeping/templates/common.yaml +++ b/charts/stable/smokeping/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/smokeping/values.yaml b/charts/stable/smokeping/values.yaml index 8127b950764..294aa3f1ed1 100644 --- a/charts/stable/smokeping/values.yaml +++ b/charts/stable/smokeping/values.yaml @@ -2,26 +2,14 @@ image: repository: tccr.io/truecharts/smokeping pullPolicy: IfNotPresent tag: version-2.7.3-r5@sha256:e56ba2420901250afb865a7e03e43956dcff17503ce44c48b20064980a42f5a4 - strategy: type: Recreate - service: main: ports: main: port: 10030 targetPort: 80 - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - allowPrivilegeEscalation: true - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - persistence: config: enabled: true @@ -29,6 +17,25 @@ persistence: data: enabled: true mountPath: "/data" - portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + allowPrivilegeEscalation: true + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp diff --git a/charts/stable/tt-rss/Chart.yaml b/charts/stable/tt-rss/Chart.yaml index 022696b4c10..912882b792b 100644 --- a/charts/stable/tt-rss/Chart.yaml +++ b/charts/stable/tt-rss/Chart.yaml @@ -3,11 +3,8 @@ appVersion: "2.0.9113" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 - - condition: postgresql.enabled - name: postgresql - repository: https://deps.truecharts.org/ - version: 11.0.31 + version: 12.6.1 + deprecated: false description: Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator. home: https://truecharts.org/charts/stable/tt-rss @@ -25,9 +22,8 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/tt-rss - https://git.tt-rss.org/fox/tt-rss type: application -version: 10.0.23 +version: 11.0.0 annotations: truecharts.org/catagories: | - rss truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/tt-rss/docs/installation_notes.md b/charts/stable/tt-rss/docs/installation_notes.md index 76a8e4d69fd..dc783907311 100644 --- a/charts/stable/tt-rss/docs/installation_notes.md +++ b/charts/stable/tt-rss/docs/installation_notes.md @@ -2,5 +2,5 @@ - Set `TTRSS Self URL Path` to **http://scale_ip:APP_PORT/** and then login using the default [credentials](./credentials.md). - If you plan to use ingress and a domain you need to: - - Set `TTRSS Self URL Path` to **https://app.mydomain.tld/** + - Set `TTRSS Self URL Path` to **https://app.mydomain.tld/** - Configure ingress on the app diff --git a/charts/stable/tt-rss/questions.yaml b/charts/stable/tt-rss/questions.yaml index f4240a40356..dacc7058893 100644 --- a/charts/stable/tt-rss/questions.yaml +++ b/charts/stable/tt-rss/questions.yaml @@ -10,23 +10,25 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + + - variable: env + group: App Configuration + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: TTRSS_SELF_URL_PATH + label: TTRSS Self URL Path + description: Sets the URL for the app. + schema: + type: string + default: "" # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: TTRSS_SELF_URL_PATH - label: TTRSS Self URL Path - description: Sets the URL for the app. - schema: - type: string - default: "" # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: Main Service @@ -92,28 +94,28 @@ questions: # Include{ingressTraefik} # Include{ingressList} -# Include{podSecurityContextRoot} - - variable: runAsUser - label: runAsUser - description: The UserID of the user running the application - schema: - type: int - default: 0 - - variable: runAsGroup - label: runAsGroup - description: The groupID this App of the user running the application - schema: - type: int - default: 0 +# Include{securityContextRoot} + - variable: runAsUser + label: "runAsUser" + description: "The UserID of the user running the application" + schema: + type: int + default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup - label: fsGroup - description: The group that should own ALL storage. - schema: - type: int - default: 568 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 # Include{resources} # Include{advanced} diff --git a/charts/stable/tt-rss/templates/NOTES.txt b/charts/stable/tt-rss/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/tt-rss/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/tt-rss/templates/common.yaml b/charts/stable/tt-rss/templates/common.yaml index 45d48a1f3ae..72bdd2d48fe 100644 --- a/charts/stable/tt-rss/templates/common.yaml +++ b/charts/stable/tt-rss/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Make sure all variables are set properly */}} -{{- include "tc.common.loader.all" . }} +{{- include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/tt-rss/values.yaml b/charts/stable/tt-rss/values.yaml index c71e117cc3b..2849675b170 100644 --- a/charts/stable/tt-rss/values.yaml +++ b/charts/stable/tt-rss/values.yaml @@ -2,36 +2,12 @@ image: repository: tccr.io/truecharts/tt-rss pullPolicy: IfNotPresent tag: v2.0.9113@sha256:ef3e084ba91d3e9ed32af6b948e17c88e33223fa80ffe5c8bb4d5dac9aa0e9b9 - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -env: - TTRSS_SELF_URL_PATH: "" - TTRSS_DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" - TTRSS_DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" - TTRSS_DB_PORT: "5432" - TTRSS_DB_PASS: - secretKeyRef: - name: dbcreds - key: postgresql-password - TTRSS_DB_HOST: - secretKeyRef: - name: dbcreds - key: plainhost - service: main: ports: main: port: 10104 targetPort: 8080 - persistence: config: enabled: true @@ -42,12 +18,43 @@ persistence: themes: enabled: true mountPath: /app/themes.local +cnpg: + main: + enabled: true -postgresql: - enabled: true - existingSecret: "dbcreds" - postgresqlUsername: tt-rss - postgresqlDatabase: tt-rss - + user: tt-rss + database: tt-rss portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + TTRSS_SELF_URL_PATH: "" + TTRSS_DB_NAME: "{{ .Values.cnpg.main.database }}" + TTRSS_DB_USER: "{{ .Values.cnpg.main.user }}" + TTRSS_DB_PORT: "5432" + TTRSS_DB_PASS: + secretKeyRef: + name: cnpg-main-user + key: password + TTRSS_DB_HOST: + secretKeyRef: + name: cnpg-main-urls + key: host diff --git a/charts/stable/ubooquity/Chart.yaml b/charts/stable/ubooquity/Chart.yaml index 8fc71586291..b96b0fa3c87 100644 --- a/charts/stable/ubooquity/Chart.yaml +++ b/charts/stable/ubooquity/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ubooquity -version: 5.0.12 +version: 6.0.0 appVersion: "2.1.2" description: Ubooquity is a free, lightweight and easy-to-use home server for your comics and ebooks. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 # condition: maintainers: - email: info@truecharts.org @@ -25,4 +25,3 @@ annotations: truecharts.org/catagories: | - incubator truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/ubooquity/questions.yaml b/charts/stable/ubooquity/questions.yaml index d98e667e800..898539ba4ea 100644 --- a/charts/stable/ubooquity/questions.yaml +++ b/charts/stable/ubooquity/questions.yaml @@ -19,23 +19,25 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: MAXMEM + label: "MAXMEM" + description: "Set the maximum memory in MB" + schema: + type: int + default: 512 # Include{containerBasic} # Include{containerAdvanced} - - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: MAXMEM - label: "MAXMEM" - description: "Set the maximum memory in MB" - schema: - type: int - default: 512 # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -138,16 +140,16 @@ questions: schema: type: int default: 0 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/ubooquity/templates/NOTES.txt b/charts/stable/ubooquity/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/ubooquity/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/ubooquity/templates/common.yaml b/charts/stable/ubooquity/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/ubooquity/templates/common.yaml +++ b/charts/stable/ubooquity/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/ubooquity/values.yaml b/charts/stable/ubooquity/values.yaml index c88a90612ba..aad654e9266 100644 --- a/charts/stable/ubooquity/values.yaml +++ b/charts/stable/ubooquity/values.yaml @@ -2,18 +2,6 @@ image: repository: tccr.io/truecharts/ubooquity pullPolicy: IfNotPresent tag: v2.1.2@sha256:5a3f28e4cae38688be6db3aed6ba49301a21cccdb06cfeeb2c041e93f84da2ba - -securityContext: - runAsNonRoot: false - readOnlyRootFilesystem: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -env: - MAXMEM: 512 - service: main: ports: @@ -27,7 +15,6 @@ service: enabled: true targetPort: 2203 port: 2203 - persistence: varrun: enabled: true @@ -43,6 +30,26 @@ persistence: files: enabled: true mountPath: "/files" - portal: - enabled: true + open: + enabled: true +securityContext: + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + MAXMEM: 512 diff --git a/charts/stable/uptimerobot-prometheus/Chart.yaml b/charts/stable/uptimerobot-prometheus/Chart.yaml index 90709dc468e..fb72d510d44 100644 --- a/charts/stable/uptimerobot-prometheus/Chart.yaml +++ b/charts/stable/uptimerobot-prometheus/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.0.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 deprecated: false description: Prometheus Exporter for the official uptimerobot CLI icon: https://truecharts.org/img/hotlink-ok/chart-icons/uptimerobot-prometheus.png @@ -24,9 +24,8 @@ sources: - https://github.com/lekpamartin/uptimerobot_exporter - https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus type: application -version: 6.0.8 +version: 7.0.0 annotations: truecharts.org/catagories: | - metrics truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/uptimerobot-prometheus/questions.yaml b/charts/stable/uptimerobot-prometheus/questions.yaml index 7d8af00785a..59d85441b3a 100644 --- a/charts/stable/uptimerobot-prometheus/questions.yaml +++ b/charts/stable/uptimerobot-prometheus/questions.yaml @@ -8,25 +8,28 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: UPTIMEROBOT_API_KEY + label: "UptimeRobot API Key" + description: "UptimeRobot.com API Key" + schema: + type: string + required: true + private: true + default: "REPLACETHIS" + # Include{containerBasic} # Include{containerAdvanced} - # Include{containerConfig} - - variable: secretEnv - group: "App Configuration" - label: "Image Secrets" - schema: - additional_attrs: true - type: dict - attrs: - - variable: UPTIMEROBOT_API_KEY - label: "UptimeRobot API Key" - description: "UptimeRobot.com API Key" - schema: - type: string - required: true - private: true - default: "REPLACETHIS" +# Include{podOptions} + # Include{serviceExpertRoot} default: false # Include{serviceExpert} @@ -40,16 +43,16 @@ questions: schema: type: int default: 568 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID this App of the user running the application" - schema: - type: int - default: 568 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 568 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup + - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." schema: diff --git a/charts/stable/uptimerobot-prometheus/templates/NOTES.txt b/charts/stable/uptimerobot-prometheus/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/uptimerobot-prometheus/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/uptimerobot-prometheus/templates/common.yaml b/charts/stable/uptimerobot-prometheus/templates/common.yaml index c1a366e1cf0..b51394e00a4 100644 --- a/charts/stable/uptimerobot-prometheus/templates/common.yaml +++ b/charts/stable/uptimerobot-prometheus/templates/common.yaml @@ -1 +1 @@ -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/stable/uptimerobot-prometheus/values.yaml b/charts/stable/uptimerobot-prometheus/values.yaml index 0ecd9066c21..91dbd5e8457 100644 --- a/charts/stable/uptimerobot-prometheus/values.yaml +++ b/charts/stable/uptimerobot-prometheus/values.yaml @@ -2,48 +2,39 @@ image: repository: tccr.io/truecharts/prometheus-uptimerobot-exporter tag: v0.0.1@sha256:15e110bcbf474b43afda8b92868702db9c0c7a405266c724e3e9546990a97316 pullPolicy: IfNotPresent - -secretEnv: - UPTIMEROBOT_API_KEY: "" - -securityContext: - readOnlyRootFilesystem: false - service: main: ports: main: - enabled: false - metrics: enabled: true port: 9705 - metrics: - # -- Enable and configure a Prometheus serviceMonitor for the chart under this key. - # @default -- See values.yaml - enabled: false - serviceMonitor: - interval: 1m - scrapeTimeout: 30s - labels: {} - # -- Enable and configure Prometheus Rules for the chart under this key. - # @default -- See values.yaml - prometheusRule: - enabled: false - labels: {} - # -- Configure additionial rules for the chart under this key. - # @default -- See prometheusrules.yaml - rules: - [] - # - alert: UptimeRobotExporterAbsent - # annotations: - # description: Uptime Robot Exporter has disappeared from Prometheus service discovery. - # summary: Uptime Robot Exporter is down. - # expr: | - # absent(up{job=~".*uptimerobot.*"} == 1) - # for: 5m - # labels: - # severity: critical + main: + enabled: true + type: "servicemonitor" + endpoints: + - port: main + path: /metrics + prometheusRule: + enabled: false portal: - enabled: false + open: + enabled: false +securityContext: + container: + readOnlyRootFilesystem: false +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + UPTIMEROBOT_API_KEY: "" diff --git a/charts/stable/valheim/Chart.yaml b/charts/stable/valheim/Chart.yaml index 482332bcafb..d98984f70f7 100644 --- a/charts/stable/valheim/Chart.yaml +++ b/charts/stable/valheim/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.6.1 description: Valheim dedicated gameserver with automatic update and world backup support home: https://truecharts.org/charts/stable/valheim icon: https://truecharts.org/img/hotlink-ok/chart-icons/valheim.png @@ -18,9 +18,8 @@ name: valheim sources: - https://github.com/truecharts/charts/tree/master/charts/stable/valheim - https://github.com/lloesche/valheim-server-docker -version: 5.0.14 +version: 6.0.0 annotations: truecharts.org/catagories: | - media truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/stable/valheim/questions.yaml b/charts/stable/valheim/questions.yaml index 66daf1d29d2..07eabee874e 100644 --- a/charts/stable/valheim/questions.yaml +++ b/charts/stable/valheim/questions.yaml @@ -15,100 +15,94 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + group: App Configuration + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: SUPERVISOR_HTTP_USER + label: Supervisor HTTP User + schema: + type: string + default: admin + required: true + - variable: SUPERVISOR_HTTP_PASS + label: Supervisor HTTP Pass + schema: + type: string + required: true + private: true + default: "" + - variable: SERVER_PASS + label: Server Pass + schema: + type: string + private: true + default: "" + min_length: 5 + - variable: STATUS_HTTP + label: Status HTTP + schema: + type: boolean + default: true + - variable: SUPERVISOR_HTTP + label: Supervisor HTTP + schema: + type: boolean + default: true + - variable: SERVER_NAME + label: Server Name + schema: + type: string + default: My Server + required: true + - variable: WORLD_NAME + label: World Name + schema: + type: string + default: Dedicated + required: true + - variable: SERVER_PUBLIC + label: Server Public + schema: + type: boolean + default: true + - variable: UPDATE_INTERVAL + label: Update Interval + schema: + type: int + default: 10800 + required: true + - variable: BACKUPS + label: Backups + schema: + type: boolean + default: true + - variable: BACKUPS_INTERVAL + label: Backups Interval + schema: + type: int + default: 43200 + required: true + - variable: BACKUPS_DIRECTORY + label: Backups Directory + schema: + type: string + default: /backups + required: true + - variable: BACKUPS_MAX_AGE + label: Backups Max Age + schema: + type: int + default: 3 + required: true # Include{containerBasic} # Include{containerAdvanced} - - - variable: secretEnv - group: App Configuration - label: Image Secrets - schema: - additional_attrs: true - type: dict - attrs: - - variable: SUPERVISOR_HTTP_USER - label: Supervisor HTTP User - schema: - type: string - default: admin - required: true - - variable: SUPERVISOR_HTTP_PASS - label: Supervisor HTTP Pass - schema: - type: string - required: true - private: true - default: "" - - variable: SERVER_PASS - label: Server Pass - schema: - type: string - private: true - default: "" - min_length: 5 - - variable: env - group: App Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: STATUS_HTTP - label: Status HTTP - schema: - type: boolean - default: true - - variable: SUPERVISOR_HTTP - label: Supervisor HTTP - schema: - type: boolean - default: true - - variable: SERVER_NAME - label: Server Name - schema: - type: string - default: My Server - required: true - - variable: WORLD_NAME - label: World Name - schema: - type: string - default: Dedicated - required: true - - variable: SERVER_PUBLIC - label: Server Public - schema: - type: boolean - default: true - - variable: UPDATE_INTERVAL - label: Update Interval - schema: - type: int - default: 10800 - required: true - - variable: BACKUPS - label: Backups - schema: - type: boolean - default: true - - variable: BACKUPS_INTERVAL - label: Backups Interval - schema: - type: int - default: 43200 - required: true - - variable: BACKUPS_DIRECTORY - label: Backups Directory - schema: - type: string - default: /backups - required: true - - variable: BACKUPS_MAX_AGE - label: Backups Max Age - schema: - type: int - default: 3 - required: true # Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: Main Service @@ -232,28 +226,28 @@ questions: # Include{ingressTraefik} # Include{ingressList} -# Include{podSecurityContextRoot} - - variable: runAsUser - label: runAsUser - description: The UserID of the user running the application - schema: - type: int - default: 0 - - variable: runAsGroup - label: runAsGroup - description: The groupID this App of the user running the application - schema: - type: int - default: 0 +# Include{securityContextRoot} + - variable: runAsUser + label: "runAsUser" + description: "The UserID of the user running the application" + schema: + type: int + default: 0 + - variable: runAsGroup + label: "runAsGroup" + description: "The groupID of the user running the application" + schema: + type: int + default: 0 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} - - variable: fsGroup - label: fsGroup - description: The group that should own ALL storage. - schema: - type: int - default: 568 + - variable: fsGroup + label: "fsGroup" + description: "The group that should own ALL storage." + schema: + type: int + default: 568 # Include{resources} # Include{advanced} diff --git a/charts/stable/valheim/templates/NOTES.txt b/charts/stable/valheim/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/stable/valheim/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/stable/valheim/templates/common.yaml b/charts/stable/valheim/templates/common.yaml index d8f17cf6d44..6d56fec1401 100644 --- a/charts/stable/valheim/templates/common.yaml +++ b/charts/stable/valheim/templates/common.yaml @@ -1,4 +1,4 @@ -{{- include "tc.common.loader.init" . }} +{{- include "tc.v1.common.loader.init" . }} {{/* Append the hardcoded settings */}} {{- define "valheim.hardcodedValues" -}} @@ -13,4 +13,4 @@ probes: {{- $_ := mergeOverwrite .Values (include "valheim.hardcodedValues" . | fromYaml) -}} {{/* Render the templates */}} -{{ include "tc.common.loader.apply" . }} +{{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/stable/valheim/values.yaml b/charts/stable/valheim/values.yaml index 3bfce235e56..c2099889037 100644 --- a/charts/stable/valheim/values.yaml +++ b/charts/stable/valheim/values.yaml @@ -2,35 +2,6 @@ image: repository: tccr.io/truecharts/valheim-server tag: latest@sha256:bc9b41516c963c953bed2d76c3ef74c3d7e8ac4d6b69f3ef860ec0f3e1767e8d pullPolicy: IfNotPresent - -secretEnv: - SUPERVISOR_HTTP_USER: admin - SUPERVISOR_HTTP_PASS: secret - SERVER_PASS: secret - -env: - STATUS_HTTP: true - STATUS_HTTP_PORT: "{{ .Values.service.main.ports.main.port }}" - SUPERVISOR_HTTP: true - SUPERVISOR_HTTP_PORT: "{{ .Values.service.supervisor.ports.supervisor.port }}" - SERVER_NAME: My Server - SERVER_PORT: "{{ .Values.service.valheim.ports.valheim1.port }}" - WORLD_NAME: Dedicated - SERVER_PUBLIC: true - UPDATE_INTERVAL: 10800 - BACKUPS: true - BACKUPS_INTERVAL: 43200 - BACKUPS_DIRECTORY: /backups - BACKUPS_MAX_AGE: 3 - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - service: main: ports: @@ -49,16 +20,14 @@ service: valheim1: enabled: true port: 2456 - protocol: UDP + protocol: udp valheim2: enabled: true port: 2457 - protocol: UDP - + protocol: udp ingress: supervisor: autoLink: true - persistence: config: enabled: true @@ -66,6 +35,41 @@ persistence: backups: enabled: true mountPath: /backups - portal: - enabled: true + open: + enabled: true +securityContext: + container: + readOnlyRootFilesystem: false + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + type: tcp + readiness: + type: tcp + startup: + type: tcp + env: + STATUS_HTTP: true + STATUS_HTTP_PORT: "{{ .Values.service.main.ports.main.port }}" + SUPERVISOR_HTTP: true + SUPERVISOR_HTTP_PORT: "{{ .Values.service.supervisor.ports.supervisor.port }}" + SERVER_NAME: My Server + SERVER_PORT: "{{ .Values.service.valheim.ports.valheim1.port }}" + WORLD_NAME: Dedicated + SERVER_PUBLIC: true + UPDATE_INTERVAL: 10800 + BACKUPS: true + BACKUPS_INTERVAL: 43200 + BACKUPS_DIRECTORY: /backups + BACKUPS_MAX_AGE: 3 + SUPERVISOR_HTTP_USER: admin + SUPERVISOR_HTTP_PASS: secret + SERVER_PASS: secret