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

Allow for setting custom annotations of ServiceAccounts #83

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Allow for setting custom annotations of ServiceAccounts #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6d88aa
Allow for setting custom annotations of ServiceAccounts
lukipro Nov 3, 2022
8624e49
Update README.me
lukipro Nov 4, 2022
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: 2 additions & 0 deletions stable/akv2k8s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ kubectl apply -f https://raw.githubusercontent.com/SparebankenVest/azure-key-vau
| controller.keyVaultAuth | string | `nil` | Override global - azureCloudConfig (aks credentials), environment (custom) |
| controller.serviceAccount.create | bool | `true` | Create service account for controller |
| controller.serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template |
| controller.serviceAccount.annotations | object | `{}` | Additional service account annotations |
| controller.podSecurityContext | string | `nil` | Security context set on a pod level |
| controller.priorityClassName | string | `""` | Controller PriorityClass name |
| controller.securityContext.allowPrivilegeEscalation | bool | `true` | Must be `true` if using aks identity - can be set to false if userDefinedMSI is enabled |
Expand Down Expand Up @@ -138,6 +139,7 @@ kubectl apply -f https://raw.githubusercontent.com/SparebankenVest/azure-key-vau
| env_injector.metrics.serviceMonitor.additionalLabels | object | `nil` | Override global.metrics.serviceMonitor.additionalLabels |
| env_injector.serviceAccount.create | bool | `true` | Create service account for env-injector |
| env_injector.serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template |
| env_injector.serviceAccount.annotations | object | `{}` | Additional service account annotations |
| env_injector.env | object | `{}` | Additional env vars to send to env-injector pods |
| env_injector.envFromSecret | list | `[]` | Reference to secret containing variables to be used with all enabled pods, eg. for akv credentials |
| env_injector.labels | object | `{}` | Additional labels |
Expand Down
4 changes: 4 additions & 0 deletions stable/akv2k8s/templates/controller-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ metadata:
name: {{ template "controller.serviceAccountName" . }}
labels:
{{- include "akv2k8s.labels" . | nindent 4 }}
{{- if .Values.controller.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.controller.serviceAccount.annotations | nindent 4 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions stable/akv2k8s/templates/env-injector-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ metadata:
name: {{ template "envinjector.serviceAccountName" . }}
labels:
{{- include "akv2k8s.labels" . | nindent 4 }}
{{- if .Values.env_injector.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.env_injector.serviceAccount.annotations | nindent 4 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions stable/akv2k8s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ controller:
# -- The name of the ServiceAccount to use.
# If not set and create is true, a name is generated using the fullname template
name:
# -- Controller service account annotations
annotations: {}

# -- Security context set on a pod level
podSecurityContext:
Expand Down Expand Up @@ -268,6 +270,8 @@ env_injector:
# -- The name of the ServiceAccount to use.
# If not set and create is true, a name is generated using the fullname template
name:
# -- env-injector service account annotations
annotations: {}

# -- Additional env vars to send to env-injector pods
env: {}
Expand Down