[kibana] Add compatibility for k8s 1.16 (#303)

[kibana] Add compatibility for k8s 1.16
elastic · Sep 30, 2019 · 51ce614 · 51ce614
2 parents 619ade4 + 7db4eeb
commit 51ce614
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/kibana/README.md b/kibana/README.md
@@ -6,7 +6,7 @@ This helm chart is a lightweight way to configure and run our official [Kibana d
 
 ## Requirements
 
-* Kubernetes >= 1.8
+* Kubernetes >= 1.9
 * [Helm](https://helm.sh/) >= 2.8.0
 
 ## Installing

diff --git a/kibana/templates/_helpers.tpl b/kibana/templates/_helpers.tpl
@@ -14,3 +14,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Release.Name .Values.nameOverride -}}
 {{- printf "%s-%s" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "kibana.ingress.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/kibana/templates/ingress.yaml b/kibana/templates/ingress.yaml
@@ -2,7 +2,7 @@
 {{- $fullName := include "fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "kibana.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}