From 289bad540c2535835230529427fc88418c27a576 Mon Sep 17 00:00:00 2001
From: Emile M <85408372+EBMBA@users.noreply.github.com>
Date: Tue, 21 Nov 2023 23:38:58 +0100
Subject: [PATCH] feat: add tolerations on etcd sts (#387)

---
 charts/kamaji/Chart.yaml              | 2 +-
 charts/kamaji/README.md               | 3 ++-
 charts/kamaji/templates/etcd_sts.yaml | 4 ++++
 charts/kamaji/values.yaml             | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/kamaji/Chart.yaml b/charts/kamaji/Chart.yaml
index f9ded56..20a7509 100644
--- a/charts/kamaji/Chart.yaml
+++ b/charts/kamaji/Chart.yaml
@@ -15,7 +15,7 @@ name: kamaji
 sources:
 - https://github.com/clastix/kamaji
 type: application
-version: 0.12.9
+version: 0.13.0
 annotations:
   catalog.cattle.io/certified: partner
   catalog.cattle.io/release-name: kamaji
diff --git a/charts/kamaji/README.md b/charts/kamaji/README.md
index 909d6a1..fda4b92 100644
--- a/charts/kamaji/README.md
+++ b/charts/kamaji/README.md
@@ -1,6 +1,6 @@
 # kamaji
 
-![Version: 0.12.9](https://img.shields.io/badge/Version-0.12.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.3.5](https://img.shields.io/badge/AppVersion-v0.3.5-informational?style=flat-square)
+![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.3.5](https://img.shields.io/badge/AppVersion-v0.3.5-informational?style=flat-square)
 
 Kamaji is a Kubernetes Control Plane Manager.
 
@@ -105,6 +105,7 @@ Here the values you can override:
 | etcd.port | int | `2379` | The client request port. |
 | etcd.serviceAccount.create | bool | `true` | Create a ServiceAccount, required to install and provision the etcd backing storage (default: true) |
 | etcd.serviceAccount.name | string | `""` | Define the ServiceAccount name to use during the setup and provision of the etcd backing storage (default: "") |
+| etcd.tolerations | list | `[]` | (array) Kubernetes affinity rules to apply to Kamaji etcd pods |
 | extraArgs | list | `[]` | A list of extra arguments to add to the kamaji controller default ones |
 | fullnameOverride | string | `""` |  |
 | healthProbeBindAddress | string | `":8081"` | The address the probe endpoint binds to. (default ":8081") |
diff --git a/charts/kamaji/templates/etcd_sts.yaml b/charts/kamaji/templates/etcd_sts.yaml
index b3863ec..516873b 100644
--- a/charts/kamaji/templates/etcd_sts.yaml
+++ b/charts/kamaji/templates/etcd_sts.yaml
@@ -22,6 +22,10 @@ spec:
         - name: certs
           secret:
             secretName: {{ include "etcd.caSecretName" . }}
+      {{- with .Values.etcd.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: etcd
           image: {{ .Values.etcd.image.repository }}:{{ .Values.etcd.image.tag | default "v3.5.4" }}
diff --git a/charts/kamaji/values.yaml b/charts/kamaji/values.yaml
index 092b3fd..6dc584d 100644
--- a/charts/kamaji/values.yaml
+++ b/charts/kamaji/values.yaml
@@ -60,6 +60,9 @@ etcd:
     # -- The custom annotations to add to the PVC
     customAnnotations: {}
     #  volumeType: local
+  
+  # -- (array) Kubernetes affinity rules to apply to Kamaji etcd pods
+  tolerations: []
 
   overrides:
     caSecret: