From 9765bf2f9acfbbdb55410e2147f834f8d78d2a3c Mon Sep 17 00:00:00 2001
From: Eric <eric@lemieuxdev.com>
Date: Thu, 3 Oct 2019 10:54:08 -0400
Subject: [PATCH] [stable/rabbitmq-ha] Updating StatefulSet apiVersion for
 kubernetes 1.16 (#17597)

* [stable/rabbitmq-ha] Updating StatefulSet apiVersion for kubernetes 1.16

Deprecation information
https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/

Signed-off-by: Eric Lemieux <eric@lemieuxdev.com>

* [stable/rabbitmq-ha] Updating deprecated apiVersion for Role and RoleBinding

Signed-off-by: Eric Lemieux <eric@lemieuxdev.com>

* [stable/rabbitmq-ha] Adding selector to StatefulSet

Signed-off-by: Eric Lemieux <eric@lemieuxdev.com>
---
 stable/rabbitmq-ha/Chart.yaml                       | 2 +-
 stable/rabbitmq-ha/README.md                        | 2 +-
 stable/rabbitmq-ha/templates/role.yaml              | 2 +-
 stable/rabbitmq-ha/templates/rolebinding.yaml       | 2 +-
 stable/rabbitmq-ha/templates/service-discovery.yaml | 3 +--
 stable/rabbitmq-ha/templates/statefulset.yaml       | 6 +++++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml
index 8d49fc9532..456d24d8ec 100644
--- a/stable/rabbitmq-ha/Chart.yaml
+++ b/stable/rabbitmq-ha/Chart.yaml
@@ -1,7 +1,7 @@
 name: rabbitmq-ha
 apiVersion: v1
 appVersion: 3.7.15
-version: 1.32.4
+version: 1.33.0
 description: Highly available RabbitMQ cluster, the open source message broker
   software that implements the Advanced Message Queuing Protocol (AMQP).
 keywords:
diff --git a/stable/rabbitmq-ha/README.md b/stable/rabbitmq-ha/README.md
index 2dc55d1b07..ac845c5593 100644
--- a/stable/rabbitmq-ha/README.md
+++ b/stable/rabbitmq-ha/README.md
@@ -17,7 +17,7 @@ deployment on a [Kubernetes](http://kubernetes.io) cluster using the
 
 ## Prerequisites
 
-- Kubernetes 1.5+ with Beta APIs enabled
+- Kubernetes 1.9+ with Beta APIs enabled
 - PV provisioner support in the underlying infrastructure
 
 ## Installing the Chart
diff --git a/stable/rabbitmq-ha/templates/role.yaml b/stable/rabbitmq-ha/templates/role.yaml
index 0e0fcf7f82..f0c7fa905c 100644
--- a/stable/rabbitmq-ha/templates/role.yaml
+++ b/stable/rabbitmq-ha/templates/role.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
diff --git a/stable/rabbitmq-ha/templates/rolebinding.yaml b/stable/rabbitmq-ha/templates/rolebinding.yaml
index 620b0b71ac..3eb047d748 100644
--- a/stable/rabbitmq-ha/templates/rolebinding.yaml
+++ b/stable/rabbitmq-ha/templates/rolebinding.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.rbac.create }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
diff --git a/stable/rabbitmq-ha/templates/service-discovery.yaml b/stable/rabbitmq-ha/templates/service-discovery.yaml
index e9cee944fd..eb0d6f4c32 100644
--- a/stable/rabbitmq-ha/templates/service-discovery.yaml
+++ b/stable/rabbitmq-ha/templates/service-discovery.yaml
@@ -1,9 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 {{- if .Values.service.annotations }}
+  annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
   name: {{ printf "%s-discovery" (include "rabbitmq-ha.fullname" .) | trunc 63 | trimSuffix "-" }}
diff --git a/stable/rabbitmq-ha/templates/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml
index 286b5ca391..02b5944a16 100644
--- a/stable/rabbitmq-ha/templates/statefulset.yaml
+++ b/stable/rabbitmq-ha/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "rabbitmq-ha.fullname" . }}
@@ -17,6 +17,10 @@ spec:
   replicas: {{ .Values.replicaCount }}
   updateStrategy:
     type: {{ .Values.updateStrategy }}
+  selector:
+    matchLabels:
+      app: {{ template "rabbitmq-ha.name" . }}
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels: