From 2d037478c2f3fbc3c5d9fa56ff66f90f1f82daca Mon Sep 17 00:00:00 2001 From: Abdulrahman Khalil Date: Mon, 2 Mar 2020 08:48:42 +0300 Subject: [PATCH] chore: use the new api for ingress (#20648) Signed-off-by: Abdulrahman Khalil --- stable/grafana/Chart.yaml | 2 +- stable/grafana/templates/ingress.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index d1481095d1..27e665d0ef 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 5.0.3 +version: 5.0.4 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/templates/ingress.yaml b/stable/grafana/templates/ingress.yaml index fe1695a6d4..202efb3619 100644 --- a/stable/grafana/templates/ingress.yaml +++ b/stable/grafana/templates/ingress.yaml @@ -3,7 +3,11 @@ {{- $servicePort := .Values.service.port -}} {{- $ingressPath := .Values.ingress.path -}} {{- $extraPaths := .Values.ingress.extraPaths -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +apiVersion: networking.k8s.io/v1beta1 +{{ else }} apiVersion: extensions/v1beta1 +{{ end -}} kind: Ingress metadata: name: {{ $fullName }}