add ability to set pod annotations for injector (#394)
* add ability to set pod annotations for injector * add missing unit tests
This commit is contained in:
parent
54f58b9c01
commit
1968526f0d
4 changed files with 53 additions and 0 deletions
|
@ -282,6 +282,21 @@ Sets extra pod annotations
|
|||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Sets extra injector pod annotations
|
||||
*/}}
|
||||
{{- define "injector.annotations" -}}
|
||||
{{- if .Values.injector.annotations }}
|
||||
annotations:
|
||||
{{- $tp := typeOf .Values.injector.annotations }}
|
||||
{{- if eq $tp "string" }}
|
||||
{{- tpl .Values.injector.annotations . | nindent 8 }}
|
||||
{{- else }}
|
||||
{{- toYaml .Values.injector.annotations | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Sets extra ui service annotations
|
||||
*/}}
|
||||
|
|
|
@ -23,6 +23,7 @@ spec:
|
|||
app.kubernetes.io/name: {{ template "vault.name" . }}-agent-injector
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
component: webhook
|
||||
{{ template "injector.annotations" . }}
|
||||
spec:
|
||||
{{ template "injector.affinity" . }}
|
||||
{{ template "injector.tolerations" . }}
|
||||
|
|
|
@ -390,6 +390,38 @@ load _helpers
|
|||
[ "${actual}" = "sanitized" ]
|
||||
}
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# extra annotations
|
||||
|
||||
@test "injector/deployment: default annotations" {
|
||||
cd `chart_dir`
|
||||
local actual=$(helm template \
|
||||
--show-only templates/injector-deployment.yaml \
|
||||
. | tee /dev/stderr |
|
||||
yq -r '.spec.template.metadata.annotations' | tee /dev/stderr)
|
||||
[ "${actual}" = "null" ]
|
||||
}
|
||||
|
||||
@test "injector/deployment: specify annotations yaml" {
|
||||
cd `chart_dir`
|
||||
local actual=$(helm template \
|
||||
--show-only templates/injector-deployment.yaml \
|
||||
--set 'injector.annotations.foo=bar' \
|
||||
. | tee /dev/stderr |
|
||||
yq -r '.spec.template.metadata.annotations.foo' | tee /dev/stderr)
|
||||
[ "${actual}" = "bar" ]
|
||||
}
|
||||
|
||||
@test "injector/deployment: specify annotations yaml string" {
|
||||
cd `chart_dir`
|
||||
local actual=$(helm template \
|
||||
--show-only templates/injector-deployment.yaml \
|
||||
--set 'injector.annotations=foo: bar' \
|
||||
. | tee /dev/stderr |
|
||||
yq -r '.spec.template.metadata.annotations.foo' | tee /dev/stderr)
|
||||
[ "${actual}" = "bar" ]
|
||||
}
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# affinity
|
||||
|
||||
|
|
|
@ -122,6 +122,11 @@ injector:
|
|||
# Priority class for injector pods
|
||||
priorityClassName: ""
|
||||
|
||||
# Extra annotations to attach to the injector pods
|
||||
# This can either be YAML or a YAML-formatted multi-line templated string map
|
||||
# of the annotations to apply to the injector pods
|
||||
annotations: {}
|
||||
|
||||
server:
|
||||
# Resource requests, limits, etc. for the server cluster placement. This
|
||||
# should map directly to the value of the resources field for a PodSpec.
|
||||
|
|
Loading…
Reference in a new issue