merge with master

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -107,10 +107,14 @@ spec:
                   type: object
                   additionalProperties:
                     type: string
+                enable_init_containers:
+                  type: boolean
                 enable_pod_antiaffinity:
                   type: boolean
                 enable_pod_disruption_budget:
                   type: boolean
+                enable_sidecars:
+                  type: boolean
                 infrastructure_roles_secret_name:
                   type: string
                 inherited_labels:
@@ -298,3 +302,7 @@ spec:
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                 scalyr_server_url:
                   type: string
+        status:
+          type: object
+          additionalProperties:
+            type: string

charts/postgres-operator/crds/postgresqls.yaml

@@ -222,7 +222,7 @@ spec:
                       # only the format of the given number.
                       #
                       # https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu
-                      pattern: '^(\d+m|\d+\.\d{1,3})$'
+                      pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
                       # Note: the value specified here must not be zero or be lower
                       # than the corresponding request.
                     memory:
@@ -253,7 +253,7 @@ spec:
                       # only the format of the given number.
                       #
                       # https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu
-                      pattern: '^(\d+m|\d+\.\d{1,3})$'
+                      pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
                       # Note: the value specified here must not be zero or be higher
                       # than the corresponding limit.
                     memory:

charts/postgres-operator/values-configmap.yaml

@@ -59,10 +59,14 @@ configKubernetes:
   # annotations attached to each database pod
   # custom_pod_annotations: keya:valuea,keyb:valueb
 
+  # enables initContainers to run actions before Spilo is started
+  enable_init_containers: "true"
   # toggles pod anti affinity on the Postgres pods
   enable_pod_antiaffinity: "false"
   # toggles PDB to set to MinAvailabe 0 or 1
   enable_pod_disruption_budget: "true"
+  # enables sidecar containers to run alongside Spilo in the same pod
+  enable_sidecars: "true"
   # name of the secret containing infrastructure roles names and passwords
   # infrastructure_roles_secret_name: postgresql-infrastructure-roles
 

charts/postgres-operator/values.yaml

@@ -63,10 +63,14 @@ configKubernetes:
   #   keya: valuea
   #   keyb: valueb
 
+  # enables initContainers to run actions before Spilo is started
+  enable_init_containers: true
   # toggles pod anti affinity on the Postgres pods
   enable_pod_antiaffinity: false
   # toggles PDB to set to MinAvailabe 0 or 1
   enable_pod_disruption_budget: true
+  # enables sidecar containers to run alongside Spilo in the same pod
+  enable_sidecars: true
   # name of the secret containing infrastructure roles names and passwords
   # infrastructure_roles_secret_name: postgresql-infrastructure-roles