Merge pull request #19 from naseemkullah/labels-helper

naseemkullah · web-flow · commit 579d5bf2f540 · 2019-12-29T20:54:21.000-05:00
[jaeger] Use label helpers
diff --git a/charts/jaeger/templates/_helpers.tpl b/charts/jaeger/templates/_helpers.tpl
@@ -31,6 +31,26 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Common labels
+*/}}
+{{- define "jaeger.labels" -}}
+helm.sh/chart: {{ include "jaeger.chart" . }}
+{{ include "jaeger.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "jaeger.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "jaeger.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
 {{/*
 Create the name of the cassandra schema service account to use
 */}}
diff --git a/charts/jaeger/templates/agent-ds.yaml b/charts/jaeger/templates/agent-ds.yaml
@@ -4,10 +4,7 @@ kind: DaemonSet
 metadata:
   name: {{ template "jaeger.agent.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: agent
 {{- if .Values.agent.annotations }}
   annotations:
@@ -16,8 +13,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "jaeger.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "jaeger.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: agent
   template:
     metadata:
@@ -26,8 +22,7 @@ spec:
 {{ toYaml .Values.agent.podAnnotations | indent 8 }}
 {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "jaeger.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- include "jaeger.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: agent
 {{- if .Values.agent.podLabels }}
 {{ toYaml .Values.agent.podLabels | indent 8 }}
diff --git a/charts/jaeger/templates/agent-sa.yaml b/charts/jaeger/templates/agent-sa.yaml
@@ -4,9 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.agent.serviceAccountName" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: agent
 {{- end -}}
diff --git a/charts/jaeger/templates/agent-svc.yaml b/charts/jaeger/templates/agent-svc.yaml
@@ -4,10 +4,7 @@ kind: Service
 metadata:
   name: {{ template "jaeger.agent.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: agent
 {{- if .Values.agent.service.annotations }}
   annotations:
@@ -33,8 +30,7 @@ spec:
     targetPort: http
   type: {{ .Values.agent.service.type }}
   selector:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: agent
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- template "loadBalancerSourceRanges" .Values.agent }}
 {{- end -}}
diff --git a/charts/jaeger/templates/cassandra-schema-job.yaml b/charts/jaeger/templates/cassandra-schema-job.yaml
@@ -5,11 +5,8 @@ kind: Job
 metadata:
   name: {{ include "jaeger.fullname" . }}-cassandra-schema
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: cassandra-schema
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.schema.annotations }}
   annotations:
 {{ toYaml .Values.schema.annotations | indent 4 }}
diff --git a/charts/jaeger/templates/cassandra-schema-sa.yaml b/charts/jaeger/templates/cassandra-schema-sa.yaml
@@ -4,9 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.cassandraSchema.serviceAccountName" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: cassandra-schema
 {{- end -}}
diff --git a/charts/jaeger/templates/cassandra-secret.yaml b/charts/jaeger/templates/cassandra-secret.yaml
@@ -4,10 +4,7 @@ kind: Secret
 metadata:
   name: {{ include "jaeger.fullname" . }}-cassandra
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "jaeger.labels" . | nindent 4 }}
 type: Opaque
 data:
   password: {{ .Values.storage.cassandra.password | b64enc | quote }}
diff --git a/charts/jaeger/templates/collector-configmap.yaml b/charts/jaeger/templates/collector-configmap.yaml
@@ -4,10 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "jaeger.fullname" . }}-sampling-strategies
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
 data:
   strategies.json: |-
diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml
@@ -4,11 +4,8 @@ kind: Deployment
 metadata:
   name: {{ template "jaeger.collector.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.collector.annotations }}
   annotations:
 {{ toYaml .Values.collector.annotations | indent 4 }}
@@ -19,9 +16,8 @@ spec:
 {{- end }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "jaeger.name" . }}
+      {{- include "jaeger.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: collector
-      app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: Recreate
   template:
@@ -32,9 +28,8 @@ spec:
 {{ toYaml .Values.collector.podAnnotations | indent 8 }}
 {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "jaeger.name" . }}
+        {{- include "jaeger.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: collector
-        app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.collector.podLabels }}
 {{ toYaml .Values.collector.podLabels | indent 8 }}
 {{- end }}
diff --git a/charts/jaeger/templates/collector-hpa.yaml b/charts/jaeger/templates/collector-hpa.yaml
@@ -4,11 +4,8 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "jaeger.collector.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/charts/jaeger/templates/collector-sa.yaml b/charts/jaeger/templates/collector-sa.yaml
@@ -4,9 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.collector.serviceAccountName" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
 {{- end -}}
diff --git a/charts/jaeger/templates/collector-svc.yaml b/charts/jaeger/templates/collector-svc.yaml
@@ -4,11 +4,8 @@ kind: Service
 metadata:
   name: {{ template "jaeger.collector.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.collector.service.annotations }}
   annotations:
 {{ toYaml .Values.collector.service.annotations | indent 4 }}
@@ -34,9 +31,8 @@ spec:
     targetPort: zipkin
 {{- end }}
   selector:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: collector
-    app.kubernetes.io/instance: {{ .Release.Name }}
   type: {{ .Values.collector.service.type }}
 {{- template "loadBalancerSourceRanges" .Values.collector }}
 {{- end -}}
diff --git a/charts/jaeger/templates/elasticsearch-secret.yaml b/charts/jaeger/templates/elasticsearch-secret.yaml
@@ -4,10 +4,7 @@ kind: Secret
 metadata:
   name: {{ include "jaeger.fullname" . }}-elasticsearch
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "jaeger.labels" . | nindent 4 }}
 type: Opaque
 data:
   password: {{ .Values.storage.elasticsearch.password | b64enc | quote }}
diff --git a/charts/jaeger/templates/hotrod-deploy.yaml b/charts/jaeger/templates/hotrod-deploy.yaml
@@ -4,25 +4,19 @@ kind: Deployment
 metadata:
   name: {{ include "jaeger.fullname" . }}-hotrod
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    jaeger-infra: hotrod-deployment
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: hotrod
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.hotrod.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "jaeger.name" . }}
+      {{- include "jaeger.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: hotrod
-      app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "jaeger.name" . }}
+        {{- include "jaeger.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: hotrod
-        app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       serviceAccountName: {{ template "jaeger.hotrod.serviceAccountName" . }}
       containers:
diff --git a/charts/jaeger/templates/hotrod-ing.yaml b/charts/jaeger/templates/hotrod-ing.yaml
@@ -7,11 +7,8 @@ kind: Ingress
 metadata:
   name: {{ include "jaeger.fullname" . }}-hotrod
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: hotrod
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.hotrod.ingress.annotations }}
   annotations:
 {{ toYaml .Values.hotrod.ingress.annotations | indent 4 }}
diff --git a/charts/jaeger/templates/hotrod-sa.yaml b/charts/jaeger/templates/hotrod-sa.yaml
@@ -4,9 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.hotrod.serviceAccountName" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: hotrod
 {{- end -}}
diff --git a/charts/jaeger/templates/hotrod-svc.yaml b/charts/jaeger/templates/hotrod-svc.yaml
@@ -4,11 +4,8 @@ kind: Service
 metadata:
   name: {{ include "jaeger.fullname" . }}-hotrod
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: hotrod
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Values.hotrod.service.annotations }}
   annotations:
 {{ toYaml .Values.hotrod.service.annotations | indent 4 }}
@@ -21,8 +18,7 @@ spec:
       protocol: TCP
       targetPort: http
   selector:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: hotrod
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- template "loadBalancerSourceRanges" .Values.hotrod }}
 {{- end -}}
diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml
@@ -4,11 +4,8 @@ kind: Deployment
 metadata:
   name: {{ template "jaeger.query.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: query
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.query.annotations }}
   annotations:
 {{ toYaml .Values.query.annotations | indent 4 }}
@@ -17,9 +14,8 @@ spec:
   replicas: {{ .Values.query.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "jaeger.name" . }}
+      {{- include "jaeger.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: query
-      app.kubernetes.io/instance: {{ .Release.Name }}
   strategy:
     type: Recreate
   template:
@@ -29,9 +25,8 @@ spec:
 {{ toYaml .Values.query.podAnnotations | indent 8 }}
 {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "jaeger.name" . }}
+        {{- include "jaeger.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: query
-        app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.query.podLabels }}
 {{ toYaml .Values.query.podLabels | indent 8 }}
 {{- end }}
diff --git a/charts/jaeger/templates/query-ing.yaml b/charts/jaeger/templates/query-ing.yaml
@@ -6,11 +6,8 @@ kind: Ingress
 metadata:
   name: {{ template "jaeger.query.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: query
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
   {{- if .Values.query.ingress.annotations }}
   annotations:
 {{ toYaml .Values.query.ingress.annotations | indent 4 }}
diff --git a/charts/jaeger/templates/query-sa.yaml b/charts/jaeger/templates/query-sa.yaml
@@ -4,9 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.query.serviceAccountName" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: query
 {{- end -}}
diff --git a/charts/jaeger/templates/query-svc.yaml b/charts/jaeger/templates/query-svc.yaml
@@ -4,11 +4,8 @@ kind: Service
 metadata:
   name: {{ template "jaeger.query.name" . }}
   labels:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
-    helm.sh/chart: {{ include "jaeger.chart" . }}
+    {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: query
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.query.service.annotations }}
   annotations:
 {{ toYaml .Values.query.service.annotations | indent 4 }}
@@ -20,9 +17,8 @@ spec:
     protocol: TCP
     targetPort: query
   selector:
-    app.kubernetes.io/name: {{ include "jaeger.name" . }}
+    {{- include "jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: query
-    app.kubernetes.io/instance: {{ .Release.Name }}
   type: {{ .Values.query.service.type }}
 {{- template "loadBalancerSourceRanges" .Values.query }}
 {{- end -}}
diff --git a/charts/jaeger/templates/spark-cronjob.yaml b/charts/jaeger/templates/spark-cronjob.yaml
diff --git a/charts/jaeger/templates/spark-sa.yaml b/charts/jaeger/templates/spark-sa.yaml
