Skip to content

fix: default leader/follower replicas to clusterSize #1681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arpan57 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: default leader/follower replicas to clusterSize #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/redis-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ helm delete <my-release> --namespace <namespace>
| redisCluster.follower.pdb.maxUnavailable | int | `1` | |
| redisCluster.follower.pdb.minAvailable | int | `1` | |
| redisCluster.follower.readinessProbe | object | `{}` | |
| redisCluster.follower.replicas | int | `3` | Number of Redis follower (slave) nodes. If not set, uses clusterSize value |
| redisCluster.follower.replicas | int | `nil` | Number of Redis follower (slave) nodes. If not set, uses clusterSize value |
| redisCluster.follower.securityContext | object | `{}` | |
| redisCluster.follower.serviceType | string | `"ClusterIP"` | |
| redisCluster.follower.tolerations | list | `[]` | |
Expand All @@ -93,7 +93,7 @@ helm delete <my-release> --namespace <namespace>
| redisCluster.leader.pdb.maxUnavailable | int | `1` | |
| redisCluster.leader.pdb.minAvailable | int | `1` | |
| redisCluster.leader.readinessProbe | object | `{}` | |
| redisCluster.leader.replicas | int | `3` | Number of Redis leader (master) nodes. If not set, uses clusterSize value |
| redisCluster.leader.replicas | int | `nil` | Number of Redis leader (master) nodes. If not set, uses clusterSize value |
| redisCluster.leader.securityContext | object | `{}` | |
| redisCluster.leader.serviceType | string | `"ClusterIP"` | |
| redisCluster.leader.tolerations | list | `[]` | |
Expand Down Expand Up @@ -127,4 +127,4 @@ helm delete <my-release> --namespace <namespace>
| storageSpec.nodeConfVolumeClaimTemplate.spec.accessModes[0] | string | `"ReadWriteOnce"` | |
| storageSpec.nodeConfVolumeClaimTemplate.spec.resources.requests.storage | string | `"1Gi"` | |
| storageSpec.volumeClaimTemplate.spec.accessModes[0] | string | `"ReadWriteOnce"` | |
| storageSpec.volumeClaimTemplate.spec.resources.requests.storage | string | `"1Gi"` | |
| storageSpec.volumeClaimTemplate.spec.resources.requests.storage | string | `"1Gi"` | |
3 changes: 2 additions & 1 deletion charts/redis-cluster/templates/follower-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and (gt (int .Values.redisCluster.follower.replicas) 0) (eq .Values.externalService.enabled true) }}
{{- $followerReplicas := .Values.redisCluster.follower.replicas | default .Values.redisCluster.clusterSize }}
{{- if and (gt (int $followerReplicas) 0) (eq .Values.externalService.enabled true) }}
---
apiVersion: v1
kind: Service
Expand Down
3 changes: 2 additions & 1 deletion charts/redis-cluster/templates/follower-sm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and (eq .Values.serviceMonitor.enabled true) (gt (int .Values.redisCluster.follower.replicas) 0) }}
{{- $followerReplicas := .Values.redisCluster.follower.replicas | default .Values.redisCluster.clusterSize }}
{{- if and (eq .Values.serviceMonitor.enabled true) (gt (int $followerReplicas) 0) }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
Expand Down
3 changes: 2 additions & 1 deletion charts/redis-cluster/templates/leader-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and (gt (int .Values.redisCluster.leader.replicas) 0) (eq .Values.externalService.enabled true) }}
{{- $leaderReplicas := .Values.redisCluster.leader.replicas | default .Values.redisCluster.clusterSize }}
{{- if and (gt (int $leaderReplicas) 0) (eq .Values.externalService.enabled true) }}
---
apiVersion: v1
kind: Service
Expand Down
3 changes: 2 additions & 1 deletion charts/redis-cluster/templates/leader-sm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and (eq .Values.serviceMonitor.enabled true) (gt (int .Values.redisCluster.leader.replicas) 0) }}
{{- $leaderReplicas := .Values.redisCluster.leader.replicas | default .Values.redisCluster.clusterSize }}
{{- if and (eq .Values.serviceMonitor.enabled true) (gt (int $leaderReplicas) 0) }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-cluster/templates/redis-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ spec:
persistenceEnabled: {{ .Values.redisCluster.persistenceEnabled }}
clusterVersion: {{ .Values.redisCluster.clusterVersion }}
redisLeader: {{- include "redis.role" .Values.redisCluster.leader | nindent 4 }}
replicas: {{ .Values.redisCluster.leader.replicas }}
replicas: {{ .Values.redisCluster.leader.replicas | default .Values.redisCluster.clusterSize }}
{{- if .Values.externalConfig.enabled }}
redisConfig:
additionalRedisConfig: "{{ .Values.redisCluster.name | default .Release.Name }}-ext-config"
{{- end }}

redisFollower: {{- include "redis.role" .Values.redisCluster.follower | nindent 4 }}
replicas: {{ .Values.redisCluster.follower.replicas }}
replicas: {{ .Values.redisCluster.follower.replicas | default .Values.redisCluster.clusterSize }}
{{- if .Values.externalConfig.enabled }}
redisConfig:
additionalRedisConfig: "{{ .Values.redisCluster.name | default .Release.Name }}-ext-config"
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ redisCluster:
enableMasterSlaveAntiAffinity: false
leader:
# -- Number of Redis leader (master) nodes. If not set, uses clusterSize value
replicas: 3
replicas: null
serviceType: ClusterIP
affinity: {}
# nodeAffinity:
Expand Down Expand Up @@ -86,7 +86,7 @@ redisCluster:

follower:
# -- Number of Redis follower (slave) nodes. If not set, uses clusterSize value
replicas: 3
replicas: null
serviceType: ClusterIP
affinity: null
# nodeAffinity:
Expand Down