feat: set service label from values (#233)

This change was necessary because in order for kiali to draw the graph correctly, both the deployment label and the service label need to be labeled with the same app.
ory · Mar 22, 2021 · 8ba1052 · 8ba1052
1 parent 46320a8
commit 8ba1052
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 0 deletions.
diff --git a/helm/charts/hydra/templates/service-admin.yaml b/helm/charts/hydra/templates/service-admin.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "hydra.labels" . | indent 4 }}
+    {{- with .Values.service.admin.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.service.admin.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/helm/charts/hydra/templates/service-public.yaml b/helm/charts/hydra/templates/service-public.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "hydra.labels" . | indent 4 }}
+    {{- with .Values.service.public.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.service.public.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/helm/charts/hydra/values.yaml b/helm/charts/hydra/values.yaml
@@ -35,6 +35,10 @@ service:
     annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    labels: {}
+    #      If you do want to specify additional labels, uncomment the following
+    #      lines, adjust them as necessary, and remove the curly braces after 'labels:'.
+    #      e.g.  app: hydra
   # Configures the Kubernetes service for the api port.
   admin:
     # En-/disable the service
@@ -48,6 +52,10 @@ service:
     annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    labels: {}
+    #      If you do want to specify additional labels, uncomment the following
+    #      lines, adjust them as necessary, and remove the curly braces after 'labels:'.
+    #      e.g.  app: hydra
 
 # Configure ingress
 ingress:

diff --git a/helm/charts/oathkeeper/templates/service-api.yaml b/helm/charts/oathkeeper/templates/service-api.yaml
@@ -8,6 +8,9 @@ metadata:
   {{- end }}
   labels:
 {{ include "oathkeeper.labels" . | indent 4 }}
+    {{- with .Values.service.api.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.service.api.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/helm/charts/oathkeeper/templates/service-proxy.yaml b/helm/charts/oathkeeper/templates/service-proxy.yaml
@@ -8,6 +8,9 @@ metadata:
   {{- end }}
   labels:
 {{ include "oathkeeper.labels" . | indent 4 }}
+    {{- with .Values.service.proxy.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.service.proxy.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/helm/charts/oathkeeper/values.yaml b/helm/charts/oathkeeper/values.yaml
@@ -50,6 +50,11 @@ service:
     annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    labels: {}
+    #      If you do want to specify additional labels, uncomment the following
+    #      lines, adjust them as necessary, and remove the curly braces after 'labels:'.
+    #      e.g.  app: oathkeeper
+
   # Configures the Kubernetes service for the api port.
   api:
     # En-/disable the service
@@ -63,6 +68,10 @@ service:
     annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+    labels: {}
+    #      If you do want to specify additional labels, uncomment the following
+    #      lines, adjust them as necessary, and remove the curly braces after 'labels:'.
+    #      e.g.  app: oathkeeper
 
 # Configure ingress
 ingress: