From eb7e719dc586b4be5671b91bde060afa8c9c8ad8 Mon Sep 17 00:00:00 2001
From: Ferdinand Niedermann <ferdinand.niedermann@gmail.com>
Date: Wed, 12 Jan 2022 12:49:36 +0100
Subject: [PATCH] Make user-data-permission-fix optional (#3994)

* Make user-data-permission-fix optional

* Update CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: u231555 <ferdinand.niedermann@sbb.ch>
Co-authored-by: Nikita Manovich <nikita.manovich@intel.com>
Co-authored-by: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
---
 CHANGELOG.md                                     | 1 +
 helm-chart/templates/cvat_backend/deployment.yml | 2 ++
 helm-chart/values.yaml                           | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0472d8a..6f83fdcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Data sorting option (<https://github.com/openvinotoolkit/cvat/pull/3937>)
 - Options to change font size & position of text labels on the canvas (<https://github.com/openvinotoolkit/cvat/pull/3972>)
 - Add "tag" return type for automatic annotation in Nuclio (<https://github.com/openvinotoolkit/cvat/pull/3896>)
+- Helm chart: Make user-data-permission-fix optional (<https://github.com/openvinotoolkit/cvat/pull/3994>)
 - Advanced identity access management system, using open policy agent (<https://github.com/openvinotoolkit/cvat/pull/3788>)
 - Organizations to create "shared space" for different groups of users (<https://github.com/openvinotoolkit/cvat/pull/3788>)
 - Dataset importing to a project (<https://github.com/openvinotoolkit/cvat/pull/3790>)
diff --git a/helm-chart/templates/cvat_backend/deployment.yml b/helm-chart/templates/cvat_backend/deployment.yml
index 1f0c701f..86cd22d2 100644
--- a/helm-chart/templates/cvat_backend/deployment.yml
+++ b/helm-chart/templates/cvat_backend/deployment.yml
@@ -116,6 +116,7 @@ spec:
           {{- toYaml . | nindent 10 }}
           {{- end }}
       initContainers:
+        {{- if .Values.cvat.backend.permissionFix.enabled }}
         - name: user-data-permission-fix
           image: busybox
           command: ["/bin/chmod", "-R", "777", "/home/django"]
@@ -141,6 +142,7 @@ spec:
           {{- with .Values.cvat.backend.additionalVolumeMounts }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
+        {{- end }}
       {{- with .Values.cvat.backend.affinity }}
       affinity:
       {{- toYaml . | nindent 8 }}
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 17ed7649..f4d1b613 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -12,6 +12,8 @@ cvat:
     replicas: 1
     image: openvino/cvat_server
     tag: latest
+    permissionFix:
+      enabled: true
     labels: {}
     #  test: test
     annotations: {}