merge changes from master

This commit is contained in:
Felix Kunde 2019-09-24 17:20:30 +02:00
parent 1355fdcd8d
commit 7256e133cc
1 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@ kind: postgresql
metadata: metadata:
name: acid-test-cluster name: acid-test-cluster
spec: spec:
dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
initContainers: initContainers:
- name: date - name: date
image: busybox image: busybox
@ -35,14 +35,14 @@ spec:
enableShmVolume: true enableShmVolume: true
# spiloFSGroup: 103 # spiloFSGroup: 103
postgresql: postgresql:
version: "10" version: "11"
parameters: parameters:
shared_buffers: "32MB" shared_buffers: "32MB"
max_connections: "10" max_connections: "10"
log_statement: "all" log_statement: "all"
resources: resources:
requests: requests:
cpu: 100m cpu: 10m
memory: 100Mi memory: 100Mi
limits: limits:
cpu: 300m cpu: 300m