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

Merge branch 'master' into default-db-roles

This commit is contained in:
Felix Kunde 2020-02-24 14:40:35 +01:00
parent fa6faaf9e9 7b94060d17
commit 59f4d4e328
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator/crds/postgresqls.yaml
View File

@ -94,7 +94,7 @@ spec:
s3_secret_access_key: s3_secret_access_key:
type: string type: string
s3_force_path_style: s3_force_path_style:
type: string type: boolean
s3_wal_path: s3_wal_path:
type: string type: string
timestamp: timestamp:

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

@ -24,7 +24,7 @@ configGeneral:
# etcd connection string for Patroni. Empty uses K8s-native DCS. # etcd connection string for Patroni. Empty uses K8s-native DCS.
etcd_host: "" etcd_host: ""
# Spilo docker image # Spilo docker image
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16 docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
# max number of instances in Postgres cluster. -1 = no limit # max number of instances in Postgres cluster. -1 = no limit
min_instances: -1 min_instances: -1
# min number of instances in Postgres cluster. -1 = no limit # min number of instances in Postgres cluster. -1 = no limit

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

@ -24,7 +24,7 @@ configGeneral:
# etcd connection string for Patroni. Empty uses K8s-native DCS. # etcd connection string for Patroni. Empty uses K8s-native DCS.
etcd_host: "" etcd_host: ""
# Spilo docker image # Spilo docker image
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16 docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
# max number of instances in Postgres cluster. -1 = no limit # max number of instances in Postgres cluster. -1 = no limit
min_instances: "-1" min_instances: "-1"
# min number of instances in Postgres cluster. -1 = no limit # min number of instances in Postgres cluster. -1 = no limit

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

@ -5,7 +5,7 @@ metadata:
# labels: # labels:
# environment: demo # environment: demo
spec: spec:
dockerImage: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16 dockerImage: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
teamId: "acid" teamId: "acid"
volume: volume:
size: 1Gi size: 1Gi

2
manifests/configmap.yaml
View File

@ -19,7 +19,7 @@ data:
# default_cpu_request: 100m # default_cpu_request: 100m
# default_memory_limit: 500Mi # default_memory_limit: 500Mi
# default_memory_request: 100Mi # default_memory_request: 100Mi
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16 docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
# enable_admin_role_for_users: "true" # enable_admin_role_for_users: "true"
# enable_crd_validation: "true" # enable_crd_validation: "true"
# enable_database_access: "true" # enable_database_access: "true"

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

@ -5,7 +5,7 @@ metadata:
configuration: configuration:
# enable_crd_validation: true # enable_crd_validation: true
etcd_host: "" etcd_host: ""
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16 docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
# enable_shm_volume: true # enable_shm_volume: true
max_instances: -1 max_instances: -1
min_instances: -1 min_instances: -1

2
manifests/postgresql.crd.yaml
View File

@ -58,7 +58,7 @@ spec:
s3_secret_access_key: s3_secret_access_key:
type: string type: string
s3_force_path_style: s3_force_path_style:
type: string type: boolean
s3_wal_path: s3_wal_path:
type: string type: string
timestamp: timestamp:

2
pkg/apis/acid.zalan.do/v1/crds.go
View File

@ -160,7 +160,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
Type: "string", Type: "string",
}, },
"s3_force_path_style": { "s3_force_path_style": {
Type: "string", Type: "boolean",
}, },
"s3_wal_path": { "s3_wal_path": {
Type: "string", Type: "string",

2
pkg/util/config/config.go
View File

@ -93,7 +93,7 @@ type Config struct {
WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'
EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16"` DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-12:1.6-p2"`
Sidecars map[string]string `name:"sidecar_docker_images"` Sidecars map[string]string `name:"sidecar_docker_images"`
// default name `operator` enables backward compatibility with the older ServiceAccountName field // default name `operator` enables backward compatibility with the older ServiceAccountName field
PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"` PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"`