document configmap variant of inherited_labels (#678)

* document configmap varient of inherited_labels and remove application label from cluster example since we will get application:spilo by default
This commit is contained in:
Erik Inge Bolsø 2019-10-05 10:10:02 +02:00 committed by Felix Kunde
parent baae1887b3
commit e3b39a5cbe
6 changed files with 18 additions and 4 deletions

View File

@ -66,7 +66,7 @@ configKubernetes:
# list of labels that can be inherited from the cluster manifest
# inherited_labels:
# - application
# - app
# - environment
# timeout for successful migration of master pods from unschedulable node
# master_pod_move_timeout: 20m

View File

@ -62,7 +62,7 @@ configKubernetes:
# infrastructure_roles_secret_name: postgresql-infrastructure-roles
# list of labels that can be inherited from the cluster manifest
# inherited_labels: ""
# inherited_labels: application,environment
# timeout for successful migration of master pods from unschedulable node
# master_pod_move_timeout: 20m

View File

@ -200,6 +200,18 @@ Postgres cluster, in order to identify its child objects. The typical use case
is to add labels that identifies the `Pods` created by the operator, in order
to implement fine-controlled `NetworkPolicies`.
**postgres-operator ConfigMap**
```yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: postgres-operator
data:
inherited_labels: application,environment
...
```
**OperatorConfiguration**
```yaml

View File

@ -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:

View File

@ -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"

View File

@ -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"