Merge branch 'master' into default-db-roles

manifests/complete-postgres-manifest.yaml

@@ -2,6 +2,8 @@ apiVersion: "acid.zalan.do/v1"
 kind: postgresql
 metadata:
   name: acid-test-cluster
+#  labels:
+#    environment: demo
 spec:
   dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
   initContainers:

manifests/configmap.yaml

@@ -31,7 +31,7 @@ data:
   enable_teams_api: "false"
   # etcd_host: ""
   # infrastructure_roles_secret_name: postgresql-infrastructure-roles
-  # inherited_labels: ""
+  # inherited_labels: application,environment
   # kube_iam_role: ""
   # log_s3_bucket: ""
   # logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"

manifests/operator-service-account-rbac.yaml

@@ -88,6 +88,12 @@ rules:
   - list
   - watch
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - pods/exec
+  verbs:
+  - create
 - apiGroups:
   - ""
   resources:

manifests/postgresql-operator-default-configuration.yaml

@@ -27,7 +27,7 @@ configuration:
     # infrastructure_roles_secret_name: ""
     # inherited_labels:
     # - application
-    # - app
+    # - environment
     # node_readiness_label: ""
     oauth_token_secret_name: postgresql-operator
     pdb_name_format: "postgres-{cluster}-pdb"