diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml index c22ed75dea..8abb96a146 100644 --- a/stable/kibana/Chart.yaml +++ b/stable/kibana/Chart.yaml @@ -1,5 +1,5 @@ name: kibana -version: 1.0.3 +version: 1.1.0 appVersion: 6.5.3 description: Kibana is an open source data visualization plugin for Elasticsearch icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg diff --git a/stable/kibana/README.md b/stable/kibana/README.md index 0abd37e667..c947ae55f5 100644 --- a/stable/kibana/README.md +++ b/stable/kibana/README.md @@ -100,6 +100,7 @@ The following table lists the configurable parameters of the kibana chart and th | `securityContext.allowPrivilegeEscalation` | Allow privilege escalation | `false` | | `securityContext.runAsUser` | User id to run in pods | `1000` | | `securityContext.fsGroup` | fsGroup id to run in pods | `2000` | +| `extraConfigMapMounts` | Additional configmaps to be mounted | `[]` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/stable/kibana/ci/extra-configmap-mounts.yaml b/stable/kibana/ci/extra-configmap-mounts.yaml new file mode 100644 index 0000000000..c4ccd57291 --- /dev/null +++ b/stable/kibana/ci/extra-configmap-mounts.yaml @@ -0,0 +1,6 @@ +--- +extraConfigMapMounts: + - name: logtrail-configs + configMap: kibana-logtrail + mountPath: /usr/share/kibana/plugins/logtrail/logtrail.json + subPath: logtrail.json diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml index 2054059d98..56e31341dc 100644 --- a/stable/kibana/templates/deployment.yaml +++ b/stable/kibana/templates/deployment.yaml @@ -173,6 +173,11 @@ spec: {{- end }} {{- with .Values.extraContainers }} {{ tpl . $ | indent 6 }} +{{- end }} +{{- range .Values.extraConfigMapMounts }} + - name: {{ .name }} + mountPath: {{ .mountPath }} + subPath: {{ .subPath }} {{- end }} {{- if .Values.image.pullSecrets }} imagePullSecrets: @@ -215,3 +220,8 @@ spec: name: {{ template "kibana.fullname" . }}-importscript defaultMode: 0777 {{- end }} +{{- range .Values.extraConfigMapMounts }} + - name: {{ .name }} + configMap: + name: {{ .configMap }} +{{- end }} diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml index 4263828ab1..d0b132abaa 100644 --- a/stable/kibana/values.yaml +++ b/stable/kibana/values.yaml @@ -177,3 +177,9 @@ securityContext: allowPrivilegeEscalation: false runAsUser: 1000 fsGroup: 2000 + +extraConfigMapMounts: [] + # - name: logtrail-configs + # configMap: kibana-logtrail + # mountPath: /usr/share/kibana/plugins/logtrail/logtrail.json + # subPath: logtrail.json