diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml index 5f4714d9a5..d02ca6a112 100644 --- a/stable/fluentd-elasticsearch/Chart.yaml +++ b/stable/fluentd-elasticsearch/Chart.yaml @@ -1,5 +1,5 @@ name: fluentd-elasticsearch -version: 1.1.0 +version: 1.1.1 appVersion: 2.3.1 home: https://www.fluentd.org/ description: A Fluentd Helm chart for Kubernetes with Elasticsearch output diff --git a/stable/fluentd-elasticsearch/README.md b/stable/fluentd-elasticsearch/README.md index 71608be1a7..610578e87c 100644 --- a/stable/fluentd-elasticsearch/README.md +++ b/stable/fluentd-elasticsearch/README.md @@ -62,6 +62,12 @@ The following table lists the configurable parameters of the Fluentd elasticsear | `resources.requests.cpu` | CPU request | `100m` | | `resources.requests.memory` | Memory request | `200Mi` | | `service` | Service definition | `{}` | +| `service.type` | Service type (ClusterIP/NodePort) | Not Set | +| `service.ports` | List of service ports dict [{name:...}...] | Not Set | +| `service.ports[].name` | One of service ports name | Not Set | +| `service.ports[].port` | Service port | Not Set | +| `service.ports[].nodePort` | NodePort port(when service.type is NodePort) | Not Set | +| `service.ports[].protocol` | Service protocol(optional, can be TCP/UDP) | Not Set | | `serviceAccount.create` | Specifies whether a service account should be created.| `true` | | `serviceAccount.name` | Name of the service account. | | | `livenessProbe.enabled` | Whether to enable livenessProbe | `true` | diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml index 1c301b68ae..605bd7a86b 100644 --- a/stable/fluentd-elasticsearch/templates/daemonset.yaml +++ b/stable/fluentd-elasticsearch/templates/daemonset.yaml @@ -66,7 +66,7 @@ spec: - name: libsystemddir mountPath: /host/lib readOnly: true - - name: config-volume-{{ template "fluentd-elasticsearch.fullname" . }} + - name: config-volume mountPath: /etc/fluent/config.d {{- if .Values.extraVolumeMounts }} {{ toYaml .Values.extraVolumeMounts | indent 8 }} @@ -75,6 +75,9 @@ spec: {{- range $port := .Values.service.ports }} - name: {{ $port.name }} containerPort: {{ $port.port }} +{{- if $port.protocol }} + protocol: {{ $port.protocol }} +{{- end }} {{- end }} {{- if .Values.livenessProbe.enabled }} # Liveness probe is aimed to help in situarions where fluentd @@ -122,7 +125,7 @@ spec: - name: libsystemddir hostPath: path: /usr/lib64 - - name: config-volume-{{ template "fluentd-elasticsearch.fullname" . }} + - name: config-volume configMap: name: {{ template "fluentd-elasticsearch.fullname" . }} {{- if .Values.extraVolumes }} diff --git a/stable/fluentd-elasticsearch/templates/service.yaml b/stable/fluentd-elasticsearch/templates/service.yaml index 9425497271..9a00e336d2 100644 --- a/stable/fluentd-elasticsearch/templates/service.yaml +++ b/stable/fluentd-elasticsearch/templates/service.yaml @@ -15,6 +15,12 @@ spec: - name: {{ $port.name }} port: {{ $port.port }} targetPort: {{ $port.port }} + {{- if $port.nodePort }} + nodePort: {{ $port.nodePort }} + {{- end }} + {{- if $port.protocol }} + protocol: {{ $port.protocol }} + {{- end }} {{- end }} selector: app: {{ template "fluentd-elasticsearch.fullname" . }}