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

minor fixes

This commit is contained in:
Felix Kunde 2019-07-05 19:04:23 +02:00
parent b9bc1786a8
commit 842126447c
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/cluster_manifest.md
View File

@ -108,7 +108,7 @@ These parameters are grouped directly under the `spec` key in the manifest.
for details on tolerations and possible values of those keys. When set, this for details on tolerations and possible values of those keys. When set, this
value overrides the `pod_toleration` setting from the operator. Optional. value overrides the `pod_toleration` setting from the operator. Optional.
* **pod_priority_class_name** * **podPriorityClassName**
a name of the [priority a name of the [priority
class](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass) class](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass)
that should be assigned to the cluster pods. When not specified, the value that should be assigned to the cluster pods. When not specified, the value

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

@ -5,21 +5,15 @@ metadata:
configuration: configuration:
etcd_host: "" etcd_host: ""
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
# enable_shm_volume: true
max_instances: -1 max_instances: -1
min_instances: -1 min_instances: -1
resync_period: 30m resync_period: 30m
repair_period: 5m repair_period: 5m
<<<<<<< HEAD
# set_memory_request_to_limit: false # set_memory_request_to_limit: false
# sidecar_docker_images: # sidecar_docker_images:
# example: "exampleimage:exampletag" # example: "exampleimage:exampletag"
workers: 4 workers: 4
=======
# enable_shm_volume: true
#sidecar_docker_images:
# example: "exampleimage:exampletag"
>>>>>>> master
users: users:
replication_username: standby replication_username: standby
super_username: postgres super_username: postgres

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

@ -60,7 +60,7 @@ type PostgresSpec struct {
LogicalBackupSchedule string `json:"logicalBackupSchedule,omitempty"` LogicalBackupSchedule string `json:"logicalBackupSchedule,omitempty"`
StandbyCluster *StandbyDescription `json:"standby"` StandbyCluster *StandbyDescription `json:"standby"`
// deprectaed json tags // deprecated json tags
InitContainersOld []v1.Container `json:"init_containers,omitempty"` InitContainersOld []v1.Container `json:"init_containers,omitempty"`
PodPriorityClassNameOld string `json:"pod_priority_class_name,omitempty"` PodPriorityClassNameOld string `json:"pod_priority_class_name,omitempty"`
} }