From b520660b6bfc4cf9b0eb69eb3174a4b98b9ecf55 Mon Sep 17 00:00:00 2001
From: Taehyun Kim <kgyoo8232@gmail.com>
Date: Tue, 21 Aug 2018 20:32:34 +0900
Subject: [PATCH] [Incubator/elasticsearch-curator] fix nodeSelector,
 tolerations, affinity (#7273)

* fix nodeSelector, tolerations, affinity

* fix namespace param

* bump chart version

* add job labels
---
 incubator/elasticsearch-curator/Chart.yaml         |  2 +-
 .../elasticsearch-curator/templates/NOTES.txt      |  2 +-
 .../elasticsearch-curator/templates/cronjob.yaml   | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/incubator/elasticsearch-curator/Chart.yaml b/incubator/elasticsearch-curator/Chart.yaml
index 6b6949d9b5..694145ee58 100644
--- a/incubator/elasticsearch-curator/Chart.yaml
+++ b/incubator/elasticsearch-curator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "5.5.4"
 description: A Helm chart for Elasticsearch Curator
 name: elasticsearch-curator
-version: 0.4.0
+version: 0.4.1
 home: https://github.com/elastic/curator
 keywords:
 - curator
diff --git a/incubator/elasticsearch-curator/templates/NOTES.txt b/incubator/elasticsearch-curator/templates/NOTES.txt
index 3bffc9a704..0b4fe02516 100644
--- a/incubator/elasticsearch-curator/templates/NOTES.txt
+++ b/incubator/elasticsearch-curator/templates/NOTES.txt
@@ -3,4 +3,4 @@ A CronJob will run with schedule {{ .Values.cronjob.schedule }}.
 The Jobs will not be removed automagically when deleting this Helm chart.
 To remove these jobs, run the following :
 
-    kubectl -n logging delete job -l app={{ template "elasticsearch-curator.name" . }}
\ No newline at end of file
+    kubectl -n {{ .Release.Namespace }} delete job -l app={{ template "elasticsearch-curator.name" . }},release={{ .Release.Name }}
\ No newline at end of file
diff --git a/incubator/elasticsearch-curator/templates/cronjob.yaml b/incubator/elasticsearch-curator/templates/cronjob.yaml
index 2e3262b515..cdacc595ab 100644
--- a/incubator/elasticsearch-curator/templates/cronjob.yaml
+++ b/incubator/elasticsearch-curator/templates/cronjob.yaml
@@ -7,7 +7,7 @@ metadata:
     chart: {{ template "elasticsearch-curator.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations: 
+  annotations:
 {{ toYaml .Values.cronjob.annotations | indent 4 }}
 spec:
   schedule: "{{ .Values.cronjob.schedule }}"
@@ -21,13 +21,17 @@ spec:
   successfulJobsHistoryLimit: {{ . }}
   {{- end }}
   jobTemplate:
+    metadata:
+      labels:
+        app: {{ template "elasticsearch-curator.name" . }}
+        release: {{ .Release.Name }}
     spec:
       template:
         metadata:
           labels:
             app: {{ template "elasticsearch-curator.name" . }}
             release: {{ .Release.Name }}
-          annotations: 
+          annotations:
 {{ toYaml .Values.pod.annotations | indent 12 }}
         spec:
           volumes:
@@ -56,14 +60,14 @@ spec:
               resources:
 {{ toYaml .Values.resources | indent 16 }}
     {{- with .Values.nodeSelector }}
-      nodeSelector:
+          nodeSelector:
 {{ toYaml . | indent 12 }}
     {{- end }}
     {{- with .Values.affinity }}
-      affinity:
+          affinity:
 {{ toYaml . | indent 12 }}
     {{- end }}
     {{- with .Values.tolerations }}
-      tolerations:
+          tolerations:
 {{ toYaml . | indent 12 }}
     {{- end }}