From 6c2fa0fe6d98d8be22bc7b81e49b9964443e3b91 Mon Sep 17 00:00:00 2001 From: InseinJee <33472993+inseinjee@users.noreply.github.com> Date: Sat, 21 Mar 2020 00:56:37 +0900 Subject: [PATCH] [stable/grafana] Add support for extraExposePorts (#21547) * Add support for extraExposePorts Signed-off-by: Insein Jee * Bump the chart version(5.0.7 -> 5.0.8) Signed-off-by: Insein Jee Signed-off-by: inseinjee * Remove trailing spaces Signed-off-by: inseinjee --- stable/grafana/Chart.yaml | 2 +- stable/grafana/README.md | 1 + stable/grafana/templates/service.yaml | 4 ++++ stable/grafana/values.yaml | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 6fae60a11c98..c2c5393da1b5 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 5.0.7 +version: 5.0.8 appVersion: 6.6.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/README.md b/stable/grafana/README.md index 5003f778f1a0..0e9170f0f79a 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -66,6 +66,7 @@ You have to add --force to your helm upgrade command as the labels of the chart | `service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `nil` | | `service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to lb (if supported) | `[]` | | `serivce.externalIPs` | service external IP addresses | `[]` | +| `extraExposePorts` | Additional service ports for sidecar containers| `[]` | | `ingress.enabled` | Enables Ingress | `false` | | `ingress.annotations` | Ingress annotations | `{}` | | `ingress.labels` | Custom labels | `{}` | diff --git a/stable/grafana/templates/service.yaml b/stable/grafana/templates/service.yaml index e06c27df32a6..2764566986b8 100644 --- a/stable/grafana/templates/service.yaml +++ b/stable/grafana/templates/service.yaml @@ -42,5 +42,9 @@ spec: {{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }} nodePort: {{.Values.service.nodePort}} {{ end }} + {{- if .Values.extraExposePorts }} + {{- tpl (toYaml .Values.extraExposePorts) . | indent 4 }} + {{- end }} selector: {{- include "grafana.selectorLabels" . | nindent 4 }} + diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index c7b633aae542..0cc4250b775d 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -119,6 +119,12 @@ service: labels: {} portName: service +extraExposePorts: [] + # - name: keycloak + # port: 8080 + # targetPort: 8080 + # type: ClusterIP + ingress: enabled: false annotations: {}