merge with master

manifests/complete-postgres-manifest.yaml

@@ -10,7 +10,7 @@ spec:
   - name: date
     image: busybox
     command: [ "/bin/date" ]
-  teamId: "ACID"
+  teamId: "acid"
   volume:
     size: 1Gi
 #    storageClass: my-sc

manifests/configmap.yaml

@@ -23,11 +23,13 @@ data:
   # enable_admin_role_for_users: "true"
   # enable_crd_validation: "true"
   # enable_database_access: "true"
+  # enable_init_containers: "true"
   enable_master_load_balancer: "false"
   # enable_pod_antiaffinity: "false"
   # enable_pod_disruption_budget: "true"
   enable_replica_load_balancer: "false"
   # enable_shm_volume: "true"
+  # enable_sidecars: "true"
   # enable_team_superuser: "false"
   enable_teams_api: "false"
   # etcd_host: ""

manifests/minimal-postgres-manifest.yaml

@@ -4,7 +4,7 @@ metadata:
   name: acid-minimal-cluster
   namespace: default
 spec:
-  teamId: "ACID"
+  teamId: "acid"
   volume:
     size: 1Gi
   numberOfInstances: 2

manifests/operatorconfiguration.crd.yaml

@@ -83,10 +83,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:
@@ -274,3 +278,7 @@ spec:
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                 scalyr_server_url:
                   type: string
+        status:
+          type: object
+          additionalProperties:
+            type: string

manifests/postgresql-operator-default-configuration.yaml

@@ -26,14 +26,16 @@ configuration:
     # custom_pod_annotations:
     #   keya: valuea
     #   keyb: valueb
+    enable_init_containers: true
     enable_pod_antiaffinity: false
     enable_pod_disruption_budget: true
-    # infrastructure_roles_secret_name: postgresql-infrastructure-roles
+    enable_sidecars: true
+    # infrastructure_roles_secret_name: "postgresql-infrastructure-roles"
     # inherited_labels:
     # - application
     # - environment
     # node_readiness_label:
-    #  status: ready
+    #   status: ready
     oauth_token_secret_name: postgresql-operator
     pdb_name_format: "postgres-{cluster}-pdb"
     pod_antiaffinity_topology_key: "kubernetes.io/hostname"

manifests/postgresql.crd.yaml

@@ -186,7 +186,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:
@@ -217,7 +217,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:
@@ -325,3 +325,7 @@ spec:
                   type: string
                 subPath:
                   type: string
+        status:
+          type: object
+          additionalProperties:
+            type: string

manifests/standby-manifest.yaml

@@ -4,7 +4,7 @@ metadata:
   name: acid-standby-cluster
   namespace: default
 spec:
-  teamId: "ACID"
+  teamId: "acid"
   volume:
     size: 1Gi
   numberOfInstances: 1