From 83c006514be20e75f4cecedec1edf51559faccb2 Mon Sep 17 00:00:00 2001
From: Xiang Dai <764524258@qq.com>
Date: Thu, 3 Oct 2019 10:34:08 +0800
Subject: [PATCH] merge master (#17528)

Signed-off-by: Xiang Dai <764524258@qq.com>
---
 stable/redis-ha/Chart.yaml                              | 2 +-
 stable/redis-ha/templates/redis-haproxy-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml
index a7c444957f..aa67ea05c8 100644
--- a/stable/redis-ha/Chart.yaml
+++ b/stable/redis-ha/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 3.7.14
+version: 3.7.15
 appVersion: 5.0.5
 description: Highly available Kubernetes implementation of Redis
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
diff --git a/stable/redis-ha/templates/redis-haproxy-deployment.yaml b/stable/redis-ha/templates/redis-haproxy-deployment.yaml
index b3ec48f6ff..50eb51ee41 100644
--- a/stable/redis-ha/templates/redis-haproxy-deployment.yaml
+++ b/stable/redis-ha/templates/redis-haproxy-deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.haproxy.enabled }}
 kind: Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: {{ template "redis-ha.fullname" . }}-haproxy
   labels: