diff --git a/CHANGELOG.md b/CHANGELOG.md index 63f450e8177..4fa15529f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Empty list of export formats for a project without tasks () - Downgrade NumPy used by HRNet because `np.int` is no longer available () - Make empty previews responsive to page resize +- Nuclio function invocations when deployed via the Helm chart + () ### Security - TDB diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index cf116b41056..91c7a682e46 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.1 +version: 0.7.2 # 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 ca3f18a439d..8a71084c43a 100644 --- a/helm-chart/templates/_helpers.tpl +++ b/helm-chart/templates/_helpers.tpl @@ -60,3 +60,14 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{- define "cvat.nuclioEnv" }} +{{- if .Values.nuclio.enabled }} +- name: CVAT_SERVERLESS + value: "1" +- name: CVAT_NUCLIO_HOST + value: "{{ .Release.Name }}-nuclio-dashboard" +- name: CVAT_NUCLIO_FUNCTION_NAMESPACE + value: "{{ .Release.Namespace }}" +{{- end }} +{{- end }} diff --git a/helm-chart/templates/cvat_backend/server/deployment.yml b/helm-chart/templates/cvat_backend/server/deployment.yml index 5cb0a099d68..d8add5a5e60 100644 --- a/helm-chart/templates/cvat_backend/server/deployment.yml +++ b/helm-chart/templates/cvat_backend/server/deployment.yml @@ -97,14 +97,7 @@ spec: secretKeyRef: name: "{{ tpl (.Values.postgresql.secret.name) . }}" key: password - {{- if .Values.nuclio.enabled }} - - name: CVAT_SERVERLESS - value: "1" - - name: CVAT_NUCLIO_HOST - value: "{{ .Release.Name }}-nuclio-dashboard" - - name: CVAT_NUCLIO_FUNCTION_NAMESPACE - value: "{{ .Release.Namespace }}" - {{- end }} + {{ include "cvat.nuclioEnv" . | 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 225d204b323..9907e4e337a 100644 --- a/helm-chart/templates/cvat_backend/utils/deployment.yml +++ b/helm-chart/templates/cvat_backend/utils/deployment.yml @@ -91,12 +91,7 @@ spec: secretKeyRef: name: "{{ tpl (.Values.postgresql.secret.name) . }}" key: password - {{- if .Values.nuclio }} - - name: CVAT_SERVERLESS - value: "1" - - name: CVAT_NUCLIO_HOST - value: "{{ .Release.Name }}-nuclio-dashboard" - {{- end }} + {{ include "cvat.nuclioEnv" . | 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 3b86b812c33..64545375824 100644 --- a/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml +++ b/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml @@ -91,12 +91,7 @@ spec: secretKeyRef: name: "{{ tpl (.Values.postgresql.secret.name) . }}" key: password - {{- if .Values.nuclio }} - - name: CVAT_SERVERLESS - value: "1" - - name: CVAT_NUCLIO_HOST - value: "{{ .Release.Name }}-nuclio-dashboard" - {{- end }} + {{ include "cvat.nuclioEnv" . | 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 e55b3750ef8..1a02e2d5771 100644 --- a/helm-chart/templates/cvat_backend/worker_export/deployment.yml +++ b/helm-chart/templates/cvat_backend/worker_export/deployment.yml @@ -91,12 +91,7 @@ spec: secretKeyRef: name: "{{ tpl (.Values.postgresql.secret.name) . }}" key: password - {{- if .Values.nuclio }} - - name: CVAT_SERVERLESS - value: "1" - - name: CVAT_NUCLIO_HOST - value: "{{ .Release.Name }}-nuclio-dashboard" - {{- end }} + {{ include "cvat.nuclioEnv" . | 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 4f5e8c65a3f..22597a9c1bd 100644 --- a/helm-chart/templates/cvat_backend/worker_import/deployment.yml +++ b/helm-chart/templates/cvat_backend/worker_import/deployment.yml @@ -91,12 +91,7 @@ spec: secretKeyRef: name: "{{ tpl (.Values.postgresql.secret.name) . }}" key: password - {{- if .Values.nuclio }} - - name: CVAT_SERVERLESS - value: "1" - - name: CVAT_NUCLIO_HOST - value: "{{ .Release.Name }}-nuclio-dashboard" - {{- end }} + {{ include "cvat.nuclioEnv" . | indent 10 }} {{- if .Values.analytics.enabled}} - name: CVAT_ANALYTICS value: "1"