Merge branch 'master' into pooler-deployment-label-selector-test
This commit is contained in:
		
						commit
						7ee360ba4a
					
				| 
						 | 
					@ -21,6 +21,10 @@ spec:
 | 
				
			||||||
        team: "acid" # Parameterize?
 | 
					        team: "acid" # Parameterize?
 | 
				
			||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
      serviceAccountName: {{ include "postgres-operator-ui.serviceAccountName" . }}
 | 
					      serviceAccountName: {{ include "postgres-operator-ui.serviceAccountName" . }}
 | 
				
			||||||
 | 
					      {{- if .Values.imagePullSecrets }}
 | 
				
			||||||
 | 
					      imagePullSecrets:
 | 
				
			||||||
 | 
					      {{ toYaml .Values.imagePullSecrets | indent 8 }}
 | 
				
			||||||
 | 
					      {{- end }}
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: "service"
 | 
					        - name: "service"
 | 
				
			||||||
          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
 | 
					          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,6 +11,12 @@ image:
 | 
				
			||||||
  tag: v1.5.0-dirty
 | 
					  tag: v1.5.0-dirty
 | 
				
			||||||
  pullPolicy: "IfNotPresent"
 | 
					  pullPolicy: "IfNotPresent"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Optionally specify an array of imagePullSecrets.
 | 
				
			||||||
 | 
					# Secrets must be manually created in the namespace.
 | 
				
			||||||
 | 
					# ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
 | 
				
			||||||
 | 
					# imagePullSecrets:
 | 
				
			||||||
 | 
					#   - name: 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rbac:
 | 
					rbac:
 | 
				
			||||||
  # Specifies whether RBAC resources should be created
 | 
					  # Specifies whether RBAC resources should be created
 | 
				
			||||||
  create: true
 | 
					  create: true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue