From 90001bd04d4800dff0b34b63bec163eec6d01ab4 Mon Sep 17 00:00:00 2001
From: Radu Crisan <radu.crisan@gmail.com>
Date: Tue, 1 Oct 2019 23:08:39 +0300
Subject: [PATCH] [stable/aerospike] upgraded statefulset to apps/v1, needed
 for kubernetes 1.16 (#17517)

* upgraded aerospike statefulset to v1 for kubernetes 1.16

Signed-off-by: Radu Crisan <radu.crisan@gmail.com>

* fixed version

Signed-off-by: Radu Crisan <radu.crisan@gmail.com>
---
 stable/aerospike/Chart.yaml                 | 2 +-
 stable/aerospike/README.md                  | 2 +-
 stable/aerospike/templates/statefulset.yaml | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/stable/aerospike/Chart.yaml b/stable/aerospike/Chart.yaml
index 1668b9ec6b..1d77af5db4 100644
--- a/stable/aerospike/Chart.yaml
+++ b/stable/aerospike/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - aerospike
   - big-data
 home: http://aerospike.com
-version: 0.2.8
+version: 0.2.9
 icon: https://s3-us-west-1.amazonaws.com/aerospike-fd/wp-content/uploads/2016/06/Aerospike_square_logo.png
 sources:
 - https://github.com/aerospike/aerospike-server
diff --git a/stable/aerospike/README.md b/stable/aerospike/README.md
index 23c1885c36..33047ea55c 100644
--- a/stable/aerospike/README.md
+++ b/stable/aerospike/README.md
@@ -6,7 +6,7 @@ This is an implementation of Aerospike StatefulSet found here:
 
 ## Pre Requisites
 
-* Kubernetes 1.7+ with beta APIs enabled and support for statefulsets
+* Kubernetes 1.9+
 
 * PV support on underlying infrastructure (only if you are provisioning persistent volume).
 
diff --git a/stable/aerospike/templates/statefulset.yaml b/stable/aerospike/templates/statefulset.yaml
index 4ad94a308a..63141c7a41 100644
--- a/stable/aerospike/templates/statefulset.yaml
+++ b/stable/aerospike/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "aerospike.fullname" . }}
@@ -10,6 +10,10 @@ metadata:
 spec:
   serviceName: {{ template "aerospike.fullname" . }}-mesh
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "aerospike.name" . }}
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels: