Add extra label to Ingress (#108)
This commit is contained in:
parent
50addb76c5
commit
ea0e66760f
3 changed files with 18 additions and 0 deletions
|
@ -11,6 +11,9 @@ metadata:
|
||||||
app.kubernetes.io/name: {{ include "vault.name" . }}
|
app.kubernetes.io/name: {{ include "vault.name" . }}
|
||||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
|
{{- with .Values.server.ingress.labels }}
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
{{- with .Values.server.ingress.annotations }}
|
{{- with .Values.server.ingress.annotations }}
|
||||||
annotations:
|
annotations:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
|
@ -45,3 +45,16 @@ load _helpers
|
||||||
[ "${actual}" = "true" ]
|
[ "${actual}" = "true" ]
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "server/ingress: labels gets added to object" {
|
||||||
|
cd `chart_dir`
|
||||||
|
|
||||||
|
local actual=$(helm template \
|
||||||
|
-x templates/server-ingress.yaml \
|
||||||
|
--set 'server.ingress.enabled=true' \
|
||||||
|
--set 'server.ingress.labels.traffic=external' \
|
||||||
|
--set 'server.ingress.labels.team=dev' \
|
||||||
|
. | tee /dev/stderr |
|
||||||
|
yq -r '.metadata.labels.traffic' | tee /dev/stderr)
|
||||||
|
[ "${actual}" = "external" ]
|
||||||
|
}
|
|
@ -38,6 +38,8 @@ server:
|
||||||
# cluster, very useful if you want to expose the Vault UI
|
# cluster, very useful if you want to expose the Vault UI
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
labels: {}
|
||||||
|
# traffic: external
|
||||||
annotations: {}
|
annotations: {}
|
||||||
# kubernetes.io/ingress.class: nginx
|
# kubernetes.io/ingress.class: nginx
|
||||||
# kubernetes.io/tls-acme: "true"
|
# kubernetes.io/tls-acme: "true"
|
||||||
|
|
Loading…
Reference in a new issue