diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index af3133db7b..886be917b8 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 3.2.0 +version: 3.3.0 appVersion: 6.1.3 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 3567a535b9..2660253b4c 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -90,6 +90,7 @@ The command removes all the Kubernetes components associated with the chart and | `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | | `sidecar.resources` | Sidecar resources | `{}` | | `sidecar.dashboards.enabled` | Enabled the cluster wide search for dashboards and adds/updates/deletes them in grafana | `false` | +| `sidecar.skipTlsVerify` | Set to true to skip tls verification for kube api calls | `nil` | | `sidecar.dashboards.label` | Label that config maps with dashboards should have to be added | `grafana_dashboard` | | `sidecar.dashboards.searchNamespace` | If specified, the sidecar will search for dashboard config-maps inside this namespace. Otherwise the namespace in which the sidecar is running will be used. It's also possible to specify ALL to search in all namespaces | `nil` | | `sidecar.datasources.enabled` | Enabled the cluster wide search for datasources and adds/updates/deletes them in grafana |`false` | diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml index e61a7db4b8..52570e2b63 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -97,6 +97,10 @@ spec: - name: NAMESPACE value: "{{ .Values.sidecar.datasources.searchNamespace }}" {{- end }} + {{- if .Values.sidecar.skipTlsVerify }} + - name: SKIP_TLS_VERIFY + value: "{{ .Values.sidecar.skipTlsVerify }}" + {{- end }} resources: {{ toYaml .Values.sidecar.resources | indent 12 }} volumeMounts: @@ -126,6 +130,10 @@ spec: - name: NAMESPACE value: "{{ .Values.sidecar.dashboards.searchNamespace }}" {{- end }} + {{- if .Values.sidecar.skipTlsVerify }} + - name: SKIP_TLS_VERIFY + value: "{{ .Values.sidecar.skipTlsVerify }}" + {{- end }} resources: {{ toYaml .Values.sidecar.resources | indent 12 }} volumeMounts: diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index ec1776651d..daa93df6f8 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -378,6 +378,8 @@ sidecar: # requests: # cpu: 50m # memory: 50Mi + # skipTlsVerify Set to true to skip tls verification for kube api calls + # skipTlsVerify: true dashboards: enabled: false # label that the configmaps with dashboards are marked with