github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-22 13:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor fluentd-elasticsearch (#5696)

Browse Source 
* refactor fluentd-elasticsearch

* remove trailing spaces

* Update Chart.yaml
This commit is contained in:
cheyang
2018-05-24 10:55:31 -07:00
committed by k8s-ci-robot
parent 350f6d8ac1
commit 2393ba1c86
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
incubator/fluentd-elasticsearch/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: fluentd-elasticsearch
version: 0.3.0
version: 0.4.0
appVersion: 2.0.4
home: https://www.fluentd.org/
description: A Fluentd Helm chart for Kubernetes with Elasticsearch output
incubator/fluentd-elasticsearch/README.md
+3 -3
View File
@@ -50,9 +50,9 @@ The following table lists the configurable parameters of the Fluentd elasticsear
| `elasticsearch.buffer_queue_limit` | Elasticsearch buffer queue limit | `8` |
| `extraVolumeMounts` | Mount an extra volume, required to mount ssl certificates when elasticsearch has tls enabled | |
| `extraVolume` | Extra volume | |
| `image` | Image | `gcr.io/google-containers/fluentd-elasticsearch` |
| `imageTag` | Image tag | `v2.0.4 |
| `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `imagePullPolicy` |
| `image.repository` | Image | `gcr.io/google-containers/fluentd-elasticsearch` |
| `image.tag` | Image tag | `v2.0.4 |
| `image.pullPolicy` | Image pull policy | `Always` if `image.tag` is `imagePullPolicy` |
| `rbac.create` | RBAC | `true` |
| `resources.limits.cpu` | CPU limit | `100m` |
| `resources.limits.memory` | Memory limit | `500Mi` |
incubator/fluentd-elasticsearch/templates/daemonset.yaml
+5 -5
View File
@@ -4,7 +4,7 @@ metadata:
name: {{ template "fluentd-elasticsearch.fullname" . }}
labels:
app: {{ template "fluentd-elasticsearch.fullname" . }}
version: {{ .Values.imageTag }}
version: {{ .Values.image.tag }}
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -14,18 +14,18 @@ spec:
selector:
matchLabels:
app: {{ template "fluentd-elasticsearch.fullname" . }}
version: {{ .Values.imageTag }}
version: {{ .Values.image.tag }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: "{{ .Release.Service }}"
template:
metadata:
labels:
app: {{ template "fluentd-elasticsearch.fullname" . }}
version: {{ .Values.imageTag }}
version: {{ .Values.image.tag }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: "{{ .Release.Service }}"
kubernetes.io/cluster-service: "true"
version: {{ .Values.imageTag }}
version: {{ .Values.image.tag }}
# This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573).
@@ -39,7 +39,7 @@ spec:
serviceAccountName: {{ template "fluentd-elasticsearch.fullname" . }}
containers:
- name: {{ template "fluentd-elasticsearch.fullname" . }}
image: "{{ .Values.image }}:{{ .Values.imageTag }}"
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
env:
- name: FLUENTD_ARGS
incubator/fluentd-elasticsearch/values.yaml
+4 -4
View File
@@ -1,10 +1,10 @@
image: gcr.io/google-containers/fluentd-elasticsearch
imageTag: v2.0.4
image:
repository: gcr.io/google-containers/fluentd-elasticsearch
## Specify an imagePullPolicy (Required)
## It's recommended to change this to 'Always' if the image tag is 'latest'
## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
imagePullPolicy: IfNotPresent
tag: v2.0.4
pullPolicy: IfNotPresent
## Configure resource requests and limits
## ref: http://kubernetes.io/docs/user-guide/compute-resources/