From 5c7cc6255742500e20aae20c4f007fe13248ff3d Mon Sep 17 00:00:00 2001
From: Xiang Dai <764524258@qq.com>
Date: Mon, 2 Dec 2019 16:29:04 +0800
Subject: [PATCH] [stable/metabase] Fixes compatibility with 1.16 (#17533)

* Fixes compatibility with 1.16

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

* fix a typo

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

* add selector

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

diff --git a/stable/metabase/Chart.yaml b/stable/metabase/Chart.yaml
index dcf9321b08..19850bde84 100644
--- a/stable/metabase/Chart.yaml
+++ b/stable/metabase/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: The easy, open source way for everyone in your company to ask questions
   and learn from data.
 name: metabase
-version: 0.9.1
+version: 0.9.2
 appVersion: v0.32.9
 maintainers:
 - name: pmint93
diff --git a/stable/metabase/templates/_helpers.tpl b/stable/metabase/templates/_helpers.tpl
index ba3ef4c7e7..979458530a 100644
--- a/stable/metabase/templates/_helpers.tpl
+++ b/stable/metabase/templates/_helpers.tpl
@@ -14,3 +14,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- 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/metabase/templates/deployment.yaml b/stable/metabase/templates/deployment.yaml
index d2bc122f50..703d38fb75 100644
--- a/stable/metabase/templates/deployment.yaml
+++ b/stable/metabase/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "metabase.fullname" . }}
@@ -8,6 +8,9 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "metabase.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata: