[stable/fluentd-elasticsearch] replace template with include (#8590)

* replace template with include, fix app labels, and helpers.tpl

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

* chart bump

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

* Update service.yaml

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>

* bump chart version

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>
This commit is contained in:
Naseem
2018-12-30 03:24:00 -08:00
committed by Kubernetes Prow Robot
parent 56a30eca9e
commit d0b9568328
7 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -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
@@ -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" . }}
@@ -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 -}}
@@ -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" . }}
@@ -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 }}
@@ -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" . }}
@@ -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" . }}