Merge 069decc421 into 1af4c50ed0
				
					
				
			This commit is contained in:
		
						commit
						dfdbf18a24
					
				|  | @ -1,7 +1,7 @@ | ||||||
| apiVersion: kustomize.config.k8s.io/v1beta1 | apiVersion: kustomize.config.k8s.io/v1beta1 | ||||||
| kind: Kustomization | kind: Kustomization | ||||||
| resources: | resources: | ||||||
| - configmap.yaml | - postgresql-operator-default-configuration.yaml | ||||||
| - operator-service-account-rbac.yaml | - operator-service-account-rbac.yaml | ||||||
| - postgres-operator.yaml | - postgres-operator.yaml | ||||||
| - api-service.yaml | - api-service.yaml | ||||||
|  |  | ||||||
|  | @ -35,11 +35,11 @@ spec: | ||||||
|           allowPrivilegeEscalation: false |           allowPrivilegeEscalation: false | ||||||
|         env: |         env: | ||||||
|         # provided additional ENV vars can overwrite individual config map entries |         # provided additional ENV vars can overwrite individual config map entries | ||||||
|         - name: CONFIG_MAP_NAME |         - name: POSTGRES_OPERATOR_CONFIGURATION_OBJECT | ||||||
|           value: "postgres-operator" |           value: postgresql-operator-default-configuration | ||||||
|         # In order to use the CRD OperatorConfiguration instead, uncomment these lines and comment out the two lines above |         # In order to use the ConfigMap instead, uncomment these lines and comment out the two lines above | ||||||
|         # - name: POSTGRES_OPERATOR_CONFIGURATION_OBJECT |         # - name: CONFIG_MAP_NAME | ||||||
|         #  value: postgresql-operator-default-configuration |         #   value: "postgres-operator" | ||||||
|         # Define an ID to isolate controllers from each other |         # Define an ID to isolate controllers from each other | ||||||
|         # - name: CONTROLLER_ID |         # - name: CONTROLLER_ID | ||||||
|         #   value: "second-operator" |         #   value: "second-operator" | ||||||
|  |  | ||||||
|  | @ -100,7 +100,7 @@ configuration: | ||||||
|     # pod_priority_class_name: "postgres-pod-priority" |     # pod_priority_class_name: "postgres-pod-priority" | ||||||
|     pod_role_label: spilo-role |     pod_role_label: spilo-role | ||||||
|     # pod_service_account_definition: "" |     # pod_service_account_definition: "" | ||||||
|     pod_service_account_name: postgres-pod |     pod_service_account_name: zalando-postgres-operator | ||||||
|     # pod_service_account_role_binding_definition: "" |     # pod_service_account_role_binding_definition: "" | ||||||
|     pod_terminate_grace_period: 5m |     pod_terminate_grace_period: 5m | ||||||
|     secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" |     secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue