Applied Quentins changes

Author: BStarmerSmith

charts/gateway/README.md

@@ -113,18 +113,18 @@ This section specifies external service configuration
 | `service.external.type`        | Type of load balancer                               | `ClusterIP` |
 | `service.external.ip`          | IP to configure                                     | `""`        |
 | `service.external.annotations` |                                                     | `{}`        |
-| `service.external.labels`      |                                                     | `{}`        |
+| `service.external.labels`      | Labels to be added to Gateway internal service      | `{}`        |
 | `service.external.admin`       | Enable admin exposition on external service         | `false`     |
 | `service.external.jmx`         | Enable jmx exposition on external service           | `false`     |
 
 ### Conduktor-gateway internal service configurations
 
 This section specify internal service configuration
 
-| Name                           | Description | Value |
-| ------------------------------ | ----------- | ----- |
-| `service.internal.annotations` |             | `{}`  |
-| `service.internal.labels`      |             | `{}`  |
+| Name                           | Description                                    | Value |
+| ------------------------------ | ---------------------------------------------- | ----- |
+| `service.internal.annotations` |                                                | `{}`  |
+| `service.internal.labels`      | Labels to be added to Gateway internal service | `{}`  |
 
 ### Gateway ingress configurations
 

charts/gateway/templates/service-external.yaml

@@ -5,23 +5,20 @@ metadata:
   name:  {{ include "conduktor-gateway.externalServiceName" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{ include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: conduktor-platform
-    {{- if .Values.service.external.labels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.service.external.labels "context" $) | nindent 4 }}
+    app.kubernetes.io/component: conduktor-gateway
+    {{- with .Values.service.external.labels }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 4 }}
     {{- end }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.metrics.prometheus.enable }}
-    metrics.conduktor.io/prometheus: {{ .Values.metrics.prometheus.enable | quote }}
+    {{- with .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
     {{- end }}
   {{- if or .Values.service.external.annotations .Values.commonAnnotations }}
   annotations:
-    {{- if .Values.service.external.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.service.external.annotations "context" $) | nindent 4 }}
+    {{- with .Values.service.external.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 4 }}
     {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- with .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
     {{- end }}
   {{- end }}
 spec:

charts/gateway/templates/service-internal.yaml

@@ -4,23 +4,20 @@ metadata:
   name:  {{ include "conduktor-gateway.internalServiceName" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{ include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: conduktor-platform
-    {{- if .Values.service.internal.labels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.service.internal.labels "context" $) | nindent 4 }}
+    app.kubernetes.io/component: conduktor-gateway
+    {{- with .Values.service.internal.labels }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 4 }}
     {{- end }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.metrics.prometheus.enable }}
-    metrics.conduktor.io/prometheus: {{ .Values.metrics.prometheus.enable | quote }}
+    {{- with .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
     {{- end }}
   {{- if or .Values.service.internal.annotations .Values.commonAnnotations }}
   annotations:
-    {{- if .Values.service.internal.annotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.service.internal.annotations "context" $) | nindent 4 }}
+    {{- with .Values.service.internal.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 4 }}
     {{- end }}
-    {{- if .Values.commonAnnotations }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- with .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
     {{- end }}
   {{- end }}
 spec:

charts/gateway/values.yaml

@@ -202,7 +202,7 @@ service:
     ip: ""
     ## @param service.external.annotations
     annotations: {}
-    ## @param service.external.labels
+    ## @param service.external.labels Labels to be added to Gateway internal service
     labels: {}
     # LoadBalancer externaldns gke support by annotation https://github.com/kubernetes-sigs/external-dns/blob/master/docs/tutorials/gke.md#verify-using-an-external-load-balancer
     # external-dns.alpha.kubernetes.io/hostname: "{{ required "A valid .Values.gateway.domain is required!" .Values.gateway.domain }}"
@@ -217,7 +217,7 @@ service:
   internal:
     ## @param service.internal.annotations
     annotations: {}
-    ## @param service.internal.labels
+    ## @param service.internal.labels Labels to be added to Gateway internal service
     labels: {}
 
 ## @section Gateway ingress configurations