From 52e351fabc470a65893115c09c1075614fcdc8a5 Mon Sep 17 00:00:00 2001
From: Xiang Dai <764524258@qq.com>
Date: Mon, 30 Sep 2019 17:35:38 +0800
Subject: [PATCH] [stable/weave-cloud] Fixes compatibility with 1.16 (#17524)

* Fixes compatibility with 1.16

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

* fix a typo

Signed-off-by: Xiang Dai <764524258@qq.com>
---
 stable/weave-cloud/Chart.yaml                |  2 +-
 stable/weave-cloud/templates/_helpers.tpl    | 13 ++++++++++++-
 stable/weave-cloud/templates/deployment.yaml |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/stable/weave-cloud/Chart.yaml b/stable/weave-cloud/Chart.yaml
index 41cc97a1fa..2d9ef3bd37 100644
--- a/stable/weave-cloud/Chart.yaml
+++ b/stable/weave-cloud/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 appVersion: "1.3.0"
 name: weave-cloud
-version: 0.3.3
+version: 0.3.4
 description: |
     Weave Cloud is a add-on to Kubernetes which provides Continuous Delivery, along with hosted Prometheus Monitoring and a visual dashboard for exploring & debugging microservices
 home: https://weave.works
diff --git a/stable/weave-cloud/templates/_helpers.tpl b/stable/weave-cloud/templates/_helpers.tpl
index d4fd978655..82fa907395 100644
--- a/stable/weave-cloud/templates/_helpers.tpl
+++ b/stable/weave-cloud/templates/_helpers.tpl
@@ -40,4 +40,15 @@ Create the name of the service account to use
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{/*
+Return the apiVerion 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/weave-cloud/templates/deployment.yaml b/stable/weave-cloud/templates/deployment.yaml
index 361fc29528..289fb1cc7b 100644
--- a/stable/weave-cloud/templates/deployment.yaml
+++ b/stable/weave-cloud/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ .Values.agent.name }}