From 1ea23e312a8e8187274567086705ac738c4359cc Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Mon, 8 Nov 2021 15:03:48 +0300
Subject: [PATCH] Keramblock develop (#3880)

* Fixes for helm chart

* added changelog note

Co-authored-by: Michael Kirpichev <m.kirpichev@haut.ai>
---
 CHANGELOG.md                                      | 1 +
 helm-chart/templates/cvat_backend/deployment.yml  | 6 +++++-
 helm-chart/templates/cvat_frontend/deployment.yml | 6 +++++-
 helm-chart/values.yaml                            | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 456705f5..c6fd9c6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Migration of `dataset_repo` application (<https://github.com/openvinotoolkit/cvat/pull/3827>)
 - Helm settings for external psql database were unused by backend (<https://github.com/openvinotoolkit/cvat/pull/3779>)
 - Updated WSL setup for development (<https://github.com/openvinotoolkit/cvat/pull/3828>)
+- Helm chart config (<https://github.com/openvinotoolkit/cvat/pull/3784>)
 
 ### Security
 
diff --git a/helm-chart/templates/cvat_backend/deployment.yml b/helm-chart/templates/cvat_backend/deployment.yml
index dcfc3583..1f0c701f 100644
--- a/helm-chart/templates/cvat_backend/deployment.yml
+++ b/helm-chart/templates/cvat_backend/deployment.yml
@@ -141,10 +141,14 @@ spec:
           {{- with .Values.cvat.backend.additionalVolumeMounts }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-      {{- with .Values.cvat.frontend.affinity }}
+      {{- with .Values.cvat.backend.affinity }}
       affinity:
       {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.cvat.backend.tolerations }}
+      tolerations:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         {{- if .Values.cvat.backend.defaultStorage.enabled }}
         - name: cvat-backend-data
diff --git a/helm-chart/templates/cvat_frontend/deployment.yml b/helm-chart/templates/cvat_frontend/deployment.yml
index dc01c17f..9274469e 100644
--- a/helm-chart/templates/cvat_frontend/deployment.yml
+++ b/helm-chart/templates/cvat_frontend/deployment.yml
@@ -51,10 +51,14 @@ spec:
       volumes:
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.cvat.frontend.affinity }}
+      {{- with .Values.cvat.frontend.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.cvat.frontend.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 62fbf448..17ed7649 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -18,6 +18,7 @@ cvat:
     # test.io/test: test
     resources: {}
     affinity: {}
+    tolerations: []
     # nodeAffinity:
     #   requiredDuringSchedulingIgnoredDuringExecution:
     #     nodeSelectorTerms:
@@ -65,6 +66,7 @@ cvat:
     # test.io/test: test
     resources: {}
     affinity: {}
+    tolerations: []
     # nodeAffinity:
     #   requiredDuringSchedulingIgnoredDuringExecution:
     #     nodeSelectorTerms: