chore(incubator): make things work with new common part 3 (#15994)

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

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 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?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

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

**✔️ Checklist:**

- [ ] ⚖️ 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/dev/checkmk/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: checkmk
-version: 1.0.1
+version: 1.0.2
 appVersion: 2.2.0
 description:
   Checkmk is a leading tool for Infrastructure and Application Monitoring.

charts/dev/checkmk/templates/_secret.tpl

@@ -1,16 +1,9 @@
 {{/* Define the secret */}}
 {{- define "checkmk.secret" -}}
 
-{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) }}
+{{- $secretName := printf "%s-secret" (include "tc.v1.common.names.fullname" .) }}
----
+enabled: true
-apiVersion: v1
+data:
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ $secretName }}
-  labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
-stringData:
   CMK_PASSWORD: {{ .Values.cmk.password | quote }}
   CMK_SITE_ID: {{ .Values.cmk.site_id | quote }}
   CMK_LIVESTATUS_TCP: {{ ternary "on" "off" .Values.cmk.livestatus_tcp | quote }}

charts/dev/checkmk/values.yaml

@@ -26,7 +26,6 @@ securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   livestatustcp:
@@ -57,7 +56,7 @@ workload:
         main:
           envFrom:
             - secretRef:
-                name: '{{ include "tc.common.names.fullname" . }}-secret'
+                name: 'secret'
           probes:
             liveness:
               spec:

charts/dev/cherry/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: cherry
-version: 3.0.1
+version: 3.0.2
 appVersion: 0.0.7
 description: An open source self-hosted bookmark service
 home: https://truecharts.org/charts/incubator/cherry

charts/dev/cherry/templates/_config.tpl

@@ -1,15 +1,9 @@
 {{/* Define the configmap */}}
 {{- define "cherry.configmap" -}}
 
-{{- $configName := printf "%s-cherry-configmap" (include "tc.common.names.fullname" .) }}
+{{- $configName := printf "%s-cherry-configmap" (include "tc.v1.common.names.fullname" .) }}
 
----
+enabled: true
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ $configName }}
-  labels:  {{- include "tc.common.labels" . | nindent 4 }}
 data:
   DATABASE_PATH: /data/cherry.sqlite
   ENABLE_PUBLIC_REGISTRATION: {{ ternary "1" "0" .Values.cherry.public_registration  | quote }}

charts/dev/cherry/templates/_secrets.tpl

@@ -1,25 +1,19 @@
 {{/* Define the secrets */}}
 {{- define "cherry.secrets" -}}
 
-{{- $secretName := printf "%s-cherry-secret" (include "tc.common.names.fullname" .) }}
+{{- $secretName := printf "%s-cherry-secret" (include "tc.v1.common.names.fullname" .) }}
 
----
+enabled: true
-
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ $secretName }}
 data:
   {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
   JWT_SECRET: {{ index .data "JWT_SECRET" }}
   {{- else }}
-  JWT_SECRET: {{ randAlphaNum 32 | b64enc }}
+  JWT_SECRET: {{ randAlphaNum 32 }}
   {{- end }}
   {{- with .Values.cherry.google_oauth_id }}
-  GOOGLE_OAUTH_CLIENT_ID: {{ . | b64enc }}
+  GOOGLE_OAUTH_CLIENT_ID: {{ . }}
   {{- end }}
   {{- with .Values.cherry.google_oauth_secret }}
-  GOOGLE_OAUTH_CLIENT_SECRET: {{ . | b64enc }}
+  GOOGLE_OAUTH_CLIENT_SECRET: {{ . }}
   {{- end }}
 {{- end -}}

charts/dev/cherry/values.yaml

@@ -20,7 +20,6 @@ securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   main:
@@ -36,9 +35,9 @@ workload:
         main:
           envFrom:
             - secretRef:
-                name: '{{ include "tc.common.names.fullname" . }}-cherry-secret'
+                name: 'cherry-secret'
             - configMapRef:
-                name: '{{ include "tc.common.names.fullname" . }}-cherry-configmap'
+                name: 'cherry-configmap'
           probes:
             liveness:
               path: /

charts/dev/cleanarr/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: cleanarr
-version: 3.0.1
+version: 3.0.2
 appVersion: 2.5.0
 description:
   A simple UI to help find and delete duplicate and sample files from your

charts/dev/cleanarr/values.yaml

@@ -13,7 +13,6 @@ securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   main:

charts/dev/coupon-store/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: coupon-store
-version: 4.0.1
+version: 4.0.2
 appVersion: 1.3.0
 description: A home for all your coupons and loyalty cards.
 home: https://truecharts.org/charts/incubator/coupon-store

charts/dev/coupon-store/templates/_secrets.tpl

@@ -1,10 +1,10 @@
 {{/* Define the secrets */}}
 {{- define "couponstore.secrets" -}}
 
-{{- $secretName := printf "%s-couponstore-secret" (include "tc.common.names.fullname" .) }}
+{{- $secretName := printf "%s-couponstore-secret" (include "tc.v1.common.names.fullname" .) }}
 
 ---
-{{- $pg := .Values.postgresql }}
+{{- $pg := .Values.cnpg.main }}
 
 apiVersion: v1
 kind: Secret
@@ -15,7 +15,7 @@ data:
   {{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
   SECRET_KEY_BASE: {{ index .data "SECRET_KEY_BASE" }}
   {{- else }}
-  SECRET_KEY_BASE: {{ randAlphaNum 32 | b64enc }}
+  SECRET_KEY_BASE: {{ randAlphaNum 32 }}
   {{- end }}
-  DATABASE_URL: {{ printf "postgres://%v:%v@%v-postgresql:5432/%v" $pg.postgresqlUsername ($pg.postgresqlPassword | trimAll "\"") .Release.Name $pg.postgresqlDatabase  | b64enc }}
+  DATABASE_URL: {{ printf "postgres://%v:%v@%v-postgresql:5432/%v" $pg.user ($pg.postgresqlPassword | trimAll "\"") .Release.Name $pg.database  }}
 {{- end -}}

charts/dev/coupon-store/values.yaml

@@ -5,16 +5,15 @@ image:
 portal:
   open:
     enabled: true
-postgresql:
+cnpg:
-  enabled: true
+  main:
-  existingSecret: dbcreds
+    enabled: true
-  postgresqlDatabase: coupon-store
+    database: coupon-store
-  postgresqlUsername: coupon-store
+    user: coupon-store
 securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   main:
@@ -33,4 +32,4 @@ workload:
               }} -b '0.0.0.0'
           envFrom:
             - secretRef:
-                name: '{{ include "tc.common.names.fullname" . }}-couponstore-secret'
+                name: 'couponstore-secret'

charts/dev/dsmr-reader/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: dsmr-reader
-version: 13.0.1
+version: 13.0.2
 appVersion: 2021.09.02
 description: DSMR-protocol reader, telegram data storage and energy consumption visualizer.
 home: https://truecharts.org/charts/incubator/dsmr-reader

charts/dev/dsmr-reader/values.yaml

@@ -9,16 +9,15 @@ persistence:
 portal:
   open:
     enabled: true
-postgresql:
+cnpg:
-  enabled: true
+  main:
-  existingSecret: dbcreds
+    enabled: true
-  postgresqlDatabase: dsmr-reader
+    database: dsmr-reader
-  postgresqlUsername: dsmr-reader
+    user: dsmr-reader
 securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   main:
@@ -37,11 +36,11 @@ workload:
               secretKeyRef:
                 key: plainhost
                 name: dbcreds
-            DJANGO_DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}"
+            DJANGO_DATABASE_NAME: "{{ .Values.cnpg.main.database }}"
             DJANGO_DATABASE_PASSWORD:
               secretKeyRef:
                 key: postgresql-password
                 name: dbcreds
             DJANGO_DATABASE_PORT: "5432"
-            DJANGO_DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}"
+            DJANGO_DATABASE_USER: "{{ .Values.cnpg.main.user }}"
             DJANGO_TIME_ZONE: "{{ .Values.TZ }}"

charts/dev/euterpe/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: euterpe
-version: 4.0.1
+version: 4.0.2
 appVersion: 1.5.4
 description:
   Self-hosted streaming service for music, formerly known as HTTP Media

charts/dev/euterpe/templates/_secret.tpl

@@ -1,24 +1,17 @@
 {{/* Define the secret */}}
 {{- define "euterpe.secret" -}}
 
-{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) }}
+{{- $secretName := printf "%s-secret" (include "tc.v1.common.names.fullname" .) }}
-{{- $secretStorageName := printf "%s-storage-secret" (include "tc.common.names.fullname" .) }}
+{{- $secretStorageName := printf "%s-storage-secret" (include "tc.v1.common.names.fullname" .) }}
 
 {{- $secretKey := "" }}
 {{- with (lookup "v1" "Secret" .Release.Namespace $secretStorageName) }}
   {{- $secretKey = (index .data "secret") | b64dec }}
 {{- else }}
-  {{- $secretKey = randAlphaNum 32 | b64enc }}
+  {{- $secretKey = randAlphaNum 32 }}
 {{- end }}
----
+enabled: true
-apiVersion: v1
+data:
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ $secretName }}
-  labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
-stringData:
   config.json: |
     {
       "listen": {{ printf ":%v" .Values.service.main.ports.main.port | quote }},
@@ -64,15 +57,8 @@ stringData:
       "write_timeout": {{ .Values.euterpe.danger_zone.write_timeout }},
       "max_header_bytes": {{ .Values.euterpe.danger_zone.max_header_bytes | int }}
     }
----
+enabled: true
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ $secretStorageName }}
-  labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
 data:
   {{/* Store secretKey to reuse */}}
-  secret: {{ $secretKey | b64enc }}
+  secret: {{ $secretKey }}
 {{- end }}

charts/dev/euterpe/values.yaml

@@ -41,7 +41,6 @@ securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   main:

charts/dev/flemarr/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: flemarr
-version: 3.0.1
+version: 3.0.2
 appVersion: latest
 description:
   Flemmarr is a simple Python script that parses a configuration written

charts/dev/flemarr/templates/_configMap.tpl

@@ -0,0 +1,10 @@
+{{/* Define the secrets */}}
+{{- define "flemarr.config" -}}
+
+{{- $configName := printf "%s-flemarr-config" (include "tc.v1.common.names.fullname" .) }}
+
+enabled: true    
+data:
+  config.yml: |
+{{- .Values.flemarrConfig | toYaml | nindent 4 }}
+{{- end -}}

charts/dev/focalboard/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: focalboard
-version: 14.0.1
+version: 14.0.2
 appVersion: 7.11.4
 description:
   Focalboard is an open source, self-hosted alternative to Trello, Notion,

charts/dev/focalboard/templates/_configmap.tpl

@@ -1,15 +1,9 @@
 {{- define "focalboard.configmap" -}}
 
-{{- $pgPass := .Values.postgresql.postgresqlPassword | trimAll "\"" }}
+{{- $pgPass := .Values.cnpg.main.creds.password | trimAll "\"" }}
-{{- $pgUser := .Values.postgresql.postgresqlUsername }}
+{{- $pgUser := .Values.cnpg.main.user }}
-{{- $pgDB := .Values.postgresql.postgresqlDatabase }}
+{{- $pgDB := .Values.cnpg.main.database }}
----
+enabled: true    
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "tc.common.names.fullname" . }}-install
-  labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
 data:
   focalboard-config: |-
     {

charts/dev/focalboard/values.yaml

@@ -14,11 +14,11 @@ persistence:
 portal:
   open:
     enabled: true
-postgresql:
+cnpg:
-  enabled: true
+  main:
-  existingSecret: dbcreds
+    enabled: true
-  postgresqlDatabase: focalboard
+    database: focalboard
-  postgresqlUsername: focalboard
+    user: focalboard
 securityContext:
   container:
     readOnlyRootFilesystem: false

charts/dev/gotify/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: gotify
-version: 14.0.1
+version: 14.0.2
 appVersion: 2.4.0
 description: A simple server for sending and receiving messages.
 home: https://truecharts.org/charts/incubator/gotify

charts/dev/gotify/templates/_secret.tpl

@@ -1,13 +1,13 @@
 {{/* Define the secret */}}
 {{- define "gotify.secret" -}}
 
-{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) }}
+{{- $secretName := printf "%s-secret" (include "tc.v1.common.names.fullname" .) }}
-{{- $secretEnvName := printf "%s-secret-env" (include "tc.common.names.fullname" .) }}
+{{- $secretEnvName := printf "%s-secret-env" (include "tc.v1.common.names.fullname" .) }}
 
-{{- $url := (.Values.postgresql.url.plain | trimAll "\"") }}
+{{- $url := (.Values.cnpg.main.url.plain | trimAll "\"") }}
-{{- $password := (.Values.postgresql.postgresqlPassword | trimAll "\"") }}
+{{- $password := (.Values.cnpg.main.creds.password | trimAll "\"") }}
-{{- $dbuser := .Values.postgresql.postgresqlUsername }}
+{{- $dbuser := .Values.cnpg.main.user }}
-{{- $dbname := .Values.postgresql.postgresqlDatabase }}
+{{- $dbname := .Values.cnpg.main.database }}
 {{- $port := .Values.service.main.ports.main.port }}
 ---
 apiVersion: v1
@@ -15,8 +15,8 @@ kind: Secret
 metadata:
   name: {{ $secretEnvName }}
   labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
+    
-stringData: {{/* Env takes precedence, and it;s defined in Dockerfile as 80 */}}
+data: {{/* Env takes precedence, and it;s defined in Dockerfile as 80 */}}
   GOTIFY_SERVER_PORT: {{ $port | quote }}
 ---
 apiVersion: v1
@@ -24,8 +24,8 @@ kind: Secret
 metadata:
   name: {{ $secretName }}
   labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
+    
-stringData:
+data:
   config.yml: |
     server:
       listenaddr: ""

charts/dev/gotify/values.yaml

@@ -21,7 +21,7 @@ persistence:
     defaultMode: "0600"
     enabled: true
     mountPath: /etc/gotify/config.yml
-    objectName: '{{ include "tc.common.names.fullname" . }}-secret'
+    objectName: 'secret'
     readOnly: true
     subPath: config.yml
     type: secret
@@ -31,11 +31,11 @@ persistence:
 portal:
   open:
     enabled: true
-postgresql:
+cnpg:
-  enabled: true
+  main:
-  existingSecret: dbcreds
+    enabled: true
-  postgresqlDatabase: gotify
+    database: gotify
-  postgresqlUsername: gotify
+    user: gotify
 service:
   main:
     ports:
@@ -48,7 +48,7 @@ workload:
         main:
           envFrom:
             - secretRef:
-                name: '{{ include "tc.common.names.fullname" . }}-secret-env'
+                name: 'secret-env'
           probes:
             liveness:
               path: /health

charts/dev/icinga2/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: icinga2
-version: 8.0.1
+version: 8.0.2
 appVersion: 2.14.0
 description:
   A monitoring system which checks the availability of your network resources,

charts/dev/icinga2/values.yaml

@@ -27,7 +27,6 @@ securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   api:

charts/dev/koel/Chart.yaml

@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: koel
-version: 8.0.1
+version: 8.0.2
 appVersion: latest
 description:
   Koel is a simple web-based personal audio streaming service written in

charts/dev/koel/templates/_secrets.tpl

@@ -1,12 +1,6 @@
 {{/* Define the secrets */}}
 {{- define "koel.secrets" -}}
----
+enabled: true
-
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: koel-secrets
 {{- $koelprevious := lookup "v1" "Secret" .Release.Namespace "koel-secrets" }}
 {{- $app_key := "" }}
 data:
@@ -14,7 +8,7 @@ data:
   APP_KEY: {{ index $koelprevious.data "APP_KEY" }}
   {{- else }}
   {{- $app_key := randAlphaNum 32 }}
-  APP_KEY: {{ $app_key | b64enc }}
+  APP_KEY: {{ $app_key }}
   {{- end }}
 
 {{- end -}}

charts/dev/koel/values.yaml

@@ -29,7 +29,6 @@ securityContext:
   container:
     readOnlyRootFilesystem: false
     runAsGroup: 0
-    runAsNonRoot: false
     runAsUser: 0
 service:
   main: