From 61dbe860a2519e70033de651a59593ba2de8e8ac Mon Sep 17 00:00:00 2001 From: "Marco Maurer (-Kilchhofer)" Date: Tue, 28 May 2024 22:10:28 +0200 Subject: [PATCH] feat: Add ability to define priorityClassName globally (#279) Signed-off-by: Marco Maurer --- charts/redis-ha/Chart.yaml | 2 +- charts/redis-ha/README.md | 1 + charts/redis-ha/templates/redis-ha-statefulset.yaml | 4 ++-- charts/redis-ha/templates/redis-haproxy-deployment.yaml | 6 +++--- charts/redis-ha/values.yaml | 5 +++++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/charts/redis-ha/Chart.yaml b/charts/redis-ha/Chart.yaml index 9d356b6..f981eb4 100644 --- a/charts/redis-ha/Chart.yaml +++ b/charts/redis-ha/Chart.yaml @@ -5,7 +5,7 @@ keywords: - redis - keyvalue - database -version: 4.26.6 +version: 4.27.0 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 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png diff --git a/charts/redis-ha/README.md b/charts/redis-ha/README.md index 136bd98..c4dbddc 100644 --- a/charts/redis-ha/README.md +++ b/charts/redis-ha/README.md @@ -60,6 +60,7 @@ The following table lists the configurable parameters of the Redis chart and the | Parameter | Description | Default | |:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| +| `global.priorityClassName`| Default priority class for all components (HAProxy Deployment and Redis StatefulSet) | `""` | | `image.repository` | Redis image repository | `redis` | | `image.tag` | Redis image tag | `6.2.5-alpine` | | `image.pullPolicy` | Redis image pull policy | `IfNotPresent` | diff --git a/charts/redis-ha/templates/redis-ha-statefulset.yaml b/charts/redis-ha/templates/redis-ha-statefulset.yaml index 610358c..09c75f1 100644 --- a/charts/redis-ha/templates/redis-ha-statefulset.yaml +++ b/charts/redis-ha/templates/redis-ha-statefulset.yaml @@ -520,9 +520,9 @@ spec: {{- if .Values.extraContainers }} {{- toYaml .Values.extraContainers | nindent 6 }} {{- end -}} -{{- if .Values.priorityClassName }} + {{- with .Values.priorityClassName | default .Values.global.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} -{{- end }} + {{- end }} volumes: - name: config configMap: diff --git a/charts/redis-ha/templates/redis-haproxy-deployment.yaml b/charts/redis-ha/templates/redis-haproxy-deployment.yaml index f67f6d9..50d2f50 100644 --- a/charts/redis-ha/templates/redis-haproxy-deployment.yaml +++ b/charts/redis-ha/templates/redis-haproxy-deployment.yaml @@ -178,9 +178,9 @@ spec: {{- end }} lifecycle: {{ toYaml .Values.haproxy.lifecycle | indent 10 }} -{{- if .Values.haproxy.priorityClassName }} - priorityClassName: {{ .Values.haproxy.priorityClassName }} -{{- end }} + {{- with .Values.haproxy.priorityClassName | default .Values.global.priorityClassName }} + priorityClassName: {{ . }} + {{- end }} volumes: {{- if .Values.haproxy.tls.enabled }} - name: pemfile diff --git a/charts/redis-ha/values.yaml b/charts/redis-ha/values.yaml index a063ba1..06908ad 100644 --- a/charts/redis-ha/values.yaml +++ b/charts/redis-ha/values.yaml @@ -1,3 +1,8 @@ +## Globally shared configuration +global: + # -- Default priority class for all components + priorityClassName: "" + ## Configure resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ##