From ea0e66760f6c1ffeef013984245b28c15f6d3d5e Mon Sep 17 00:00:00 2001
From: Sergii <sergii.iurchenko@intapp.com>
Date: Thu, 7 Nov 2019 18:23:56 +0200
Subject: [PATCH] Add extra label to Ingress (#108)

---
 templates/server-ingress.yaml |  3 +++
 test/unit/server-ingress.bats | 13 +++++++++++++
 values.yaml                   |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/templates/server-ingress.yaml b/templates/server-ingress.yaml
index 1796f03..0402eab 100644
--- a/templates/server-ingress.yaml
+++ b/templates/server-ingress.yaml
@@ -11,6 +11,9 @@ metadata:
     app.kubernetes.io/name: {{ include "vault.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.server.ingress.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.server.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/test/unit/server-ingress.bats b/test/unit/server-ingress.bats
index 26594c6..b0950ca 100644
--- a/test/unit/server-ingress.bats
+++ b/test/unit/server-ingress.bats
@@ -45,3 +45,16 @@ load _helpers
   [ "${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" ]
+}
\ No newline at end of file
diff --git a/values.yaml b/values.yaml
index ebd41f3..9d35d72 100644
--- a/values.yaml
+++ b/values.yaml
@@ -38,6 +38,8 @@ server:
   # cluster, very useful if you want to expose the Vault UI
   ingress:
     enabled: false
+    labels: {}
+      # traffic: external
     annotations: {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"