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

use templated service account also for CRD-configured helm deployment

This commit is contained in:
Felix Kunde 2019-11-28 11:48:59 +01:00
parent 299f4f738f
commit b5b0872b65
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator/templates/operatorconfiguration.yaml
View File

@ -14,7 +14,7 @@ configuration:
{{ toYaml .Values.configUsers | indent 4 }} {{ toYaml .Values.configUsers | indent 4 }}
kubernetes: kubernetes:
oauth_token_secret_name: {{ template "postgres-operator.fullname" . }} oauth_token_secret_name: {{ template "postgres-operator.fullname" . }}
pod_service_account_name: operator pod_service_account_name: {{ include "postgres-operator.serviceAccountName" . }}
{{ toYaml .Values.configKubernetes | indent 4 }} {{ toYaml .Values.configKubernetes | indent 4 }}
postgres_pod_resources: postgres_pod_resources:
{{ toYaml .Values.configPostgresPodResources | indent 4 }} {{ toYaml .Values.configPostgresPodResources | indent 4 }}

4
charts/postgres-operator/values-crd.yaml
View File

@ -264,9 +264,7 @@ serviceAccount:
create: true create: true
# The name of the ServiceAccount to use. # The name of the ServiceAccount to use.
# If not set and create is true, a name is generated using the fullname template # If not set and create is true, a name is generated using the fullname template
# When relying solely on the OperatorConfiguration CRD, this value has to be "operator" name:
# Otherwise, the operator tries to use the "default" service account which is forbidden
name: operator
priorityClassName: "" priorityClassName: ""

9
docs/reference/operator_parameters.md
View File

@ -30,18 +30,19 @@ configuration.
To test the CRD-based configuration locally, use the following To test the CRD-based configuration locally, use the following
```bash ```bash
kubectl create -f manifests/operatorconfiguration.crd.yaml # registers the CRD kubectl create -f manifests/operatorconfiguration.crd.yaml # registers the CRD
kubectl create -f manifests/postgresql-operator-default-configuration.yaml
kubectl create -f manifests/operator-service-account-rbac.yaml kubectl create -f manifests/operator-service-account-rbac.yaml
kubectl create -f manifests/postgres-operator.yaml # set the env var as mentioned above kubectl create -f manifests/postgres-operator.yaml # set the env var as mentioned above
kubectl create -f manifests/postgresql-operator-default-configuration.yaml
kubectl get operatorconfigurations postgresql-operator-default-configuration -o yaml kubectl get operatorconfigurations postgresql-operator-default-configuration -o yaml
``` ```
The CRD-based configuration is more powerful than the one based on ConfigMaps The CRD-based configuration is more powerful than the one based on ConfigMaps
and should be used unless there is a compatibility requirement to use an already and should be used unless there is a compatibility requirement to use an already
existing configuration. Even in that case, it should be rather straightforward existing configuration. Even in that case, it should be rather straightforward
to convert the configmap based configuration into the CRD-based one and restart to convert the ConfigMap-based configuration into the CRD-based one and restart
the operator. The ConfigMaps-based configuration will be deprecated and the operator. The ConfigMap-based configuration will be deprecated and
subsequently removed in future releases. subsequently removed in future releases.
Note that for the CRD-based configuration groups of configuration options below Note that for the CRD-based configuration groups of configuration options below