add std labels and component label

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
helm · Nov 30, 2018 · 18965c7 · 18965c7
1 parent 9c44d79
commit 18965c7
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 26 deletions.
diff --git a/stable/airflow/examples/minikube-values.yaml b/stable/airflow/examples/minikube-values.yaml
@@ -2,10 +2,10 @@ airflow:
   image:
     repository: puckel/docker-airflow
     tag: 1.10.0-4
-    pull_policy: IfNotPresent
+    pullPolicy: IfNotPresent
   service:
     type: NodePort
-  web_replicas: 1
+  webReplicas: 1
   config:
     AIRFLOW__CORE__LOGGING_LEVEL: DEBUG
     AIRFLOW__CORE__LOAD_EXAMPLES: True

diff --git a/stable/airflow/templates/configmap-airflow.yaml b/stable/airflow/templates/configmap-airflow.yaml
@@ -2,6 +2,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: "{{ template "airflow.fullname" . }}-env"
+  labels:
+    app: {{ template "airflow.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 data:
   ## Force UTC timezone
   TZ: Etc/UTC

diff --git a/stable/airflow/templates/configmap-git-clone.yaml b/stable/airflow/templates/configmap-git-clone.yaml
@@ -2,6 +2,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "airflow.fullname" . }}-git-clone
+  labels:
+    app: {{ template "airflow.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 data:
   git-clone.sh: |
     #!/bin/sh -e

diff --git a/stable/airflow/templates/configmap-scripts.yaml b/stable/airflow/templates/configmap-scripts.yaml
@@ -2,6 +2,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "airflow.fullname" . }}-scripts
+  labels:
+    app: {{ template "airflow.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 data:
   install-requirements.sh: |
     #!/bin/sh -e

diff --git a/stable/airflow/templates/deployments-flower.yaml b/stable/airflow/templates/deployments-flower.yaml
@@ -4,7 +4,8 @@ kind: Deployment
 metadata:
   name: {{ template "airflow.fullname" . }}-flower
   labels:
-    app: {{ template "airflow.name" . }}-flower
+    app: {{ template "airflow.name" . }}
+    component: flower
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -18,15 +19,17 @@ spec:
       maxUnavailable: 0
   selector:
     matchLabels:
-      app: {{ template "airflow.name" . }}-flower
+      app: {{ template "airflow.name" . }}
+      component: flower
       release: {{ .Release.Name }}
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }}
         configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env"
       labels:
-        app: {{ template "airflow.name" . }}-flower
+        app: {{ template "airflow.name" . }}
+        component: flower
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.airflow.image.pullSecret }}
@@ -71,4 +74,4 @@ spec:
             timeoutSeconds: 1
             successThreshold: 1
             failureThreshold: 5
-{{- end }}
+{{- end }}
diff --git a/stable/airflow/templates/deployments-scheduler.yaml b/stable/airflow/templates/deployments-scheduler.yaml
@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ template "airflow.fullname" . }}-scheduler
   labels:
-    app: {{ template "airflow.name" . }}-scheduler
+    app: {{ template "airflow.name" . }}
+    component: scheduler
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -18,15 +19,17 @@ spec:
       maxUnavailable: 100%
   selector:
     matchLabels:
-      app: {{ template "airflow.name" . }}-scheduler
+      app: {{ template "airflow.name" . }}
+      component: scheduler
       release: {{ .Release.Name }}
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }}
         configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env"
       labels:
-        app: {{ template "airflow.name" . }}-scheduler
+        app: {{ template "airflow.name" . }}
+        component: scheduler
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.airflow.image.pullSecret }}

diff --git a/stable/airflow/templates/deployments-web.yaml b/stable/airflow/templates/deployments-web.yaml
@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ template "airflow.fullname" . }}-web
   labels:
-    app: {{ template "airflow.name" . }}-web
+    app: {{ template "airflow.name" . }}
+    component: web
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -18,15 +19,17 @@ spec:
       maxUnavailable: 0
   selector:
     matchLabels:
-      app: {{ template "airflow.name" . }}-web
+      app: {{ template "airflow.name" . }}
+      component: web
       release: {{ .Release.Name }}
   template:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap-airflow.yaml") . | sha256sum }}
         configmap.fabric8.io/update-on-change: "{{ template "airflow.fullname" . }}-env"
       labels:
-        app: {{ template "airflow.name" . }}-web
+        app: {{ template "airflow.name" . }}
+        component: web
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.airflow.image.pullSecret }}

diff --git a/stable/airflow/templates/ingress-flower.yaml b/stable/airflow/templates/ingress-flower.yaml
@@ -4,7 +4,8 @@ kind: Ingress
 metadata:
   name: {{ template "airflow.fullname" . }}-flower
   labels:
-    app: {{ template "airflow.name" . }}-flower
+    app: {{ template "airflow.name" . }}
+    component: flower
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

diff --git a/stable/airflow/templates/ingress-web.yaml b/stable/airflow/templates/ingress-web.yaml
@@ -4,7 +4,8 @@ kind: Ingress
 metadata:
   name: {{ template "airflow.fullname" . }}-web
   labels:
-    app: {{ template "airflow.name" . }}-web
+    app: {{ template "airflow.name" . }}
+    component: web
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

diff --git a/stable/airflow/templates/poddisruptionbudget.yaml b/stable/airflow/templates/poddisruptionbudget.yaml
@@ -3,13 +3,15 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ template "airflow.fullname" . }}-pdb
   labels:
-    app: {{ template "airflow.name" . }}-scheduler
+    app: {{ template "airflow.name" . }}
+    component: scheduler
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "airflow.name" . }}-scheduler
+      app: {{ template "airflow.name" . }}
+      component: scheduler
       release: {{ .Release.Name }}
 {{ toYaml .Values.airflow.podDisruptionBudget | indent 2 }}
diff --git a/stable/airflow/templates/service-flower.yaml b/stable/airflow/templates/service-flower.yaml
@@ -4,17 +4,19 @@ kind: Service
 metadata:
   name: {{ template "airflow.fullname" . }}-flower
   labels:
-    app: {{ template "airflow.name" . }}-flower
+    app: {{ template "airflow.name" . }}
+    component: flower
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.airflow.service.type }}
   selector:
-    app: {{ template "airflow.name" . }}-flower
+    app: {{ template "airflow.name" . }}
+    component: flower
     release: {{ .Release.Name }}
   ports:
     - name: flower
       protocol: TCP
       port: 5555
-{{- end }}
+{{- end }}
diff --git a/stable/airflow/templates/service-web.yaml b/stable/airflow/templates/service-web.yaml
@@ -3,14 +3,16 @@ kind: Service
 metadata:
   name: {{ template "airflow.fullname" . }}-web
   labels:
-    app: {{ template "airflow.name" . }}-web
+    app: {{ template "airflow.name" . }}
+    component: web
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.airflow.service.type }}
   selector:
-    app: {{ template "airflow.name" . }}-web
+    app: {{ template "airflow.name" . }}
+    component: web
     release: {{ .Release.Name }}
   ports:
     - name: web

diff --git a/stable/airflow/templates/service-worker.yaml b/stable/airflow/templates/service-worker.yaml
@@ -5,7 +5,8 @@ kind: Service
 metadata:
   name: {{ template "airflow.fullname" . }}-worker
   labels:
-    app: {{ template "airflow.name" . }}-worker
+    app: {{ template "airflow.name" . }}
+    component: worker
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -16,5 +17,6 @@ spec:
       port: 8793
   clusterIP: None
   selector:
-    app: {{ template "airflow.name" . }}-worker
+    app: {{ template "airflow.name" . }}
+    component: worker
 {{- end }}
diff --git a/stable/airflow/templates/statefulsets-workers.yaml b/stable/airflow/templates/statefulsets-workers.yaml
@@ -7,7 +7,8 @@ kind: StatefulSet
 metadata:
   name: {{ template "airflow.fullname" . }}-worker
   labels:
-    app: {{ template "airflow.name" . }}-worker
+    app: {{ template "airflow.name" . }}
+    component: worker
     chart: {{ template "airflow.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -22,7 +23,8 @@ spec:
   replicas: {{ .Values.workers.replicas }}
   selector:
     matchLabels:
-      app: {{ template "airflow.name" . }}-worker
+      app: {{ template "airflow.name" . }}
+      component: worker
       release: {{ .Release.Name }}
   template:
     metadata:
@@ -33,7 +35,8 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
       labels:
-        app: {{ template "airflow.name" . }}-worker
+        app: {{ template "airflow.name" . }}
+        component: worker
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.airflow.image.pullSecret }}