Prevent shadow-service creation for CoreDNS and a custom release name

traefik · Jul 28, 2020 · 545ba7a · 545ba7a
1 parent fb506d0
commit 545ba7a
Show file tree

Hide file tree

Showing 24 changed files with 159 additions and 116 deletions.
diff --git a/helm/chart/maesh/charts/metrics/templates/grafana-pdb.yaml b/helm/chart/maesh/charts/metrics/templates/grafana-pdb.yaml
@@ -4,13 +4,14 @@ kind: PodDisruptionBudget
 metadata:
   name: grafana
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: grafana
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app: grafana
-      component: core
+      app: maesh
+      component: grafana
diff --git a/helm/chart/maesh/charts/metrics/templates/grafana.yaml b/helm/chart/maesh/charts/metrics/templates/grafana.yaml
@@ -5,22 +5,22 @@ metadata:
   name: grafana-core
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: grafana
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: grafana
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: grafana
-      component: core
+      app: maesh
+      component: grafana
   template:
     metadata:
       labels:
-        app: grafana
-        component: core
+        app: maesh
+        component: grafana
     spec:
       serviceAccountName: grafana-k8s
       automountServiceAccountToken: false
@@ -100,11 +100,11 @@ metadata:
   name: grafana-config
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: grafana
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: grafana
 data:
   grafana.ini: |-
     instance_name = containous-grafana
@@ -155,11 +155,11 @@ metadata:
   name: grafana
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: grafana
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: grafana
 spec:
   type: {{ .Values.grafana.service.type }}
   ports:
@@ -169,8 +169,8 @@ spec:
       nodePort: {{ .Values.grafana.service.nodePort }}
       {{- end }}
   selector:
-    app: grafana
-    component: core
+    app: maesh
+    component: grafana
 
 ---
 {{- $files := .Files }}
@@ -183,6 +183,7 @@ metadata:
   name: grafana-dashboard-{{ $filename }}
   namespace: {{ $ns }}
   labels:
+    app: maesh
     component: grafana
 data:
   {{ base $path }}: '{{ $files.Get $path }}'

diff --git a/helm/chart/maesh/charts/metrics/templates/prometheus-pdb.yaml b/helm/chart/maesh/charts/metrics/templates/prometheus-pdb.yaml
@@ -4,13 +4,14 @@ kind: PodDisruptionBudget
 metadata:
   name: prometheus
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
   minAvailable: 1
   selector:
     matchLabels:
-      app: prometheus
-      component: core
+      app: maesh
+      component: prometheus
diff --git a/helm/chart/maesh/charts/metrics/templates/prometheus.yaml b/helm/chart/maesh/charts/metrics/templates/prometheus.yaml
@@ -6,11 +6,11 @@ metadata:
   name: prometheus-rules
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: prometheus
 data:
   general.yaml: |
     groups:
@@ -29,11 +29,11 @@ metadata:
   name: prometheus-core
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: prometheus
 data:
   prometheus.yaml: |
     global:
@@ -71,23 +71,23 @@ metadata:
   name: prometheus-core
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: prometheus
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: prometheus
-      component: core
+      app: maesh
+      component: prometheus
   template:
     metadata:
       name: prometheus-main
       labels:
-        app: prometheus
-        component: core
+        app: maesh
+        component: prometheus
     spec:
       serviceAccountName: prometheus-k8s
       automountServiceAccountToken: true
@@ -175,11 +175,11 @@ metadata:
   name: prometheus
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
-    component: prometheus
   annotations:
     prometheus.io/scrape: 'true'
 spec:
@@ -193,5 +193,5 @@ spec:
       protocol: TCP
       name: webui
   selector:
-    app: prometheus
-    component: core
+    app: maesh
+    component: prometheus
diff --git a/helm/chart/maesh/charts/metrics/templates/rbac.yaml b/helm/chart/maesh/charts/metrics/templates/rbac.yaml
@@ -4,6 +4,8 @@ kind: ClusterRoleBinding
 metadata:
   name: prometheus
   labels:
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -22,6 +24,8 @@ kind: ClusterRole
 metadata:
   name: prometheus
   labels:
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -51,6 +55,8 @@ metadata:
   name: prometheus-k8s
   namespace: {{ .Release.Namespace }}
   labels:
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -62,6 +68,8 @@ metadata:
   name: grafana-k8s
   namespace: {{ .Release.Namespace }}
   labels:
+    app: maesh
+    component: grafana
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
diff --git a/helm/chart/maesh/charts/metrics/templates/storage.yaml b/helm/chart/maesh/charts/metrics/templates/storage.yaml
@@ -5,6 +5,8 @@ metadata:
   name: metrics-storage
   namespace: {{ .Release.Namespace }}
   labels:
+    app: maesh
+    component: grafana
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -25,6 +27,8 @@ metadata:
   name: prometheus-storage
   namespace: {{ .Release.Namespace }}
   labels:
+    app: maesh
+    component: prometheus
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}

diff --git a/helm/chart/maesh/charts/tracing/templates/jaeger-deployment.yaml b/helm/chart/maesh/charts/tracing/templates/jaeger-deployment.yaml
@@ -47,52 +47,52 @@ spec:
         runAsNonRoot: true
         runAsUser: 999
       containers:
-        -   env:
-              - name: COLLECTOR_ZIPKIN_HTTP_PORT
-                value: "9411"
-            image: {{ .Values.image.jaeger | quote }}
-            name: jaeger
-            ports:
-              - containerPort: 5775
-                protocol: UDP
-                name: thrift-legacy
-              - containerPort: 6831
-                protocol: UDP
-                name: compact-thrift
-              - containerPort: 6832
-                protocol: UDP
-                name: binary-thrift
-              - containerPort: 5778
-                protocol: TCP
-                name: serve-configs
-              - containerPort: 9411
-                protocol: TCP
-                name: collector-zip
-              - containerPort: 14267
-                protocol: TCP
-                name: collector-tch
-              - containerPort: 14268
-                protocol: TCP
-                name: collector-http
-              - containerPort: 14269
-                protocol: TCP
-                name: readiness
-              - containerPort: 16686
-                protocol: TCP
-                name: serve-frontend
-            readinessProbe:
-              httpGet:
-                path: "/"
-                port: readiness
-              initialDelaySeconds: 5
-            livenessProbe:
-              tcpSocket:
-                port: readiness
-              initialDelaySeconds: 5
-            resources:
-              requests:
-                memory: "50Mi"
-                cpu: "100m"
-              limits:
-                memory: "100Mi"
-                cpu: "200m"
+        - env:
+          - name: COLLECTOR_ZIPKIN_HTTP_PORT
+            value: "9411"
+          image: {{ .Values.image.jaeger | quote }}
+          name: jaeger
+          ports:
+            - containerPort: 5775
+              protocol: UDP
+              name: thrift-legacy
+            - containerPort: 6831
+              protocol: UDP
+              name: compact-thrift
+            - containerPort: 6832
+              protocol: UDP
+              name: binary-thrift
+            - containerPort: 5778
+              protocol: TCP
+              name: serve-configs
+            - containerPort: 9411
+              protocol: TCP
+              name: collector-zip
+            - containerPort: 14267
+              protocol: TCP
+              name: collector-tch
+            - containerPort: 14268
+              protocol: TCP
+              name: collector-http
+            - containerPort: 14269
+              protocol: TCP
+              name: readiness
+            - containerPort: 16686
+              protocol: TCP
+              name: serve-frontend
+          readinessProbe:
+            httpGet:
+              path: "/"
+              port: readiness
+            initialDelaySeconds: 5
+          livenessProbe:
+            tcpSocket:
+              port: readiness
+            initialDelaySeconds: 5
+          resources:
+            requests:
+              memory: "50Mi"
+              cpu: "100m"
+            limits:
+              memory: "100Mi"
+              cpu: "200m"
diff --git a/helm/chart/maesh/charts/tracing/templates/jaeger-pdb.yaml b/helm/chart/maesh/charts/tracing/templates/jaeger-pdb.yaml
@@ -4,7 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   name: jaeger
   labels:
-    app: {{ .Release.Name | quote }}
+    app: jaeger
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}

diff --git a/helm/chart/maesh/charts/tracing/templates/jaeger-sa.yaml b/helm/chart/maesh/charts/tracing/templates/jaeger-sa.yaml
@@ -5,7 +5,7 @@ metadata:
   name: jaeger
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote}}
+    app: jaeger
     chart: {{ include "maesh.chartLabel" . | quote}}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}

diff --git a/helm/chart/maesh/templates/controller/controller-deployment.yaml b/helm/chart/maesh/templates/controller/controller-deployment.yaml
@@ -5,21 +5,22 @@ metadata:
   name: maesh-controller
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name | quote }}
+    app: maesh
+    component: controller
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: {{ .Release.Name | quote }}
+      app: maesh
       component: controller
       release: {{ .Release.Name | quote }}
   template:
     metadata:
       labels:
-        app: {{ .Release.Name | quote }}
+        app: maesh
         component: controller
         release: {{ .Release.Name | quote }}
       annotations: