public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator/values-crd.yaml
View File

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

2
charts/postgres-operator/values.yaml
View File

@ -62,7 +62,7 @@ configKubernetes:
# infrastructure_roles_secret_name: postgresql-infrastructure-roles # infrastructure_roles_secret_name: postgresql-infrastructure-roles
# list of labels that can be inherited from the cluster manifest # 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 # timeout for successful migration of master pods from unschedulable node
# master_pod_move_timeout: 20m # master_pod_move_timeout: 20m

12
docs/administrator.md
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 is to add labels that identifies the `Pods` created by the operator, in order
to implement fine-controlled `NetworkPolicies`. to implement fine-controlled `NetworkPolicies`.
**postgres-operator ConfigMap**
```yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: postgres-operator
data:
inherited_labels: application,environment
...
```
**OperatorConfiguration** **OperatorConfiguration**
```yaml ```yaml

2
manifests/complete-postgres-manifest.yaml
View File

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

2
manifests/configmap.yaml
View File

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

2
manifests/postgresql-operator-default-configuration.yaml
View File

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