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

@@ -15,43 +15,43 @@ metadata:
     {{- end }}
 spec:
   instances: {{ required "serverInstances is required" .Values.cluster.serverInstances }}
-  baseServerId: {{ required "baseServerId is required" .Values.cluster.baseServerId }}  
-  serviceAccountName: {{ include "mysql.serviceAccountName" . }}  
+  baseServerId: {{ required "baseServerId is required" .Values.cluster.baseServerId }}
+  serviceAccountName: {{ include "mysql.serviceAccountName" . }}
   imagePullPolicy : {{ .Values.cluster.image.pullPolicy }}
   version: {{ .Values.cluster.image.version }}
   tlsUseSelfSigned: true
   secretName: {{ .Values.cluster.exisitingCredentialsSecret }}
+  {{- if .Values.cluster.podSpec }}
   podSpec:
-    {{- with .Values.cluster.podSpec }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
+    {{ toYaml .Values.cluster.podSpec | nindent 4 }}
+  {{- end }}
+  {{- if .Values.cluster.podAnnotations }}
   podAnnotations:
-    {{- with .Values.cluster.podAnnotations }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
+    {{ toYaml .Values.cluster.podAnnotations | nindent 4 }}
+  {{- end }}
+  {{- if .Values.cluster.podLabels }}
   podLabels:
-    {{- with .Values.cluster.podLabels }}
-    {{ toYaml . | nindent 4 }}
-    {{- end }}
+    {{ toYaml .Values.cluster.podLabels | 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 . | nindent 6 }}
-      {{- end }}
+      {{- toYaml .Values.cluster.router.podSpec | nindent 6 }}
+    {{- end }}
+    {{- if .Values.cluster.router.podAnnotations }}
     podAnnotations:
-      {{- with .Values.cluster.router.podAnnotations }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
+      {{- toYaml .Values.cluster.router.podAnnotations | nindent 6 }}
+    {{- end }}
+    {{- if .Values.cluster.router.podLabels }}
     podLabels:
-      {{- with .Values.cluster.router.podLabels }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
+      {{- toYaml .Values.cluster.router.podLabels | nindent 6 }}
+    {{- end }}
     tlsSecretName: {{ include "cluster.name" . }}-router-tls
   logs:
     {{- with .Values.cluster.logs }}
     {{ toYaml . | nindent 4 }}
-    {{- end }}      
+    {{- end }}
   mycnf: |
 {{ .Values.cluster.serverConfig.mycnf | indent 4 }}
   {{- if .Values.cluster.datadirVolumeClaimTemplate }}

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

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