mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/redis] Allow creating a cluster without initial slave replicas (#17174)
* [stable/redis] Allow creating a cluster without initial slave replicas Signed-off-by: juan131 <juan@bitnami.com> * [stable/redis] Update components versions Signed-off-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
b24786a150
commit
2a8bbb4a45
@@ -1,6 +1,6 @@
|
||||
apiVersion: v1
|
||||
name: redis
|
||||
version: 9.1.10
|
||||
version: 9.1.11
|
||||
appVersion: 5.0.5
|
||||
description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
|
||||
keywords:
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ template "redis.fullname" . }}
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "redis.fullname" . }}
|
||||
data:
|
||||
redis.conf: |-
|
||||
{{- if .Values.configmap }}
|
||||
|
||||
@@ -5,8 +5,8 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
type: ClusterIP
|
||||
clusterIP: None
|
||||
@@ -21,4 +21,4 @@ spec:
|
||||
{{- end }}
|
||||
selector:
|
||||
app: {{ template "redis.name" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
release: {{ .Release.Name }}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ template "redis.fullname" . }}-health
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "redis.fullname" . }}-health
|
||||
data:
|
||||
ping_readiness_local.sh: |-
|
||||
{{- if .Values.usePasswordFile }}
|
||||
|
||||
@@ -6,12 +6,11 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
{{- if .Values.metrics.service.annotations }}
|
||||
annotations:
|
||||
{{ toYaml .Values.metrics.service.annotations | indent 4 }}
|
||||
{{- end }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- if .Values.metrics.service.annotations }}
|
||||
annotations: {{ toYaml .Values.metrics.service.annotations | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
type: {{ .Values.metrics.service.type }}
|
||||
{{ if eq .Values.metrics.service.type "LoadBalancer" -}} {{ if .Values.metrics.service.loadBalancerIP -}}
|
||||
@@ -25,4 +24,4 @@ spec:
|
||||
selector:
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
kind: NetworkPolicy
|
||||
apiVersion: {{ template "networkPolicy.apiVersion" . }}
|
||||
metadata:
|
||||
name: "{{ template "redis.fullname" . }}"
|
||||
name: {{ template "redis.fullname" . }}
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
podSelector:
|
||||
matchLabels:
|
||||
app: {{ template "redis.name" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
{{- if ge .Values.cluster.slaveCount 1.0 }}
|
||||
release: {{ .Release.Name }}
|
||||
{{- if .Values.cluster.enabled }}
|
||||
policyTypes:
|
||||
- Ingress
|
||||
- Egress
|
||||
@@ -27,8 +27,8 @@ spec:
|
||||
to:
|
||||
- podSelector:
|
||||
matchLabels:
|
||||
release: "{{ .Release.Name }}"
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
{{- end }}
|
||||
ingress:
|
||||
# Allow inbound connections
|
||||
@@ -45,16 +45,16 @@ spec:
|
||||
{{- if .Values.metrics.enabled }}
|
||||
- podSelector:
|
||||
matchLabels:
|
||||
release: "{{ .Release.Name }}"
|
||||
role: metrics
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
role: metrics
|
||||
{{- end }}
|
||||
{{- if ge .Values.cluster.slaveCount 1.0 }}
|
||||
{{- if .Values.cluster.enabled }}
|
||||
- podSelector:
|
||||
matchLabels:
|
||||
release: "{{ .Release.Name }}"
|
||||
role: slave
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
role: slave
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.metrics.enabled }}
|
||||
|
||||
@@ -5,29 +5,28 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
release: "{{ .Release.Name }}"
|
||||
role: master
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
role: master
|
||||
serviceName: {{ template "redis.fullname" . }}-headless
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
release: "{{ .Release.Name }}"
|
||||
chart: {{ template "redis.chart" . }}
|
||||
role: master
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: {{ .Release.Name }}
|
||||
role: master
|
||||
{{- if .Values.master.podLabels }}
|
||||
{{ toYaml .Values.master.podLabels | indent 8 }}
|
||||
{{- end }}
|
||||
{{- if and .Values.metrics.enabled .Values.metrics.podLabels }}
|
||||
{{ toYaml .Values.metrics.podLabels | indent 8 }}
|
||||
{{- end }}
|
||||
|
||||
annotations:
|
||||
checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }}
|
||||
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
||||
@@ -376,10 +375,10 @@ spec:
|
||||
- metadata:
|
||||
name: redis-data
|
||||
labels:
|
||||
app: "{{ template "redis.name" . }}"
|
||||
component: "master"
|
||||
release: {{ .Release.Name | quote }}
|
||||
heritage: {{ .Release.Service | quote }}
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
component: master
|
||||
spec:
|
||||
accessModes:
|
||||
{{- range .Values.master.persistence.accessModes }}
|
||||
|
||||
@@ -6,11 +6,10 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- if .Values.master.service.annotations }}
|
||||
annotations:
|
||||
{{ toYaml .Values.master.service.annotations | indent 4 }}
|
||||
annotations: {{ toYaml .Values.master.service.annotations | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
type: {{ .Values.master.service.type }}
|
||||
@@ -27,6 +26,6 @@ spec:
|
||||
{{- end }}
|
||||
selector:
|
||||
app: {{ template "redis.name" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
release: {{ .Release.Name }}
|
||||
role: master
|
||||
{{- end }}
|
||||
|
||||
@@ -6,8 +6,8 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
rules:
|
||||
{{ toYaml .Values.rbac.role.rules }}
|
||||
{{- end -}}
|
||||
|
||||
@@ -6,8 +6,8 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
|
||||
@@ -6,6 +6,6 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- end -}}
|
||||
|
||||
@@ -6,29 +6,27 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
{{- if .Values.slave.updateStrategy }}
|
||||
strategy:
|
||||
{{ toYaml .Values.slave.updateStrategy | indent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.cluster.slaveCount }}
|
||||
replicas: {{ .Values.cluster.slaveCount }}
|
||||
{{- end }}
|
||||
serviceName: {{ template "redis.fullname" . }}-headless
|
||||
selector:
|
||||
matchLabels:
|
||||
release: "{{ .Release.Name }}"
|
||||
role: slave
|
||||
app: {{ template "redis.name" . }}
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
role: slave
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
release: "{{ .Release.Name }}"
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
role: slave
|
||||
app: {{ template "redis.name" . }}
|
||||
{{- if .Values.slave.podLabels }}
|
||||
{{ toYaml .Values.slave.podLabels | indent 8 }}
|
||||
{{- end }}
|
||||
@@ -394,10 +392,10 @@ spec:
|
||||
- metadata:
|
||||
name: redis-data
|
||||
labels:
|
||||
app: "{{ template "redis.name" . }}"
|
||||
component: "slave"
|
||||
release: {{ .Release.Name | quote }}
|
||||
heritage: {{ .Release.Service | quote }}
|
||||
app: {{ template "redis.name" . }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
component: slave
|
||||
spec:
|
||||
accessModes:
|
||||
{{- range .Values.slave.persistence.accessModes }}
|
||||
|
||||
@@ -6,8 +6,8 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- if .Values.slave.service.annotations }}
|
||||
annotations:
|
||||
{{ toYaml .Values.slave.service.annotations | indent 4 }}
|
||||
@@ -27,6 +27,6 @@ spec:
|
||||
{{- end }}
|
||||
selector:
|
||||
app: {{ template "redis.name" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
release: {{ .Release.Name }}
|
||||
role: slave
|
||||
{{- end }}
|
||||
|
||||
@@ -6,8 +6,8 @@ metadata:
|
||||
labels:
|
||||
app: {{ template "redis.name" . }}
|
||||
chart: {{ template "redis.chart" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
heritage: "{{ .Release.Service }}"
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
{{- if .Values.sentinel.service.annotations }}
|
||||
annotations:
|
||||
{{ toYaml .Values.sentinel.service.annotations | indent 4 }}
|
||||
@@ -33,5 +33,5 @@ spec:
|
||||
{{- end }}
|
||||
selector:
|
||||
app: {{ template "redis.name" . }}
|
||||
release: "{{ .Release.Name }}"
|
||||
release: {{ .Release.Name }}
|
||||
{{- end }}
|
||||
|
||||
@@ -17,7 +17,7 @@ image:
|
||||
## Bitnami Redis image tag
|
||||
## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
|
||||
##
|
||||
tag: 5.0.5-debian-9-r124
|
||||
tag: 5.0.5-debian-9-r138
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
@@ -56,7 +56,7 @@ sentinel:
|
||||
## Bitnami Redis image tag
|
||||
## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
|
||||
##
|
||||
tag: 5.0.5-debian-9-r119
|
||||
tag: 5.0.5-debian-9-r131
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
@@ -443,7 +443,7 @@ metrics:
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/redis-exporter
|
||||
tag: 1.1.0-debian-9-r16
|
||||
tag: 1.1.1-debian-9-r10
|
||||
pullPolicy: IfNotPresent
|
||||
## Optionally specify an array of imagePullSecrets.
|
||||
## Secrets must be manually created in the namespace.
|
||||
|
||||
@@ -17,7 +17,7 @@ image:
|
||||
## Bitnami Redis image tag
|
||||
## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
|
||||
##
|
||||
tag: 5.0.5-debian-9-r124
|
||||
tag: 5.0.5-debian-9-r138
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
@@ -56,7 +56,7 @@ sentinel:
|
||||
## Bitnami Redis image tag
|
||||
## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
|
||||
##
|
||||
tag: 5.0.5-debian-9-r119
|
||||
tag: 5.0.5-debian-9-r131
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
@@ -443,7 +443,7 @@ metrics:
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/redis-exporter
|
||||
tag: 1.1.0-debian-9-r16
|
||||
tag: 1.1.1-debian-9-r10
|
||||
pullPolicy: IfNotPresent
|
||||
## Optionally specify an array of imagePullSecrets.
|
||||
## Secrets must be manually created in the namespace.
|
||||
|
||||
Reference in New Issue
Block a user