Skip to content
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

feat(helm): allow to define service accounts annotations #7724

Merged
merged 2 commits into from
Sep 14, 2023
Merged

feat(helm): allow to define service accounts annotations #7724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221f0eb
feat(helm): allow to define service accounts annotations
lukidzi Sep 8, 2023
1287c23
feat(helm): added test
lukidzi Sep 11, 2023
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
3 changes: 3 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ controlPlane:
# -- If true, TLS cert of the server is not verified.
skipVerify: false

# -- Annotations to add for Control Plane's Service Account
serviceAccountAnnotations: { }

image:
# -- Kuma CP ImagePullPolicy
pullPolicy: IfNotPresent
Expand Down
1 change: 1 addition & 0 deletions deployments/charts/kuma/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ A Helm chart for the Kuma Control Plane
| controlPlane.tls.kdsZoneClient.create | bool | `false` | Whether to create the TLS secret in helm. |
| controlPlane.tls.kdsZoneClient.cert | string | `""` | CA bundle that was used to sign the certificate of KDS Global Server. |
| controlPlane.tls.kdsZoneClient.skipVerify | bool | `false` | If true, TLS cert of the server is not verified. |
| controlPlane.serviceAccountAnnotations | object | `{}` | Annotations to add for Control Plane's Service Account |
| controlPlane.image.pullPolicy | string | `"IfNotPresent"` | Kuma CP ImagePullPolicy |
| controlPlane.image.repository | string | `"kuma-cp"` | Kuma CP image repository |
| controlPlane.image.tag | string | `nil` | Kuma CP Image tag. When not specified, the value is copied from global.tag |
Expand Down
4 changes: 4 additions & 0 deletions deployments/charts/kuma/templates/cp-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ metadata:
name: {{ include "kuma.name" . }}-control-plane
namespace: {{ .Release.Namespace }}
labels: {{ include "kuma.cpLabels" . | nindent 4 }}
{{- with .Values.controlPlane.serviceAccountAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- range . }}
Expand Down
3 changes: 3 additions & 0 deletions deployments/charts/kuma/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ controlPlane:
# -- If true, TLS cert of the server is not verified.
skipVerify: false

# -- Annotations to add for Control Plane's Service Account
serviceAccountAnnotations: { }

image:
# -- Kuma CP ImagePullPolicy
pullPolicy: IfNotPresent
Expand Down
3 changes: 3 additions & 0 deletions docs/generated/raw/helm-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ controlPlane:
# -- If true, TLS cert of the server is not verified.
skipVerify: false

# -- Annotations to add for Control Plane's Service Account
serviceAccountAnnotations: { }

image:
# -- Kuma CP ImagePullPolicy
pullPolicy: IfNotPresent
Expand Down