From 7755cea24c028db07e2e36933ec13c28efea9a32 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 1 Feb 2019 09:10:57 +0200 Subject: [PATCH] [stable/kibana]: remove ports from initContainers (#10975) Signed-off-by: unclejack --- stable/kibana/Chart.yaml | 2 +- stable/kibana/README.md | 1 - stable/kibana/ci/authproxy-enabled.yaml | 3 +++ stable/kibana/ci/disabled-internal-port.yaml | 4 ---- stable/kibana/templates/deployment.yaml | 10 ---------- stable/kibana/values.yaml | 2 -- 6 files changed, 4 insertions(+), 18 deletions(-) create mode 100644 stable/kibana/ci/authproxy-enabled.yaml delete mode 100644 stable/kibana/ci/disabled-internal-port.yaml diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml index c32b97dd7b..860088d8b3 100644 --- a/stable/kibana/Chart.yaml +++ b/stable/kibana/Chart.yaml @@ -1,5 +1,5 @@ name: kibana -version: 1.3.0 +version: 1.4.0 appVersion: 6.6.0 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 8b0c28606f..c740610e0e 100644 --- a/stable/kibana/README.md +++ b/stable/kibana/README.md @@ -69,7 +69,6 @@ The following table lists the configurable parameters of the kibana chart and th | `resources` | pod resource requests & limits | `{}` | | `priorityClassName` | priorityClassName | `nil` | | `service.externalPort` | external port for the service | `443` | -| `service.disableInternalPort` | disable internal port when using sidecar | `false` | | `service.internalPort` | internal port for the service | `4180` | | `service.authProxyPort` | port to use when using sidecar authProxy | None: | | `service.externalIPs` | external IP addresses | None: | diff --git a/stable/kibana/ci/authproxy-enabled.yaml b/stable/kibana/ci/authproxy-enabled.yaml new file mode 100644 index 0000000000..186724a58f --- /dev/null +++ b/stable/kibana/ci/authproxy-enabled.yaml @@ -0,0 +1,3 @@ +--- +# disable internal port by setting authProxyEnabled +authProxyEnabled: true diff --git a/stable/kibana/ci/disabled-internal-port.yaml b/stable/kibana/ci/disabled-internal-port.yaml deleted file mode 100644 index 51e49a736f..0000000000 --- a/stable/kibana/ci/disabled-internal-port.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# disable internal service -service: - disableInternalPort: true diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml index 6669bb0007..7f26b99afd 100644 --- a/stable/kibana/templates/deployment.yaml +++ b/stable/kibana/templates/deployment.yaml @@ -47,10 +47,6 @@ spec: - name: "{{ $key }}" value: "{{ $value }}" {{- end }} - ports: - - containerPort: {{ .Values.service.internalPort }} - name: {{ template "kibana.name" . }} - protocol: TCP volumeMounts: - name: {{ template "kibana.fullname" . }}-dashboards mountPath: "/kibanadashboards" @@ -106,12 +102,6 @@ spec: - name: "{{ $key }}" value: "{{ $value }}" {{- end }} -{{- if not .Values.service.disableInternalPort }} - ports: - - containerPort: {{ .Values.service.internalPort }} - name: {{ template "kibana.name" . }} - protocol: TCP -{{- end }} volumeMounts: - name: plugins mountPath: /usr/share/kibana/plugins diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml index c950aecb89..de34527191 100644 --- a/stable/kibana/values.yaml +++ b/stable/kibana/values.yaml @@ -35,8 +35,6 @@ deployment: service: type: ClusterIP externalPort: 443 - # disables the internal port if set to true; to be used with a sidecar - disableInternalPort: false internalPort: 5601 # authProxyPort: 5602 To be used with authProxyEnabled and a proxy extraContainer ## External IP addresses of service