diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml index b36edea31006e403d641e7d5915b85291968638e..9709ee800df5bef39a907e4df1225397399ee85b 100644 --- a/charts/redis/Chart.yaml +++ b/charts/redis/Chart.yaml @@ -8,7 +8,7 @@ maintainers: - name: groundhog2k # This is the chart version -version: 0.2.6 +version: 0.2.7 # This is the version number of the application being deployed. appVersion: "6.0.10" diff --git a/charts/redis/README.md b/charts/redis/README.md index bb27dfa72f621dcdf55027f276baa3bcb87acd81..76e6431fab483298479fef6d69da218f8b233508 100644 --- a/charts/redis/README.md +++ b/charts/redis/README.md @@ -1,6 +1,6 @@ # Redis -   +   A Helm chart for Redis on Kubernetes @@ -56,6 +56,8 @@ $ helm uninstall my-release | imagePullSecrets | list | `[]` | Image pull secrets | | livenessProbe | object | `see values.yaml` | Liveness probe configurationm | | readinessProbe | object | `see values.yaml` | Readiness probe configuration | +| customLivenessProbe | object | `{}` | Custom liveness probe (overwrites default liveness probe configuration) | +| customReadinessProbe | object | `{}` | Custom readiness probe (overwrites default readiness probe configuration) | | resources | object | `{}` | Resource limits and requests | | nodeSelector | object | `{}` | Deployment node selector | | podAnnotations | object | `{}` | Additional pod annotations | @@ -92,5 +94,4 @@ $ helm uninstall my-release | Key | Type | Default | Description | |-----|------|---------|-------------| -| arguments | string | `nil` | Arguments for the container entrypoint process | | redisConfig | string | `nil` | Custom redis.conf | diff --git a/charts/redis/templates/statefulset.yaml b/charts/redis/templates/statefulset.yaml index a50d84df69b2e8141f2f671e99dec69ae8955b1c..3c964f9ceb75c62966677b1f4354d2090815cc80 100644 --- a/charts/redis/templates/statefulset.yaml +++ b/charts/redis/templates/statefulset.yaml @@ -12,10 +12,11 @@ spec: {{- include "redis.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/customconfig: {{ include (print $.Template.BasePath "/customconfig.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} - {{- end }} + {{- end }} labels: {{- include "redis.selectorLabels" . | nindent 8 }} spec: @@ -40,7 +41,11 @@ spec: - name: redis containerPort: 6379 protocol: TCP - {{- if .Values.livenessProbe.enabled }} + {{- if .Values.customLivenessProbe }} + livenessProbe: + {{- toYaml .Values.customLivenessProbe | nindent 12 }} + {{- else }} + {{- if .Values.livenessProbe.enabled }} livenessProbe: exec: command: @@ -55,6 +60,11 @@ spec: periodSeconds: {{ .periodSeconds }} {{- end }} {{- end }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: + {{- toYaml .Values.customReadinessProbe | nindent 12 }} + {{- else }} {{- if .Values.readinessProbe.enabled }} readinessProbe: exec: @@ -70,6 +80,7 @@ spec: periodSeconds: {{ .periodSeconds }} {{- end }} {{- end }} + {{- end }} {{- with .Values.resources }} resources: {{- toYaml . | nindent 12 }} diff --git a/charts/redis/values.yaml b/charts/redis/values.yaml index ff7b428a90aefa60922074d7ec9d122cdc355f14..ee01f4bfd94b866d65ddc79dc70ae86b3d32eea0 100644 --- a/charts/redis/values.yaml +++ b/charts/redis/values.yaml @@ -65,6 +65,9 @@ tolerations: [] affinity: {} +## Custom liveness probe (overwrites default liveness probe) +customLivenessProbe: {} + ## Default liveness probe livenessProbe: enabled: true @@ -74,6 +77,9 @@ livenessProbe: successThreshold: 1 periodSeconds: 10 +## Custom readiness probe (overwrites default readiness probe) +customReadinessProbe: {} + ## Default readiness probe readinessProbe: enabled: true