change condition handling

* Update cloudflare/cloudflared Docker tag to v2024.6.1

* update chart

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: alexlebens <alexanderlebens@gmail.com>

charts/cloudflared/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 1.4.0
+version: 1.4.1
 description: Cloudflared Tunnel
 keywords:
   - cloudflare
@@ -15,4 +15,4 @@ dependencies:
     repository: https://bjw-s.github.io/helm-charts/
     version: 3.2.1
 icon: https://avatars.githubusercontent.com/u/314135?s=48&v=4
-appVersion: "2024.6.0"
+appVersion: "2024.6.1"

charts/cloudflared/values.yaml

@@ -3,7 +3,7 @@ existingSecretName: cloudflared-secret
 existingSecretKey: cf-tunnel-token
 image:
   repository: cloudflare/cloudflared
-  tag: "2024.6.0"
+  tag: "2024.6.1"
   pullPolicy: IfNotPresent
 resources:
   requests:

charts/mysql-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: mysql-cluster
-version: 0.2.1
+version: 0.2.4
 description: Chart for a mysql cluster
 keywords:
   - database

charts/mysql-cluster/templates/deployment.yaml

@@ -21,31 +21,31 @@ spec:
   version: {{ .Values.cluster.image.version }}
   tlsUseSelfSigned: true
   secretName: {{ .Values.cluster.exisitingCredentialsSecret }}
+  {{- if .Values.cluster.podSpec }}
   podSpec:
-    {{- with .Values.cluster.podSpec }}
+    {{ toYaml .Values.cluster.podSpec | nindent 4 }}
-    {{ toYaml . | nindent 4 }}
   {{- end }}
+  {{- if .Values.cluster.podAnnotations }}
   podAnnotations:
-    {{- with .Values.cluster.podAnnotations }}
+    {{ toYaml .Values.cluster.podAnnotations | nindent 4 }}
-    {{ toYaml . | nindent 4 }}
   {{- end }}
+  {{- if .Values.cluster.podLabels }}
   podLabels:
-    {{- with .Values.cluster.podLabels }}
+    {{ toYaml .Values.cluster.podLabels | nindent 4 }}
-    {{ toYaml . | nindent 4 }}
   {{- end }}
   router:
     instances: {{ required "router.instances is required" .Values.cluster.router.instances }}
+    {{- if .Values.cluster.router.podSpec }}
     podSpec:
-      {{- with .Values.cluster.router.podSpec }}
+      {{- toYaml .Values.cluster.router.podSpec | nindent 6 }}
-      {{- toYaml . | nindent 6 }}
     {{- end }}
+    {{- if .Values.cluster.router.podAnnotations }}
     podAnnotations:
-      {{- with .Values.cluster.router.podAnnotations }}
+      {{- toYaml .Values.cluster.router.podAnnotations | nindent 6 }}
-      {{- toYaml . | nindent 6 }}
     {{- end }}
+    {{- if .Values.cluster.router.podLabels }}
     podLabels:
-      {{- with .Values.cluster.router.podLabels }}
+      {{- toYaml .Values.cluster.router.podLabels | nindent 6 }}
-      {{- toYaml . | nindent 6 }}
     {{- end }}
     tlsSecretName: {{ include "cluster.name" . }}-router-tls
   logs:

charts/mysql-cluster/values.yaml

@@ -40,7 +40,6 @@ cluster:
 
   logs:
     error:
-      enabled: true
       collect: false
     general:
       enabled: false

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 3.2.0
+version: 3.8.4
 description: Chart for cloudnative-pg cluster
 keywords:
   - database

charts/postgres-cluster/templates/_backup.tpl

@@ -19,12 +19,24 @@ backup:
         name: {{ include "cluster.backupCredentials" . }}
         key: ACCESS_SECRET_KEY
     wal:
+      {{- if .Values.backup.wal.compression }}
       compression: {{ .Values.backup.wal.compression }}
+      {{- end }}
+      {{- if .Values.backup.wal.encryption }}
       encryption: {{ .Values.backup.wal.encryption }}
+      {{- end }}
+      {{- if .Values.backup.wal.maxParallel }}
       maxParallel: {{ .Values.backup.wal.maxParallel }}
+      {{- end }}
     data:
+      {{- if .Values.backup.data.compression }}
       compression: {{ .Values.backup.data.compression }}
+      {{- end }}
+      {{- if .Values.backup.data.encryption }}
       encryption: {{ .Values.backup.data.encryption }}
+      {{- end }}
+      {{- if .Values.backup.data.jobs }}
       jobs: {{ .Values.backup.data.jobs }}
       {{- end }}
 {{- end }}
+{{- end }}

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -7,6 +7,7 @@ bootstrap:
     {{- . | toYaml | nindent 4 }}
     {{- end }}
     {{- end }}
+    {{- if or (eq .Values.type "postgis") (eq .Values.type "timescaledb") (.Values.cluster.initdb.postInitApplicationSQL) }}
     postInitApplicationSQL:
       {{- if eq .Values.type "postgis" }}
       - CREATE EXTENSION IF NOT EXISTS postgis;
@@ -20,8 +21,6 @@ bootstrap:
       {{- range .postInitApplicationSQL }}
       {{- printf "- %s" . | nindent 6 }}
       {{- end }}
-      {{- range .postInitSQL }}
-      {{- printf "- %s" . | nindent 6 }}
       {{- end }}
     {{- end }}      
 {{- else if eq .Values.mode "replica" }}
@@ -81,13 +80,25 @@ externalClusters:
           name: {{ include "cluster.recoveryCredentials" . }}
           key: ACCESS_SECRET_KEY
       wal:
+        {{- if .Values.recovery.wal.compression }}
         compression: {{ .Values.recovery.wal.compression }}
+        {{- end }}
+        {{- if .Values.recovery.wal.encryption }}
         encryption: {{ .Values.recovery.wal.encryption }}
+        {{- end }}
+        {{- if .Values.recovery.wal.maxParallel }}
         maxParallel: {{ .Values.recovery.wal.maxParallel }}
+        {{- end }}
       data:
+        {{- if .Values.recovery.data.compression }}
         compression: {{ .Values.recovery.data.compression }}
+        {{- end }}
+        {{- if .Values.recovery.data.encryption }}
         encryption: {{ .Values.recovery.data.encryption }}
+        {{- end }}
+        {{- if .Values.recovery.data.jobs }}
         jobs: {{ .Values.recovery.data.jobs }}
+        {{- end }}
 {{- else }}
   {{ fail "Invalid cluster mode!" }}
 {{- end }}

charts/postgres-cluster/templates/cluster.yaml

@@ -32,13 +32,15 @@ spec:
   affinity:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- if .Values.cluster.priorityClassName }}
   priorityClassName: {{ .Values.cluster.priorityClassName }}
+  {{- end }}
   primaryUpdateMethod: {{ .Values.cluster.primaryUpdateMethod }}
   primaryUpdateStrategy: {{ .Values.cluster.primaryUpdateStrategy }}
   logLevel: {{ .Values.cluster.logLevel }}
   postgresql:
-    shared_preload_libraries:
     {{- if eq .Values.type "timescaledb" }}
+    shared_preload_libraries:
       - timescaledb
     {{- end }}
     {{- with .Values.cluster.postgresql.parameters }}

charts/postgres-cluster/values.yaml

@@ -68,7 +68,7 @@ cluster:
     podMonitor:
       enabled: true
     prometheusRule:
-      enabled: true
+      enabled: false
       excludeRules: []
 
   # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration
@@ -81,8 +81,7 @@ cluster:
   # BootstrapInitDB is the configuration of the bootstrap process when initdb is used.
   # See: https://cloudnative-pg.io/documentation/current/bootstrap/
   # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-bootstrapinitdb
-  initdb:
+  initdb: {}
-    {}
     # database: app
     # owner: app
     # secret: "" # Name of the secret containing the initial credentials for the owner of the user database. If empty a new secret will be created from scratch