[stable/fluentd-elasticsearch] Add ability to specify nodePort and protocol. (#8923)

* [stable/fluentd-elasticsearch] Add ability to specify nodePort and protocol.

Signed-off-by: Li Jialin <8wy2513537@163.com>

* [stable/fluentd-elasticsearch] add service.* in README

Signed-off-by: Li Jialin <8wy2513537@163.com>

* fix test err

Signed-off-by: Li Jialin <8wy2513537@163.com>

fix: too long config volume name may touch off a test error
This commit is contained in:
Li Jialin
2018-11-19 06:08:44 -08:00
committed by k8s-ci-robot
parent 6a9f27258c
commit 1fd34e4e93
4 changed files with 18 additions and 3 deletions
+1 -1
View File
@@ -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
+6
View File
@@ -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` |
@@ -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 }}
@@ -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" . }}