kubesphere · wansir · Mar 28, 2024 · Mar 28, 2024
diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.17
+version: 0.6.18
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -16,6 +16,6 @@ appVersion: "v4.1.0-beta.0"
 
 dependencies:
   - name: redis-ha
-    version: 3.9.0
+    version: 4.26.1
     alias: redisHA
     condition: redisHA.enabled
diff --git a/src/test/ks-core/charts/redis-ha/Chart.yaml b/src/test/ks-core/charts/redis-ha/Chart.yaml
@@ -1,24 +1,21 @@
-apiVersion: v1
-name: redis-ha
+apiVersion: v2
+appVersion: 7.2.4
+description: This Helm chart provides a highly available Redis implementation with
+  a master/slave configuration and uses Sentinel sidecars for failover management
 home: http://redis.io/
-engine: gotpl
+icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
 keywords:
 - redis
 - keyvalue
 - database
-version: 3.9.0
-appVersion: 5.0.14
-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
 maintainers:
 - email: [email protected]
   name: ssalaues
 - email: [email protected]
   name: dandydeveloper
-details:
-  This Helm chart provides a highly available Redis implementation with a master/slave configuration
-  and uses Sentinel sidecars for failover management
+name: redis-ha
 sources:
 - https://redis.io/download
-- https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha
+- https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha
 - https://github.com/oliver006/redis_exporter
+version: 4.26.1
diff --git a/src/test/ks-core/charts/redis-ha/README.md b/src/test/ks-core/charts/redis-ha/README.md
diff --git a/src/test/ks-core/charts/redis-ha/ci/haproxy-enabled-values.yaml b/src/test/ks-core/charts/redis-ha/ci/haproxy-enabled-values.yaml
@@ -6,5 +6,5 @@ haproxy:
     any.domain/key: "value"
   serviceAccount:
     create: true
-  exporter:
-    enabled: false
+  metrics:
+    enabled: true
diff --git a/src/test/ks-core/charts/redis-ha/templates/NOTES.txt b/src/test/ks-core/charts/redis-ha/templates/NOTES.txt
@@ -1,4 +1,4 @@
-Redis can be accessed via port {{ .Values.redis.port }} and Sentinel can be accessed via port {{ .Values.sentinel.port }} on the following DNS name from within your cluster:
+Redis can be accessed via {{ if ne (int .Values.redis.port) 0 }}port {{ .Values.redis.port }}{{ end }}  {{ if .Values.redis.tlsPort }} tls-port {{ .Values.redis.tlsPort }}{{ end }} and Sentinel can be accessed via {{ if ne (int .Values.sentinel.port) 0 }}port {{ .Values.sentinel.port }}{{ end }}  {{ if .Values.sentinel.tlsPort }} tls-port {{ .Values.sentinel.tlsPort }}{{ end }}  on the following DNS name from within your cluster:
 {{ template "redis-ha.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
 To connect to your Redis server:
@@ -9,15 +9,15 @@ To connect to your Redis server:
 
 2. Connect to the Redis master pod that you can use as a client. By default the {{ template "redis-ha.fullname" . }}-server-0 pod is configured as the master:
 
-   kubectl exec -it {{ template "redis-ha.fullname" . }}-server-0 sh -n {{ .Release.Namespace }}
+   kubectl exec -it {{ template "redis-ha.fullname" . }}-server-0 -n {{ .Release.Namespace }} -c redis -- sh
 
 3. Connect using the Redis CLI (inside container):
 
    redis-cli -a <REDIS-PASS-FROM-SECRET>
 {{- else }}
 1. Run a Redis pod that you can use as a client:
 
-   kubectl exec -it {{ template "redis-ha.fullname" . }}-server-0 sh -n {{ .Release.Namespace }}
+   kubectl exec -it {{ template "redis-ha.fullname" . }}-server-0 -n {{ .Release.Namespace }} -c redis -- sh
 
 2. Connect using the Redis CLI:
 

diff --git a/src/test/ks-core/charts/redis-ha/templates/_configs.tpl b/src/test/ks-core/charts/redis-ha/templates/_configs.tpl
diff --git a/src/test/ks-core/charts/redis-ha/templates/_helpers.tpl b/src/test/ks-core/charts/redis-ha/templates/_helpers.tpl
@@ -5,7 +5,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "redis-ha.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" | lower -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -25,6 +25,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 
+
 {{- /*
 Credit: @technosophos
 https://github.com/technosophos/common-chart/
@@ -62,48 +63,23 @@ Create the name of the service account to use
 {{- end -}}
 {{- end -}}
 
-{{- define "common.images.image" -}}
-{{- $registryName := .global.imageRegistry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- $separator := ":" -}}
-{{- $termination := .global.tag | toString -}}
-{{- if .imageRoot.registry }}
-    {{- $registryName = .imageRoot.registry -}}
-{{- end -}}
-{{- if .imageRoot.tag }}
-    {{- $termination = .imageRoot.tag | toString -}}
-{{- end -}}
-{{- if .imageRoot.digest }}
-    {{- $separator = "@" -}}
-    {{- $termination = .imageRoot.digest | toString -}}
-{{- end -}}
-{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}}
-{{- end -}}
-
-{{/*
-Return the proper Redis image name
-*/}}
-{{- define "image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
+{{- define "redis-ha.masterGroupName" -}}
+{{- $masterGroupName := tpl ( .Values.redis.masterGroupName | default "") . -}}
+{{- $validMasterGroupName := regexMatch "^[\\w-\\.]+$" $masterGroupName -}}
+{{- if $validMasterGroupName -}}
+{{ $masterGroupName }}
+{{- else -}}
+{{ required "A valid .Values.redis.masterGroupName entry is required (matching ^[\\w-\\.]+$)" ""}}
 {{- end -}}
-
-{{/*
-Return the proper Haproxy image name
-*/}}
-{{- define "haproxy.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.haproxy.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
-Return the proper Haproxy Exporter image name
+Return the appropriate apiVersion for poddisruptionbudget.
 */}}
-{{- define "haproxy.exporter.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.haproxy.exporter.image "global" .Values.global) }}
+{{- define "redis-ha.podDisruptionBudget.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+{{- print "policy/v1" -}}
+{{- else -}}
+{{- print "policy/v1beta1" -}}
 {{- end -}}
-
-{{/*
-Return sysctl image
-*/}}
-{{- define "redis.sysctl.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.sysctlImage "global" .Values.global) }}
 {{- end -}}
diff --git a/src/test/ks-core/charts/redis-ha/templates/_images.tpl b/src/test/ks-core/charts/redis-ha/templates/_images.tpl
@@ -0,0 +1,38 @@
+{{/*
+Return the proper image name
+*/}}
+
+{{- define "common.images.image" -}}
+{{- $registryName := .global.imageRegistry -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $separator := ":" -}}
+{{- $termination := .global.tag | toString -}}
+{{- if .imageRoot.registry }}
+    {{- $registryName = .imageRoot.registry -}}
+{{- end -}}
+{{- if .imageRoot.tag }}
+    {{- $termination = .imageRoot.tag | toString -}}
+{{- end -}}
+{{- if .imageRoot.digest }}
+    {{- $separator = "@" -}}
+    {{- $termination = .imageRoot.digest | toString -}}
+{{- end -}}
+{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}}
+{{- end -}}
+
+
+{{- define "image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
+{{- end -}}
+
+{{- define "haproxy.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.haproxy.image "global" .Values.global) }}
+{{- end -}}
+
+{{- define "sysctlImage" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.sysctlImage "global" .Values.global) }}
+{{- end -}}
+
+{{- define "exporter.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.exporter.image "global" .Values.global) }}
+{{- end -}}
diff --git a/src/test/ks-core/charts/redis-ha/templates/redis-auth-secret.yaml b/src/test/ks-core/charts/redis-ha/templates/redis-auth-secret.yaml
@@ -3,8 +3,12 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "redis-ha.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "labels.standard" . | indent 4 }}
+    {{- range $key, $value := .Values.extraLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
 type: Opaque
 data:
   {{ .Values.authKey }}: {{ .Values.redisPassword | b64enc | quote }}

diff --git a/src/test/ks-core/charts/redis-ha/templates/redis-ha-announce-service.yaml b/src/test/ks-core/charts/redis-ha/templates/redis-ha-announce-service.yaml
@@ -1,36 +1,61 @@
 {{- $fullName := include "redis-ha.fullname" . }}
-{{- $replicas := int .Values.replicas }}
+{{- $namespace := .Release.Namespace -}}
+{{- $replicas := int (toString .Values.replicas) }}
 {{- $root := . }}
 {{- range $i := until $replicas }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ $fullName }}-announce-{{ $i }}
+  namespace: {{ $namespace | quote}}
   labels:
 {{ include "labels.standard" $root | indent 4 }}
+    {{- range $key, $value := $root.Values.extraLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
   annotations:
+{{- if (semverCompare "<=1.10-0" $.Capabilities.KubeVersion.GitVersion) }}
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+{{- end }}
   {{- if $root.Values.serviceAnnotations }}
 {{ toYaml $root.Values.serviceAnnotations | indent 4 }}
   {{- end }}
 spec:
+{{- if (semverCompare ">=1.11-0" $.Capabilities.KubeVersion.GitVersion) }}
   publishNotReadyAddresses: true
+{{- end }}
   type: ClusterIP
   ports:
-  - name: server
+  {{- if ne (int $root.Values.redis.port) 0 }}
+  - name: tcp-server
     port: {{ $root.Values.redis.port }}
     protocol: TCP
     targetPort: redis
-  - name: sentinel
+  {{- end }}
+  {{- if $root.Values.redis.tlsPort }}
+  - name: server-tls
+    port: {{ $root.Values.redis.tlsPort }}
+    protocol: TCP
+    targetPort: redis-tls
+  {{- end }}
+  {{- if ne (int $root.Values.sentinel.port) 0 }}
+  - name: tcp-sentinel
     port: {{ $root.Values.sentinel.port }}
     protocol: TCP
     targetPort: sentinel
+  {{- end }}
+  {{- if $root.Values.sentinel.tlsPort }}
+  - name: sentinel-tls
+    port: {{ $root.Values.sentinel.tlsPort }}
+    protocol: TCP
+    targetPort: sentinel-tls
+  {{- end }}
   {{- if $root.Values.exporter.enabled }}
-  - name: exporter
+  - name: http-exporter
     port: {{ $root.Values.exporter.port }}
     protocol: TCP
-    targetPort: exporter-port
+    targetPort: {{ $root.Values.exporter.portName }}
   {{- end }}
   selector:
     release: {{ $root.Release.Name }}

diff --git a/src/test/ks-core/charts/redis-ha/templates/redis-ha-configmap.yaml b/src/test/ks-core/charts/redis-ha/templates/redis-ha-configmap.yaml
@@ -2,11 +2,18 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "redis-ha.fullname" . }}-configmap
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app: {{ template "redis-ha.fullname" . }}
+    {{- range $key, $value := .Values.configmap.labels }}
+    {{ $key }}: {{ $value | toString }}
+    {{- end }}
+    {{- range $key, $value := .Values.extraLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
 data:
   redis.conf: |
 {{- include "config-redis.conf" . }}
@@ -16,9 +23,15 @@ data:
 
   init.sh: |
 {{- include "config-init.sh" . }}
+
+  fix-split-brain.sh: |
+{{- include "fix-split-brain.sh" . }}
+
 {{ if .Values.haproxy.enabled }}
-  haproxy.cfg: |-
+  haproxy.cfg: |
 {{- include "config-haproxy.cfg" . }}
 {{- end }}
   haproxy_init.sh: |
 {{- include "config-haproxy_init.sh" . }}
+  trigger-failover-if-master.sh: |
+{{- include "trigger-failover-if-master.sh" . }}
diff --git a/src/test/ks-core/charts/redis-ha/templates/redis-ha-exporter-script-configmap.yaml b/src/test/ks-core/charts/redis-ha/templates/redis-ha-exporter-script-configmap.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.exporter.script }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "redis-ha.fullname" . }}-exporter-script-configmap
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+{{ include "labels.standard" . | indent 4 }}
+    {{- range $key, $value := .Values.extraLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+data:
+  script: {{ toYaml .Values.exporter.script | indent 2 }}
+{{- end }}
diff --git a/src/test/ks-core/charts/redis-ha/templates/redis-ha-health-configmap.yaml b/src/test/ks-core/charts/redis-ha/templates/redis-ha-health-configmap.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "redis-ha.fullname" . }}-health-configmap
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    app: {{ template "redis-ha.fullname" . }}
+    {{- range $key, $value := .Values.extraLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+data:
+  redis_liveness.sh: |
+{{- include "redis_liveness.sh" . }}
+  redis_readiness.sh: |
+{{- include "redis_readiness.sh" . }}
+  sentinel_liveness.sh: |
+{{- include "sentinel_liveness.sh" . }}