diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml index bc6d7d1..e61de51 100644 --- a/charts/redis-ha/Chart.yaml +++ b/charts/redis-ha/Chart.yaml @@ -5,7 +5,7 @@ keywords: - redis - keyvalue - database -version: 4.34.8 +version: 4.34.9 appVersion: 8.2.1 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management icon: https://img.icons8.com/external-tal-revivo-shadow-tal-revivo/24/external-redis-an-in-memory-data-structure-project-implementing-a-distributed-logo-shadow-tal-revivo.png diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 40c3e58..b2854a3 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -133,6 +133,7 @@ The following table lists the configurable parameters of the Redis chart and the | `redis.livenessProbe.successThreshold` | Success threshold for liveness probe | int | `1` | | `redis.livenessProbe.timeoutSeconds` | Timeout seconds for liveness probe | int | `15` | | `redis.masterGroupName` | Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated | string | `"mymaster"` | +| `redis.podAnnotations` | Annotations to be added to the redis statefulset pods | object | `{}` | | `redis.port` | Port to access the redis service | int | `6379` | | `redis.readinessProbe` | Readiness probe parameters for redis container | object | `{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15}` | | `redis.readinessProbe.enabled` | Enable the Readiness Probe | bool | `true` | @@ -276,6 +277,7 @@ The following table lists the configurable parameters of the Redis chart and the | `haproxy.networkPolicy.enabled` | whether NetworkPolicy for Haproxy should be created | bool | `false` | | `haproxy.networkPolicy.ingressRules` | user defined ingress rules that Haproxy should permit into. uses the format defined in https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors | list | `[]` | | `haproxy.networkPolicy.labels` | Labels for Haproxy NetworkPolicy | object | `{}` | +| `haproxy.podAnnotations` | Annotations to be added to the HAProxy deployment pods | object | `{}` | | `haproxy.podDisruptionBudget` | Pod Disruption Budget ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ | object | `{}` | | `haproxy.priorityClassName` | Kubernetes priorityClass name for the haproxy pod | string | `""` | | `haproxy.readOnly` | Enable read-only redis-slaves | object | `{"enabled":false,"port":6380}` | diff --git a/charts/redis-ha/templates/redis-haproxy-deployment.yaml b/charts/redis-ha/templates/redis-haproxy-deployment.yaml index c334d36..2acf63f 100644 --- a/charts/redis-ha/templates/redis-haproxy-deployment.yaml +++ b/charts/redis-ha/templates/redis-haproxy-deployment.yaml @@ -48,8 +48,8 @@ spec: prometheus.io/path: "{{ .Values.haproxy.metrics.scrapePath }}" {{- end }} checksum/config: {{ print (include "config-haproxy.cfg" .) (include "config-haproxy_init.sh" .) | sha256sum }} - {{- if .Values.haproxy.annotations }} -{{ toYaml .Values.haproxy.annotations | indent 8 }} + {{- if .Values.haproxy.podAnnotations }} +{{ toYaml .Values.haproxy.podAnnotations | indent 8 }} {{- end }} spec: # Needed when using unmodified rbac-setup.yml diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml index 4ee5252..84e8eb9 100644 --- a/charts/redis-ha/values.yaml +++ b/charts/redis-ha/values.yaml @@ -145,8 +145,12 @@ haproxy: # -- HAProxy deployment annotations deploymentAnnotations: {} + # -- Annotations to be added to the HAProxy deployment pods + podAnnotations: {} + # -- HAProxy resources resources: {} + # -- Configuration of `emptyDir` emptyDir: {} @@ -481,6 +485,9 @@ redis: # -- Annotations for the redis statefulset annotations: {} + # -- Annotations to be added to the redis statefulset pods + podAnnotations: {} + # -- Update strategy for Redis StatefulSet ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies updateStrategy: