From d0b9568328e8d2a05bd2ec1f63f8d778c45a7a6f Mon Sep 17 00:00:00 2001 From: Naseem Date: Sun, 30 Dec 2018 06:24:00 -0500 Subject: [PATCH] [stable/fluentd-elasticsearch] replace template with include (#8590) * replace template with include, fix app labels, and helpers.tpl Signed-off-by: Naseem Ullah * chart bump Signed-off-by: Naseem Ullah * Update service.yaml Signed-off-by: Naseem Ullah * bump chart version Signed-off-by: Naseem Ullah --- stable/fluentd-elasticsearch/Chart.yaml | 2 +- stable/fluentd-elasticsearch/templates/clusterrole.yaml | 2 +- .../templates/clusterrolebinding.yaml | 4 ++-- stable/fluentd-elasticsearch/templates/configmap.yaml | 2 +- stable/fluentd-elasticsearch/templates/daemonset.yaml | 8 ++++---- .../fluentd-elasticsearch/templates/service-account.yaml | 2 +- stable/fluentd-elasticsearch/templates/service.yaml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml index 8a0194673a..801c0f7433 100644 --- a/stable/fluentd-elasticsearch/Chart.yaml +++ b/stable/fluentd-elasticsearch/Chart.yaml @@ -1,5 +1,5 @@ name: fluentd-elasticsearch -version: 2.0.4 +version: 2.0.5 appVersion: 2.3.2 home: https://www.fluentd.org/ description: A Fluentd Helm chart for Kubernetes with Elasticsearch output diff --git a/stable/fluentd-elasticsearch/templates/clusterrole.yaml b/stable/fluentd-elasticsearch/templates/clusterrole.yaml index 34e3569b7a..9004af9a53 100644 --- a/stable/fluentd-elasticsearch/templates/clusterrole.yaml +++ b/stable/fluentd-elasticsearch/templates/clusterrole.yaml @@ -2,7 +2,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} labels: app.kubernetes.io/name: {{ include "fluentd-elasticsearch.name" . }} helm.sh/chart: {{ include "fluentd-elasticsearch.chart" . }} diff --git a/stable/fluentd-elasticsearch/templates/clusterrolebinding.yaml b/stable/fluentd-elasticsearch/templates/clusterrolebinding.yaml index d5d28b4753..a932560f96 100644 --- a/stable/fluentd-elasticsearch/templates/clusterrolebinding.yaml +++ b/stable/fluentd-elasticsearch/templates/clusterrolebinding.yaml @@ -2,7 +2,7 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} labels: app.kubernetes.io/name: {{ include "fluentd-elasticsearch.name" . }} helm.sh/chart: {{ include "fluentd-elasticsearch.chart" . }} @@ -16,6 +16,6 @@ subjects: namespace: {{ .Release.Namespace }} roleRef: kind: ClusterRole - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} apiGroup: rbac.authorization.k8s.io {{- end -}} diff --git a/stable/fluentd-elasticsearch/templates/configmap.yaml b/stable/fluentd-elasticsearch/templates/configmap.yaml index 6f26f83a69..38c71a10ca 100644 --- a/stable/fluentd-elasticsearch/templates/configmap.yaml +++ b/stable/fluentd-elasticsearch/templates/configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} labels: app.kubernetes.io/name: {{ include "fluentd-elasticsearch.name" . }} helm.sh/chart: {{ include "fluentd-elasticsearch.chart" . }} diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml index 0529205e38..5d5fba9f9f 100644 --- a/stable/fluentd-elasticsearch/templates/daemonset.yaml +++ b/stable/fluentd-elasticsearch/templates/daemonset.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} labels: app.kubernetes.io/name: {{ include "fluentd-elasticsearch.name" . }} helm.sh/chart: {{ include "fluentd-elasticsearch.chart" . }} @@ -38,9 +38,9 @@ spec: {{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} spec: - serviceAccountName: {{ template "fluentd-elasticsearch.fullname" . }} + serviceAccountName: {{ include "fluentd-elasticsearch.fullname" . }} containers: - - name: {{ template "fluentd-elasticsearch.fullname" . }} + - name: {{ include "fluentd-elasticsearch.fullname" . }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: @@ -151,7 +151,7 @@ spec: path: /usr/lib64 - name: config-volume configMap: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} {{- if .Values.extraVolumes }} {{ toYaml .Values.extraVolumes | indent 6 }} {{- end }} diff --git a/stable/fluentd-elasticsearch/templates/service-account.yaml b/stable/fluentd-elasticsearch/templates/service-account.yaml index 91ace19bbc..db0994d000 100644 --- a/stable/fluentd-elasticsearch/templates/service-account.yaml +++ b/stable/fluentd-elasticsearch/templates/service-account.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} labels: app.kubernetes.io/name: {{ include "fluentd-elasticsearch.name" . }} helm.sh/chart: {{ include "fluentd-elasticsearch.chart" . }} diff --git a/stable/fluentd-elasticsearch/templates/service.yaml b/stable/fluentd-elasticsearch/templates/service.yaml index a0fb53bba9..41fef035e6 100644 --- a/stable/fluentd-elasticsearch/templates/service.yaml +++ b/stable/fluentd-elasticsearch/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fluentd-elasticsearch.fullname" . }} + name: {{ include "fluentd-elasticsearch.fullname" . }} labels: app.kubernetes.io/name: {{ include "fluentd-elasticsearch.name" . }} helm.sh/chart: {{ include "fluentd-elasticsearch.chart" . }}