Made all gateway resources use conduktor-gateway.labels

Author: BStarmerSmith

charts/gateway/templates/deployment.yaml

@@ -2,10 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "conduktor-gateway.fullname" . }}
-  labels: {{- include "conduktor-gateway.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
+  labels: {{ include "conduktor-gateway.labels" . | nindent 4 }}
   annotations:
     {{- with .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
@@ -34,9 +31,6 @@ spec:
         {{- with .Values.gateway.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
         {{- end }}
-        {{- with .Values.commonLabels }}
-        {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 8 }}
-        {{- end }}
     spec:
       containers:
         - name: gateway

charts/gateway/templates/ingress.yaml

@@ -5,9 +5,6 @@ metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "conduktor-gateway.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
   {{- if or .Values.ingress.annotations .Values.commonAnnotations }}
   annotations:
     {{- if .Values.ingress.annotations }}

charts/gateway/templates/service-external.yaml

@@ -4,14 +4,11 @@ kind: Service
 metadata:
   name:  {{ include "conduktor-gateway.externalServiceName" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{ include "common.labels.standard" . | nindent 4 }}
+  labels: {{ include "conduktor-gateway.labels" . | nindent 4 }}
     app.kubernetes.io/component: conduktor-gateway
     {{- with .Values.service.external.labels }}
     {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 4 }}
     {{- end }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
   {{- if or .Values.service.external.annotations .Values.commonAnnotations }}
   annotations:
     {{- with .Values.service.external.annotations }}

charts/gateway/templates/service-internal.yaml

@@ -8,9 +8,6 @@ metadata:
     {{- with .Values.service.internal.labels }}
     {{- include "common.tplvalues.render" ( dict "value" . "context" $) | nindent 4 }}
     {{- end }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
     {{- if .Values.metrics.prometheus.enable }}
     metrics.conduktor.io/prometheus: {{ .Values.metrics.prometheus.enable | quote }}
     {{- end }}

charts/gateway/templates/serviceaccount.yaml

@@ -5,9 +5,6 @@ metadata:
   name: {{ template "conduktor-gateway.serviceAccountName" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{ include "conduktor-gateway.labels" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
   {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }}
   annotations:
     {{- if .Values.commonAnnotations }}