conflict resolution for master merge

charts/postgres-operator/crds/postgresqls.yaml

@@ -57,6 +57,7 @@ spec:
       required:
         - kind
         - apiVersion
+        - metadata
         - spec
       properties:
         kind:
@@ -67,6 +68,14 @@ spec:
           type: string
           enum:
             - acid.zalan.do/v1
+        metadata:
+          type: object
+          required:
+            - name
+          properties:
+            name:
+              type: string
+              maxLength: 53
         spec:
           type: object
           required:

charts/postgres-operator/templates/deployment.yaml

@@ -37,6 +37,10 @@ spec:
         image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
+      {{- if .Values.enableJsonLogging }}
+        - name: ENABLE_JSON_LOGGING
+          value: "true"
+      {{- end }}
       {{- if eq .Values.configTarget "ConfigMap" }}
         - name: CONFIG_MAP_NAME
           value: {{ template "postgres-operator.fullname" . }}

charts/postgres-operator/values.yaml

@@ -15,6 +15,9 @@ podLabels: {}
 
 configTarget: "ConfigMap"
 
+# JSON logging format
+enableJsonLogging: false
+
 # general configuration parameters
 configGeneral:
   # choose if deployment creates/updates CRDs with OpenAPIV3Validation