From 75f29fcb767fcc20d166533da3f4f6c9bb32278b Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian.hacman@sematext.com>
Date: Thu, 20 Feb 2020 13:41:02 +0200
Subject: [PATCH] Update statefulset api version to apps/v1 (#20895)

Signed-off-by: Ciprian Hacman <ciprian.hacman@sematext.com>
---
 incubator/mysqlha/Chart.yaml                 | 2 +-
 incubator/mysqlha/README.md                  | 2 +-
 incubator/mysqlha/templates/statefulset.yaml | 7 ++++++-
 incubator/mysqlha/values.yaml                | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/incubator/mysqlha/Chart.yaml b/incubator/mysqlha/Chart.yaml
index 788e72b41f..b7c34b982a 100644
--- a/incubator/mysqlha/Chart.yaml
+++ b/incubator/mysqlha/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mysqlha
-version: 1.0.0
+version: 1.0.1
 appVersion: 5.7.13
 description: MySQL cluster with a single master and zero or more slave replicas
 keywords:
diff --git a/incubator/mysqlha/README.md b/incubator/mysqlha/README.md
index f68065141a..1836cdbc86 100644
--- a/incubator/mysqlha/README.md
+++ b/incubator/mysqlha/README.md
@@ -8,7 +8,7 @@ This chart bootstraps a single master and multiple slave MySQL deployment on a [
 
 ## Prerequisites
 
-- Kubernetes 1.6+
+- Kubernetes 1.10+ with Beta APIs enabled
 - PV provisioner support in the underlying infrastructure
 
 ## Installing the Chart
diff --git a/incubator/mysqlha/templates/statefulset.yaml b/incubator/mysqlha/templates/statefulset.yaml
index 9701271271..b15a41f5de 100644
--- a/incubator/mysqlha/templates/statefulset.yaml
+++ b/incubator/mysqlha/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}
@@ -8,12 +8,17 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}
+      release: {{ .Release.Name }}
   serviceName: {{ template "fullname" . }}
   replicas: {{ .Values.mysqlha.replicaCount }}
   template:
     metadata:
       labels:
         app: {{ template "fullname" . }}
+        release: {{ .Release.Name }}
       {{- if .Values.mysqlha.podAnnotations }}
       annotations:
 {{ toYaml .Values.mysqlha.podAnnotations | indent 8 }}
diff --git a/incubator/mysqlha/values.yaml b/incubator/mysqlha/values.yaml
index 706e3a8e1f..78d2bc9fbb 100644
--- a/incubator/mysqlha/values.yaml
+++ b/incubator/mysqlha/values.yaml
@@ -1,7 +1,7 @@
 ## mysql image version
 ## ref: https://hub.docker.com/r/library/mysql/tags/
 ##
-mysqlImage: mysql:5.7.13
+mysqlImage: mysql:5.7.29
 xtraBackupImage: gcr.io/google-samples/xtrabackup:1.0
 
 ## Specify an imagePullPolicy (Required)