From 545ba7aa4b957f11d69dbe8c9ab590f747911b70 Mon Sep 17 00:00:00 2001 From: Harold Ozouf Date: Tue, 28 Jul 2020 17:52:04 +0200 Subject: [PATCH] Prevent shadow-service creation for CoreDNS and a custom release name --- .../charts/metrics/templates/grafana-pdb.yaml | 7 +- .../charts/metrics/templates/grafana.yaml | 25 ++--- .../metrics/templates/prometheus-pdb.yaml | 7 +- .../charts/metrics/templates/prometheus.yaml | 28 +++--- .../maesh/charts/metrics/templates/rbac.yaml | 8 ++ .../charts/metrics/templates/storage.yaml | 4 + .../tracing/templates/jaeger-deployment.yaml | 98 +++++++++---------- .../charts/tracing/templates/jaeger-pdb.yaml | 2 +- .../charts/tracing/templates/jaeger-sa.yaml | 2 +- .../controller/controller-deployment.yaml | 7 +- .../templates/controller/controller-pdb.yaml | 5 +- .../templates/controller/controller-rbac.yaml | 6 +- .../templates/controller/controller-sa.yaml | 3 +- .../controller/hooks/cleanup-hook.yaml | 14 ++- .../dns/coredns/coredns-configmap.yaml | 2 + .../dns/coredns/coredns-deployment.yaml | 18 ++-- .../templates/dns/coredns/coredns-rbac.yaml | 6 +- .../templates/dns/coredns/coredns-sa.yaml | 2 + .../dns/coredns/coredns-service.yaml | 8 +- .../maesh/templates/mesh/mesh-daemonset.yaml | 7 +- helm/chart/maesh/templates/mesh/mesh-pdb.yaml | 5 +- .../chart/maesh/templates/mesh/mesh-rbac.yaml | 6 +- helm/chart/maesh/templates/mesh/mesh-sa.yaml | 3 +- .../maesh/templates/mesh/mesh-service.yaml | 2 + 24 files changed, 159 insertions(+), 116 deletions(-) diff --git a/helm/chart/maesh/charts/metrics/templates/grafana-pdb.yaml b/helm/chart/maesh/charts/metrics/templates/grafana-pdb.yaml index 77505f9c6..5da1ae909 100644 --- a/helm/chart/maesh/charts/metrics/templates/grafana-pdb.yaml +++ b/helm/chart/maesh/charts/metrics/templates/grafana-pdb.yaml @@ -4,7 +4,8 @@ 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 }} @@ -12,5 +13,5 @@ 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 index dbd78bc98..f88ff8f28 100644 --- 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 index e5c69c88d..909778754 100644 --- a/helm/chart/maesh/charts/metrics/templates/prometheus-pdb.yaml +++ b/helm/chart/maesh/charts/metrics/templates/prometheus-pdb.yaml @@ -4,7 +4,8 @@ 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 }} @@ -12,5 +13,5 @@ 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 index 0f4b9992a..c0cab3e19 100644 --- 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 index 996f7b140..b177b567a 100644 --- 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 index 94be9d7e0..9f7e4dafa 100644 --- 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 index c083da1cb..0024b247f 100644 --- 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 index e17f24f45..82f894ce9 100644 --- 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 index b3960952d..aaf58643b 100644 --- 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 index dbb5da430..9c227c0a5 100644 --- a/helm/chart/maesh/templates/controller/controller-deployment.yaml +++ b/helm/chart/maesh/templates/controller/controller-deployment.yaml @@ -5,7 +5,8 @@ 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 }} @@ -13,13 +14,13 @@ 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: diff --git a/helm/chart/maesh/templates/controller/controller-pdb.yaml b/helm/chart/maesh/templates/controller/controller-pdb.yaml index 00521010e..a260c8311 100644 --- a/helm/chart/maesh/templates/controller/controller-pdb.yaml +++ b/helm/chart/maesh/templates/controller/controller-pdb.yaml @@ -5,7 +5,8 @@ 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 }} @@ -13,6 +14,6 @@ spec: minAvailable: 1 selector: matchLabels: - app: {{ .Release.Name | quote }} + app: maesh component: controller release: {{ .Release.Name | quote }} diff --git a/helm/chart/maesh/templates/controller/controller-rbac.yaml b/helm/chart/maesh/templates/controller/controller-rbac.yaml index fe59f5fef..293e1d00b 100644 --- a/helm/chart/maesh/templates/controller/controller-rbac.yaml +++ b/helm/chart/maesh/templates/controller/controller-rbac.yaml @@ -5,7 +5,8 @@ metadata: name: maesh-controller-role 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 }} @@ -75,7 +76,8 @@ 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 }} diff --git a/helm/chart/maesh/templates/controller/controller-sa.yaml b/helm/chart/maesh/templates/controller/controller-sa.yaml index 867a19fa4..d64f8bd95 100644 --- a/helm/chart/maesh/templates/controller/controller-sa.yaml +++ b/helm/chart/maesh/templates/controller/controller-sa.yaml @@ -5,7 +5,8 @@ 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 }} diff --git a/helm/chart/maesh/templates/controller/hooks/cleanup-hook.yaml b/helm/chart/maesh/templates/controller/hooks/cleanup-hook.yaml index 77ee5b0dc..29fc7dad7 100644 --- a/helm/chart/maesh/templates/controller/hooks/cleanup-hook.yaml +++ b/helm/chart/maesh/templates/controller/hooks/cleanup-hook.yaml @@ -5,7 +5,8 @@ metadata: name: maesh-cleanup namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: cleanup chart: {{ include "maesh.chartLabel" . | quote}} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -21,7 +22,8 @@ metadata: name: maesh-cleanup-role namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: cleanup chart: {{ include "maesh.chartLabel" . | quote}} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -61,7 +63,8 @@ metadata: name: maesh-cleanup namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: cleanup chart: {{ include "maesh.chartLabel" . | quote}} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -85,7 +88,8 @@ metadata: name: maesh-cleanup namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: cleanup chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} @@ -99,7 +103,7 @@ spec: template: metadata: labels: - app: {{ .Release.Name | quote}} + app: maesh component: cleanup release: {{ .Release.Name | quote}} spec: diff --git a/helm/chart/maesh/templates/dns/coredns/coredns-configmap.yaml b/helm/chart/maesh/templates/dns/coredns/coredns-configmap.yaml index 6d996f159..cfffffd3a 100644 --- a/helm/chart/maesh/templates/dns/coredns/coredns-configmap.yaml +++ b/helm/chart/maesh/templates/dns/coredns/coredns-configmap.yaml @@ -6,6 +6,8 @@ metadata: name: coredns namespace: {{ .Release.Namespace }} labels: + app: maesh + component: coredns chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} diff --git a/helm/chart/maesh/templates/dns/coredns/coredns-deployment.yaml b/helm/chart/maesh/templates/dns/coredns/coredns-deployment.yaml index d6e59bc1e..c501a9ed3 100644 --- a/helm/chart/maesh/templates/dns/coredns/coredns-deployment.yaml +++ b/helm/chart/maesh/templates/dns/coredns/coredns-deployment.yaml @@ -6,8 +6,8 @@ metadata: name: coredns namespace: {{ .Release.Namespace }} labels: - k8s-app: coredns - kubernetes.io/name: "CoreDNS" + app: maesh + component: coredns chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} @@ -19,11 +19,13 @@ spec: maxUnavailable: 1 selector: matchLabels: - k8s-app: coredns + app: maesh + component: coredns template: metadata: labels: - k8s-app: coredns + app: maesh + component: coredns spec: serviceAccountName: maesh-coredns affinity: @@ -33,10 +35,14 @@ spec: podAffinityTerm: labelSelector: matchExpressions: - - key: k8s-app + - key: app operator: In values: - - corednss + - maesh + - key: component + operator: In + values: + - coredns topologyKey: "kubernetes.io/hostname" tolerations: - key: "CriticalAddonsOnly" diff --git a/helm/chart/maesh/templates/dns/coredns/coredns-rbac.yaml b/helm/chart/maesh/templates/dns/coredns/coredns-rbac.yaml index c4a408d53..55e286047 100644 --- a/helm/chart/maesh/templates/dns/coredns/coredns-rbac.yaml +++ b/helm/chart/maesh/templates/dns/coredns/coredns-rbac.yaml @@ -4,7 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: labels: - kubernetes.io/bootstrapping: rbac-defaults + app: maesh + component: coredns chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} @@ -35,7 +36,8 @@ metadata: name: maesh-coredns namespace: {{ .Release.Namespace }} labels: - kubernetes.io/bootstrapping: rbac-defaults + app: maesh + component: coredns chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} diff --git a/helm/chart/maesh/templates/dns/coredns/coredns-sa.yaml b/helm/chart/maesh/templates/dns/coredns/coredns-sa.yaml index 8f1ad4541..b6af36f4c 100644 --- a/helm/chart/maesh/templates/dns/coredns/coredns-sa.yaml +++ b/helm/chart/maesh/templates/dns/coredns/coredns-sa.yaml @@ -6,6 +6,8 @@ metadata: name: maesh-coredns namespace: {{ .Release.Namespace }} labels: + app: maesh + component: coredns chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} diff --git a/helm/chart/maesh/templates/dns/coredns/coredns-service.yaml b/helm/chart/maesh/templates/dns/coredns/coredns-service.yaml index 6fe6bfb5d..dd98762ba 100644 --- a/helm/chart/maesh/templates/dns/coredns/coredns-service.yaml +++ b/helm/chart/maesh/templates/dns/coredns/coredns-service.yaml @@ -6,9 +6,8 @@ metadata: name: coredns namespace: {{ .Release.Namespace }} labels: - k8s-app: coredns - kubernetes.io/name: "CoreDNS" - kubernetes.io/cluster-service: "true" + app: maesh + component: coredns chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote}} heritage: {{ .Release.Service | quote}} @@ -17,7 +16,8 @@ metadata: prometheus.io/scrape: "true" spec: selector: - k8s-app: coredns + app: maesh + component: coredns type: ClusterIP ports: - name: dns diff --git a/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml b/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml index c117ad370..19b910b8d 100644 --- a/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml +++ b/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml @@ -5,7 +5,8 @@ metadata: name: maesh-mesh namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote }} + app: maesh + component: maesh-mesh chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -16,13 +17,13 @@ metadata: spec: selector: matchLabels: - app: {{ .Release.Name | quote }} + app: maesh component: maesh-mesh release: {{ .Release.Name | quote }} template: metadata: labels: - app: {{ .Release.Name | quote }} + app: maesh component: maesh-mesh release: {{ .Release.Name | quote }} annotations: diff --git a/helm/chart/maesh/templates/mesh/mesh-pdb.yaml b/helm/chart/maesh/templates/mesh/mesh-pdb.yaml index c59379be4..22c17d5b7 100644 --- a/helm/chart/maesh/templates/mesh/mesh-pdb.yaml +++ b/helm/chart/maesh/templates/mesh/mesh-pdb.yaml @@ -5,7 +5,8 @@ metadata: name: maesh-mesh namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote }} + app: maesh + component: maesh-mesh chart: {{ include "maesh.chartLabel" . | quote }} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -13,6 +14,6 @@ spec: maxUnavailable: 1 selector: matchLabels: - app: {{ .Release.Name | quote }} + app: maesh component: maesh-mesh release: {{ .Release.Name | quote }} diff --git a/helm/chart/maesh/templates/mesh/mesh-rbac.yaml b/helm/chart/maesh/templates/mesh/mesh-rbac.yaml index d95c9d050..9977b85c2 100644 --- a/helm/chart/maesh/templates/mesh/mesh-rbac.yaml +++ b/helm/chart/maesh/templates/mesh/mesh-rbac.yaml @@ -5,7 +5,8 @@ metadata: name: maesh-mesh-role namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: maesh-mesh chart: {{ include "maesh.chartLabel" . | quote}} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} @@ -24,7 +25,8 @@ metadata: name: maesh-mesh namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: maesh-mesh chart: {{ include "maesh.chartLabel" . | quote}} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/helm/chart/maesh/templates/mesh/mesh-sa.yaml b/helm/chart/maesh/templates/mesh/mesh-sa.yaml index 823ea4b4b..764468ec3 100644 --- a/helm/chart/maesh/templates/mesh/mesh-sa.yaml +++ b/helm/chart/maesh/templates/mesh/mesh-sa.yaml @@ -5,7 +5,8 @@ metadata: name: maesh-mesh namespace: {{ .Release.Namespace }} labels: - app: {{ .Release.Name | quote}} + app: maesh + component: maesh-mesh chart: {{ include "maesh.chartLabel" . | quote}} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/helm/chart/maesh/templates/mesh/mesh-service.yaml b/helm/chart/maesh/templates/mesh/mesh-service.yaml index 128d2cb7b..386fcc49c 100644 --- a/helm/chart/maesh/templates/mesh/mesh-service.yaml +++ b/helm/chart/maesh/templates/mesh/mesh-service.yaml @@ -6,6 +6,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: app: maesh + component: maesh-mesh spec: type: ClusterIP ports: @@ -13,4 +14,5 @@ spec: name: mesh-api targetPort: api selector: + app: maesh component: maesh-mesh