Skip to content

feat(cluster): add option to specify shared service account #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maciej-tatarski wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(cluster): add option to specify shared service account #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/cluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ description: Deploys and manages a CloudNativePG cluster and its associated reso
kubeVersion: ">=1.29.0-0"
icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
type: application
version: 0.6.0
version: 0.6.1
sources:
- https://github.com/cloudnative-pg/charts
keywords:
Expand Down
1 change: 1 addition & 0 deletions charts/cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ Kubernetes: `>=1.29.0-0`
| cluster.roles | list | `[]` | This feature enables declarative management of existing roles, as well as the creation of new roles if they are not already present in the database. See: https://cloudnative-pg.io/documentation/current/declarative_role_management/ |
| cluster.securityContext | object | `{}` | Configure Container Security Context. See: https://cloudnative-pg.io/documentation/preview/security/ |
| cluster.serviceAccountTemplate | object | `{}` | Configure the metadata of the generated service account |
| cluster.serviceAccountName | string | `""` | Name of the service account to use for the cluster. If not set, a new service account will be created using the template. |
| cluster.services | object | `{}` | Customization of service definitions. Please refer to https://cloudnative-pg.io/documentation/current/service_management/ |
| cluster.storage.size | string | `"8Gi"` | |
| cluster.storage.storageClass | string | `""` | |
Expand Down
6 changes: 6 additions & 0 deletions charts/cluster/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,16 @@ spec:
{{ end }}
{{- end }}

{{- if not .Values.cluster.serviceAccountName }}
{{- with .Values.cluster.serviceAccountTemplate }}
serviceAccountTemplate:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}

{{- if .Values.cluster.serviceAccountName }}
serviceAccountName: {{ .Values.cluster.serviceAccountName }}
{{- end }}

{{- with .Values.cluster.podSecurityContext }}
podSecurityContext:
Expand Down
5 changes: 1 addition & 4 deletions ...er/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,7 @@ spec:
test-annotation: "true"
spec:
type: LoadBalancer
serviceAccountTemplate:
metadata:
annotations:
my-annotation: my-service-account
serviceAccountName: my-custom-service-account
podSecurityContext:
runAsUser: 26
runAsGroup: 26
Expand Down
1 change: 1 addition & 0 deletions ...s/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ cluster:
metadata:
annotations:
my-annotation: my-service-account
serviceAccountName: my-custom-service-account
podSecurityContext:
runAsUser: 26
runAsGroup: 26
Expand Down
3 changes: 3 additions & 0 deletions charts/cluster/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@
"serviceAccountTemplate": {
"type": "object"
},
"serviceAccountName": {
"type": "string"
},
"services": {
"type": "object"
},
Expand Down
3 changes: 3 additions & 0 deletions charts/cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,9 @@ cluster:
# -- Configure the metadata of the generated service account
serviceAccountTemplate: {}

# -- Configure the name serviceAccount to use for the cluster. If specified, it takes precedence over serviceAccountTemplate.name
serviceAccountName: ""

# -- Configure the Pod Security Context.
# See: https://cloudnative-pg.io/documentation/preview/security/
podSecurityContext: {}
Expand Down