Make the Helm chart work with smokescreen

cvat/settings/base.py

@@ -691,4 +691,5 @@ class CVAT_QUEUES(Enum):
 ASSET_SUPPORTED_TYPES = ('image/jpeg', 'image/png', 'image/webp', 'image/gif', 'application/pdf', )
 ASSET_MAX_COUNT_PER_GUIDE = 10
 
-USE_SMOKESCREEN = True
+SMOKESCREEN_ENABLED = True
+SMOKESCREEN_URL = os.getenv('CVAT_SMOKESCREEN_URL', 'http://smokescreen:4750')

cvat/settings/development.py

@@ -66,4 +66,4 @@
 
 QUALITY_CHECK_JOB_DELAY = 5
 
-USE_SMOKESCREEN = False
+SMOKESCREEN_ENABLED = False

cvat/utils/http.py

@@ -17,10 +17,10 @@
 # proxies= parameter.
 PROXIES_FOR_UNTRUSTED_URLS = None
 
-if settings.USE_SMOKESCREEN:
+if settings.SMOKESCREEN_ENABLED:
     PROXIES_FOR_UNTRUSTED_URLS = {
-        'http': 'http://smokescreen:4750',
-        'https': 'http://smokescreen:4750',
+        'http': settings.SMOKESCREEN_URL,
+        'https': settings.SMOKESCREEN_URL,
     }
 
 def make_requests_session() -> requests.Session:

helm-chart/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.3
+version: 0.8.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm-chart/templates/_helpers.tpl

@@ -61,7 +61,9 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
-{{- define "cvat.nuclioEnv" }}
+{{- define "cvat.sharedBackendEnv" }}
+- name: CVAT_SMOKESCREEN_URL
+  value: "http://{{ .Release.Name }}-smokescreen:4750/"
 {{- if .Values.nuclio.enabled }}
 - name: CVAT_SERVERLESS
   value: "1"

helm-chart/templates/cvat_backend/cvat_worker_webhooks/deployment.yml

@@ -91,6 +91,7 @@ spec:
               secretKeyRef:
                 name: "{{ tpl (.Values.postgresql.secret.name) . }}"
                 key: password
+          {{ include "cvat.sharedBackendEnv" . | indent 10 }}
           {{- with .Values.cvat.backend.worker.webhooks.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}

helm-chart/templates/cvat_backend/server/deployment.yml

@@ -97,7 +97,7 @@ spec:
               secretKeyRef:
                 name: "{{ tpl (.Values.postgresql.secret.name) . }}"
                 key: password
-          {{ include "cvat.nuclioEnv" . | indent 10 }}
+          {{ include "cvat.sharedBackendEnv" . | indent 10 }}
           {{- if .Values.analytics.enabled}}
           - name: CVAT_ANALYTICS
             value: "1"

helm-chart/templates/cvat_backend/utils/deployment.yml

@@ -91,7 +91,7 @@ spec:
               secretKeyRef:
                 name: "{{ tpl (.Values.postgresql.secret.name) . }}"
                 key: password
-          {{ include "cvat.nuclioEnv" . | indent 10 }}
+          {{ include "cvat.sharedBackendEnv" . | indent 10 }}
           {{- if .Values.analytics.enabled}}
           - name: CVAT_ANALYTICS
             value: "1"
@@ -102,6 +102,8 @@ spec:
           - name: CLICKHOUSE_HOST
             value: "{{ .Release.Name }}-clickhouse"
           {{- end }}
+          - name: SMOKESCREEN_OPTS
+            value: {{ .Values.smokescreen.opts }}
           {{- with .Values.cvat.backend.utils.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}

helm-chart/templates/cvat_backend/utils/service-smokescreen.yml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-smokescreen
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cvat.labels" . | nindent 4 }}
+    app: cvat-app
+    tier: backend
+spec:
+  selector:
+    app: cvat-app
+    tier: backend
+    component: utils
+    {{- include "cvat.labels" . | nindent 4 }}
+  ports:
+    - port: 4750
+      targetPort: 4750
+      protocol: TCP
+      name: http

helm-chart/templates/cvat_backend/worker_annotation/deployment.yml

@@ -91,7 +91,7 @@ spec:
               secretKeyRef:
                 name: "{{ tpl (.Values.postgresql.secret.name) . }}"
                 key: password
-          {{ include "cvat.nuclioEnv" . | indent 10 }}
+          {{ include "cvat.sharedBackendEnv" . | indent 10 }}
           {{- if .Values.analytics.enabled}}
           - name: CVAT_ANALYTICS
             value: "1"

helm-chart/templates/cvat_backend/worker_export/deployment.yml

@@ -91,7 +91,7 @@ spec:
               secretKeyRef:
                 name: "{{ tpl (.Values.postgresql.secret.name) . }}"
                 key: password
-          {{ include "cvat.nuclioEnv" . | indent 10 }}
+          {{ include "cvat.sharedBackendEnv" . | indent 10 }}
           {{- if .Values.analytics.enabled}}
           - name: CVAT_ANALYTICS
             value: "1"

helm-chart/templates/cvat_backend/worker_import/deployment.yml

@@ -91,7 +91,7 @@ spec:
               secretKeyRef:
                 name: "{{ tpl (.Values.postgresql.secret.name) . }}"
                 key: password
-          {{ include "cvat.nuclioEnv" . | indent 10 }}
+          {{ include "cvat.sharedBackendEnv" . | indent 10 }}
           {{- if .Values.analytics.enabled}}
           - name: CVAT_ANALYTICS
             value: "1"

helm-chart/values.yaml

@@ -385,3 +385,6 @@ traefik:
   service:
     externalIPs:
       # - "192.168.49.2"
+
+smokescreen:
+  opts: ''