[stable/redis-ha] replace slave deployment to statefulset + create separate pvc for masters and slaves (#2696)

* Update redis image

* delete blank lines

* fix chart version

* delete tailing spaces

* new line

* new line character in the end

* fix persistance volume claim | pvc was pointing to a wrong claim

* add image repos in chart's sources

* Create 2 PVC for Master and slave components and update Slave deployment to Statefulset

* bump to version 0.3.0

* Update Chart version --> 1.0.0

* Fix typo
This commit is contained in:
Ismail Kaboubi
2017-11-13 15:56:41 -08:00
committed by Vic Iglesias
parent 4e184747da
commit 1eff743f76
7 changed files with 65 additions and 38 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ keywords:
- redis
- keyvalue
- database
version: 0.2.3
version: 1.0.0
description: Highly available Redis cluster with multiple sentinels and standbys.
icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
maintainers:
@@ -1,34 +0,0 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "fullname" . }}
labels:
redis-node: "true"
{{ include "labels.standard" . | indent 4 }}
spec:
replicas: {{ .Values.replicas.slave }}
template:
metadata:
labels:
name: redis
role: replica
{{ include "labels.standard" . | indent 8 }}
spec:
containers:
- name: redis
image: "{{ .Values.redis_image }}"
resources:
{{ toYaml .Values.resources.slave | indent 10 }}
ports:
- containerPort: 6379
volumeMounts:
- mountPath: /redis-master-data
name: data
volumes:
- name: data
{{- if .Values.persistentVolume.enabled }}
persistentVolumeClaim:
claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "fullname" . }}{{- end }}
{{- else }}
emptyDir: {}
{{- end -}}
@@ -0,0 +1,25 @@
{{- if .Values.persistentVolume.enabled }}
{{- if not .Values.persistentVolume.existingClaim -}}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "fullname" . }}-master
labels:
{{ include "labels.standard" . | indent 4 }}
annotations:
{{- if .Values.persistentVolume.storageClass }}
volume.beta.kubernetes.io/storage-class: "{{ .Values.persistentVolume.storageClass }}"
{{- else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
{{- if .Values.persistentVolume.annotations }}
{{ toYaml .Values.persistentVolume.annotations | indent 4 }}
{{- end }}
spec:
accessModes:
{{ toYaml .Values.persistentVolume.accessModes | indent 4 }}
resources:
requests:
storage: {{ .Values.persistentVolume.size | quote }}
{{- end }}
{{- end }}
@@ -48,7 +48,7 @@ spec:
- name: data
{{- if .Values.persistentVolume.enabled }}
persistentVolumeClaim:
claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "fullname" . }}{{- end }}
claimName: {{ template "fullname" . }}-master
{{- else }}
emptyDir: {}
{{- end -}}
@@ -3,7 +3,7 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "fullname" . }}
name: {{ template "fullname" . }}-slave
labels:
{{ include "labels.standard" . | indent 4 }}
annotations:
@@ -0,0 +1,36 @@
apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
labels:
name: {{ template "name" . }}-slave
redis-node: "true"
{{ include "labels.standard" . | indent 4 }}
name: {{ template "fullname" . }}-slave
spec:
serviceName: "redis"
replicas: {{ .Values.replicas.slave }}
template:
metadata:
labels:
role: slave
{{ include "labels.standard" . | indent 8 }}
spec:
terminationGracePeriodSeconds: 10
containers:
- name: redis
image: "{{ .Values.redis_image }}"
resources:
{{ toYaml .Values.resources.slave | indent 12 }}
ports:
- containerPort: 6379
volumeMounts:
- mountPath: /redis-master-data
name: data
volumes:
- name: data
{{- if .Values.persistentVolume.enabled }}
persistentVolumeClaim:
claimName: {{ template "fullname" . }}-slave
{{- else }}
emptyDir: {}
{{- end -}}
+1 -1
View File
@@ -47,7 +47,7 @@ persistentVolume:
mountPath: /data
## alertmanager data Persistent Volume size
##
size: 2Gi
size: 8Gi
## Redis data Persistent Volume Storage Class
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>