change flow control

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.3.0
+version: 3.6.0
 description: Chart for cloudnative-pg cluster
 keywords:
   - database

charts/postgres-cluster/templates/_bootstrap.tpl

@@ -21,12 +21,6 @@ bootstrap:
       {{- printf "- %s" . | nindent 6 }}
       {{- end }}
       {{- end }}
-    postInitSQL:
-      {{- with .Values.cluster.initdb }}
-      {{- range .postInitSQL }}
-      {{- printf "- %s" . | nindent 6 }}
-      {{- end }}
-      {{- end }}
 {{- else if eq .Values.mode "replica" }}
   initdb:
     import:

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