From ed7149615ed338e82aa136c37b47e7087da3f6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20B=C5=82aszczyk?= <daemonsthere@gmail.com>
Date: Wed, 8 Dec 2021 13:23:41 +0100
Subject: [PATCH] feat: add extraLabels to keto (#381)

---
 .circleci/values/keto.yaml                 |  4 +++-
 helm/charts/keto/templates/deployment.yaml |  6 ++++++
 helm/charts/keto/values.yaml               | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.circleci/values/keto.yaml b/.circleci/values/keto.yaml
index 6d667d1c29..3f868782e1 100644
--- a/.circleci/values/keto.yaml
+++ b/.circleci/values/keto.yaml
@@ -7,4 +7,6 @@ ingress:
   read:
     enabled: true
   write:
-    enabled: true
\ No newline at end of file
+    enabled: true
+extraLabels:
+  ory.sh/test: keto
\ No newline at end of file
diff --git a/helm/charts/keto/templates/deployment.yaml b/helm/charts/keto/templates/deployment.yaml
index b9e9da9e31..318535c79e 100644
--- a/helm/charts/keto/templates/deployment.yaml
+++ b/helm/charts/keto/templates/deployment.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ include "keto.fullname" . }}
   labels:
     {{- include "keto.labels" . | nindent 4 }}
+    {{- with .Values.extraLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
 {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
@@ -19,6 +22,9 @@ spec:
     {{- end }}
       labels:
         {{- include "keto.selectorLabels" . | nindent 8 }}
+        {{- with .Values.extraLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/charts/keto/values.yaml b/helm/charts/keto/values.yaml
index fee31be230..b06591b66f 100644
--- a/helm/charts/keto/values.yaml
+++ b/helm/charts/keto/values.yaml
@@ -142,17 +142,27 @@ autoscaling:
 
 nodeSelector: {}
 
+# -- Array of extra Envs to be added to the deployment. K8s format expected
+# - name: FOO
+#   value: BAR
 extraEnv: []
 
-extraVolumes: []
+# -- Array of extra Volumes to be added to the deployment. K8s format expected
 # - name: my-volume
 #   secret:
 #     secretName: my-secret
+extraVolumes: []
 
-extraVolumeMounts: []
+# -- Array of extra VolumeMounts to be added to the deployment. K8s format expected
 # - name: my-volume
 #   mountPath: /etc/secrets/my-secret
 #   readOnly: true
+extraVolumeMounts: []
+
+# -- Extra labels to be added to the deployment, and pods. K8s object format expected
+# foo: bar
+# my.special.label/type: value
+extraLabels: {}
 
 # -- Configuration for tracing providers. Only datadog is currently supported through this block.
 # If you need to use a different tracing provider, please manually set the configuration values