diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index a667c976f3f0..1522abc478fd 100644 --- a/helm-chart/Chart.yaml +++ b/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 diff --git a/helm-chart/templates/_helpers.tpl b/helm-chart/templates/_helpers.tpl index 8a71084c43a6..2e8ba26b0d63 100644 --- a/helm-chart/templates/_helpers.tpl +++ b/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: SMOKESCREEN_OPTS + value: {{ .Values.smokescreen.opts | toJson }} {{- if .Values.nuclio.enabled }} - name: CVAT_SERVERLESS value: "1" diff --git a/helm-chart/templates/cvat_backend/cvat_worker_webhooks/deployment.yml b/helm-chart/templates/cvat_backend/cvat_worker_webhooks/deployment.yml index 3e213acb8610..724faf2ceae3 100644 --- a/helm-chart/templates/cvat_backend/cvat_worker_webhooks/deployment.yml +++ b/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 }} diff --git a/helm-chart/templates/cvat_backend/server/deployment.yml b/helm-chart/templates/cvat_backend/server/deployment.yml index cc0b5c396a08..1d5c25f88982 100644 --- a/helm-chart/templates/cvat_backend/server/deployment.yml +++ b/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" diff --git a/helm-chart/templates/cvat_backend/utils/deployment.yml b/helm-chart/templates/cvat_backend/utils/deployment.yml index 9907e4e337a1..e57b056c31ba 100644 --- a/helm-chart/templates/cvat_backend/utils/deployment.yml +++ b/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" diff --git a/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml b/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml index 645453758247..031a06a4610e 100644 --- a/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml +++ b/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" diff --git a/helm-chart/templates/cvat_backend/worker_export/deployment.yml b/helm-chart/templates/cvat_backend/worker_export/deployment.yml index 1a02e2d57715..2011a3e79d44 100644 --- a/helm-chart/templates/cvat_backend/worker_export/deployment.yml +++ b/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" diff --git a/helm-chart/templates/cvat_backend/worker_import/deployment.yml b/helm-chart/templates/cvat_backend/worker_import/deployment.yml index 22597a9c1bd2..beb55325eef4 100644 --- a/helm-chart/templates/cvat_backend/worker_import/deployment.yml +++ b/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" diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 17794c5eb7a8..96dd75210839 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -385,3 +385,6 @@ traefik: service: externalIPs: # - "192.168.49.2" + +smokescreen: + opts: ''