merge master (#17528)

Signed-off-by: Xiang Dai <764524258@qq.com>
This commit is contained in:
Xiang Dai
2019-10-02 19:34:08 -07:00
committed by Kubernetes Prow Robot
parent d4e2858498
commit 83c006514b
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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
@@ -1,6 +1,6 @@
{{- if .Values.haproxy.enabled }}
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: {{ template "redis-ha.fullname" . }}-haproxy
labels: