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

align spilo versions using a non cdp image

This commit is contained in:
Felix Kunde 2019-05-23 15:36:41 +02:00
parent 7656fdd094
commit 1c69275182
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ podAnnotations: {}
podLabels: {} podLabels: {}
# config shared from ConfigMap and CRD # config shared from ConfigMap and CRD
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p70 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7
repair_period: 5m repair_period: 5m
resync_period: 5m resync_period: 5m
spilo_privileged: false spilo_privileged: false

4
manifests/configmap.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: postgres-operator name: postgres-operator
data: data:
watched_namespace: "*" # listen to all namespaces watched_namespace: "*" # listen to all namespaces
cluster_labels: application:spilo cluster_labels: application:spilo
cluster_name_label: version cluster_name_label: version
@ -10,7 +10,7 @@ data:
debug_logging: "true" debug_logging: "true"
workers: "4" workers: "4"
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p70 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7
pod_service_account_name: "zalando-postgres-operator" pod_service_account_name: "zalando-postgres-operator"
secret_name_template: '{username}.{cluster}.credentials' secret_name_template: '{username}.{cluster}.credentials'
super_username: postgres super_username: postgres

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

@ -4,7 +4,7 @@ metadata:
name: postgresql-operator-default-configuration name: postgresql-operator-default-configuration
configuration: configuration:
etcd_host: "" etcd_host: ""
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p42 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7
workers: 4 workers: 4
min_instances: -1 min_instances: -1
max_instances: -1 max_instances: -1

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

@ -75,7 +75,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-10:1.4-p8"` DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.5-p7"`
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:"operator"` PodServiceAccountName string `name:"pod_service_account_name" default:"operator"`