merge changes from master
This commit is contained in:
		
							parent
							
								
									1355fdcd8d
								
							
						
					
					
						commit
						7256e133cc
					
				| 
						 | 
				
			
			@ -3,7 +3,7 @@ kind: postgresql
 | 
			
		|||
metadata:
 | 
			
		||||
  name: acid-test-cluster
 | 
			
		||||
spec:
 | 
			
		||||
  dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
 | 
			
		||||
  dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
 | 
			
		||||
  initContainers:
 | 
			
		||||
  - name: date
 | 
			
		||||
    image: busybox
 | 
			
		||||
| 
						 | 
				
			
			@ -35,14 +35,14 @@ spec:
 | 
			
		|||
  enableShmVolume: true
 | 
			
		||||
# spiloFSGroup: 103
 | 
			
		||||
  postgresql:
 | 
			
		||||
    version: "10"
 | 
			
		||||
    version: "11"
 | 
			
		||||
    parameters:
 | 
			
		||||
      shared_buffers: "32MB"
 | 
			
		||||
      max_connections: "10"
 | 
			
		||||
      log_statement: "all"
 | 
			
		||||
  resources:
 | 
			
		||||
    requests:
 | 
			
		||||
      cpu: 100m
 | 
			
		||||
      cpu: 10m
 | 
			
		||||
      memory: 100Mi
 | 
			
		||||
    limits:
 | 
			
		||||
      cpu: 300m
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue