Merge pull request #8 from krancour/charts-fixes

chart: remove duplicate labels and fix selectors
brigadecore · Sep 1, 2021 · 34190f3 · 34190f3
2 parents ab1871d + 66f5cf0
commit 34190f3
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 8 deletions.
diff --git a/charts/brigade-cloudevents-gateway/templates/cert-secret.yaml b/charts/brigade-cloudevents-gateway/templates/cert-secret.yaml
@@ -5,7 +5,6 @@ metadata:
   name: {{ include "gateway.fullname" . }}-cert
   labels:
     {{- include "gateway.labels" . | nindent 4 }}
-    {{- include "gateway.labels" . | nindent 4 }}
 type: Opaque
 data:
   {{- if .Values.tls.generateSelfSignedCert }}

diff --git a/charts/brigade-cloudevents-gateway/templates/config-secret.yaml b/charts/brigade-cloudevents-gateway/templates/config-secret.yaml
@@ -4,7 +4,6 @@ metadata:
   name: {{ include "gateway.fullname" . }}-config
   labels:
     {{- include "gateway.labels" . | nindent 4 }}
-    {{- include "gateway.labels" . | nindent 4 }}
 type: Opaque
 stringData:
   source-tokens.json: |

diff --git a/charts/brigade-cloudevents-gateway/templates/deployment.yaml b/charts/brigade-cloudevents-gateway/templates/deployment.yaml
@@ -4,18 +4,15 @@ metadata:
   name: {{ include "gateway.fullname" . }}
   labels:
     {{- include "gateway.labels" . | nindent 4 }}
-    {{- include "gateway.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
       {{- include "gateway.selectorLabels" . | nindent 6 }}
-      {{- include "gateway.labels" . | nindent 6 }}
   template:
     metadata:
       labels:
         {{- include "gateway.selectorLabels" . | nindent 8 }}
-        {{- include "gateway.labels" . | nindent 8 }}
       annotations:
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         checksum/config-secret: {{ include (print $.Template.BasePath "/config-secret.yaml") . | sha256sum }}

diff --git a/charts/brigade-cloudevents-gateway/templates/ingress-cert-secret.yaml b/charts/brigade-cloudevents-gateway/templates/ingress-cert-secret.yaml
@@ -5,7 +5,6 @@ metadata:
   name: {{ include "gateway.fullname" . }}-ingress-cert
   labels:
     {{- include "gateway.labels" . | nindent 4 }}
-    {{- include "gateway.labels" . | nindent 4 }}
 type: Opaque
 data:
   {{- if .Values.ingress.tls.generateSelfSignedCert }}

diff --git a/charts/brigade-cloudevents-gateway/templates/ingress.yaml b/charts/brigade-cloudevents-gateway/templates/ingress.yaml
@@ -9,7 +9,6 @@ metadata:
   name: {{ include "gateway.fullname" . }}
   labels:
     {{- include "gateway.labels" . | nindent 4 }}
-    {{- include "gateway.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/brigade-cloudevents-gateway/templates/service.yaml b/charts/brigade-cloudevents-gateway/templates/service.yaml
@@ -20,4 +20,3 @@ spec:
     protocol: TCP
   selector:
     {{- include "gateway.selectorLabels" . | nindent 8 }}
-    {{- include "gateway.labels" . | nindent 8 }}