From a0d217e450a24ea4369933eb17baaf6bc2beef86 Mon Sep 17 00:00:00 2001
From: Xiang Dai <764524258@qq.com>
Date: Mon, 23 Dec 2019 16:45:33 +0800
Subject: [PATCH] [stable/spark] Fixes compatibility with 1.16 (#17523)

* Fixes compatibility with 1.16

Signed-off-by: Xiang Dai <764524258@qq.com>

* bump up version

Signed-off-by: Xiang Dai <764524258@qq.com>

* fix a typo

Signed-off-by: Xiang Dai <764524258@qq.com>

* fix a typo

Signed-off-by: Xiang Dai <764524258@qq.com>
---
 stable/spark/Chart.yaml                               |  2 +-
 stable/spark/templates/_helpers.tpl                   | 10 ++++++++++
 stable/spark/templates/spark-master-deployment.yaml   |  2 +-
 stable/spark/templates/spark-worker-deployment.yaml   |  2 +-
 stable/spark/templates/spark-worker-hpa.yaml          |  4 ++--
 stable/spark/templates/spark-zeppelin-deployment.yaml |  2 +-
 stable/spark/templates/spark-zeppelin-ingress.yaml    |  2 +-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/stable/spark/Chart.yaml b/stable/spark/Chart.yaml
index cd04a5ba3c..9e418e8100 100755
--- a/stable/spark/Chart.yaml
+++ b/stable/spark/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: spark
-version: 1.0.2
+version: 1.0.3
 appVersion: 1.5.1
 description: Fast and general-purpose cluster computing system.
 home: http://spark.apache.org
diff --git a/stable/spark/templates/_helpers.tpl b/stable/spark/templates/_helpers.tpl
index 7171285490..1133b193ed 100644
--- a/stable/spark/templates/_helpers.tpl
+++ b/stable/spark/templates/_helpers.tpl
@@ -30,3 +30,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Return the apiVersion of deployment.
+*/}}
+{{- define "deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/stable/spark/templates/spark-master-deployment.yaml b/stable/spark/templates/spark-master-deployment.yaml
index 2e55d3b433..f93475df9d 100644
--- a/stable/spark/templates/spark-master-deployment.yaml
+++ b/stable/spark/templates/spark-master-deployment.yaml
@@ -31,7 +31,7 @@ spec:
     component: "{{ .Release.Name }}-{{ .Values.Master.Component }}"
   type: {{ .Values.Master.ServiceType }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "master-fullname" . }}
diff --git a/stable/spark/templates/spark-worker-deployment.yaml b/stable/spark/templates/spark-worker-deployment.yaml
index 1dcc173fb3..c8d4a6a5e9 100644
--- a/stable/spark/templates/spark-worker-deployment.yaml
+++ b/stable/spark/templates/spark-worker-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "worker-fullname" . }}
diff --git a/stable/spark/templates/spark-worker-hpa.yaml b/stable/spark/templates/spark-worker-hpa.yaml
index d286b90c53..53ad7572e6 100644
--- a/stable/spark/templates/spark-worker-hpa.yaml
+++ b/stable/spark/templates/spark-worker-hpa.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ template "worker-fullname" . }}
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1beta1
+    apiVersion: {{ template "deployment.apiVersion" . }}
     kind: Deployment
     name: {{ template "worker-fullname" . }}
   minReplicas: {{ .Values.Worker.Replicas }}
@@ -20,4 +20,4 @@ spec:
     resource:
       name: cpu
       targetAverageUtilization: {{ .Values.Worker.CpuTargetPercentage }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/spark/templates/spark-zeppelin-deployment.yaml b/stable/spark/templates/spark-zeppelin-deployment.yaml
index a282be9614..2d090698a4 100644
--- a/stable/spark/templates/spark-zeppelin-deployment.yaml
+++ b/stable/spark/templates/spark-zeppelin-deployment.yaml
@@ -16,7 +16,7 @@ spec:
     component: "{{ .Release.Name }}-{{ .Values.Zeppelin.Component }}"
   type: {{ .Values.Zeppelin.ServiceType }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "zeppelin-fullname" . }}
diff --git a/stable/spark/templates/spark-zeppelin-ingress.yaml b/stable/spark/templates/spark-zeppelin-ingress.yaml
index 463bd62697..0c5a837fe5 100644
--- a/stable/spark/templates/spark-zeppelin-ingress.yaml
+++ b/stable/spark/templates/spark-zeppelin-ingress.yaml
@@ -41,4 +41,4 @@ spec:
     serviceName: {{ template "zeppelin-fullname" . }}
     servicePort: http
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}