Merge branch 'master' into api-improvements

This commit is contained in:
Murat Kabilov
2017-09-26 14:47:13 +02:00
committed by GitHub
5 changed files with 9 additions and 5 deletions
+1
View File
@@ -12,6 +12,7 @@ data:
dns_name_format: '{cluster}.{team}.staging.{hostedzone}'
docker_image: registry.opensource.zalan.do/acid/spiloprivate-9.6:1.2-p4
etcd_host: etcd-client.default.svc.cluster.local:2379
secret_name_template: '{username}.{clustername}.credentials.{tprkind}.{tprgroup}'
infrastructure_roles_secret_name: postgresql-infrastructure-roles
oauth_token_secret_name: postgresql-operator
pam_configuration: |