From 64a955fd254ea66a69009718a9bf258e46a675f1 Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Wed, 24 Apr 2024 15:22:36 +0200 Subject: [PATCH 01/20] Support for dbsync leader tests [SMAR-2721] --- Chart.yaml | 2 +- README.md | 2 +- ci/multitenant-values.yaml | 3 +++ templates/tests/multitenant-test.yaml | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 8798b67..b6b9281 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.25.2" +appVersion: "v5_4.26.0.6218-x64-dev" diff --git a/README.md b/README.md index 13e1f9e..ac27592 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.25.2](https://img.shields.io/badge/AppVersion-v5_4.25.2-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6218-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6218--x64--dev-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments diff --git a/ci/multitenant-values.yaml b/ci/multitenant-values.yaml index 4ef8b7c..c6baf57 100644 --- a/ci/multitenant-values.yaml +++ b/ci/multitenant-values.yaml @@ -8,3 +8,6 @@ api: sf-tenant-operator: enabled: true installCrd: true + +dbSynchronizationLeader: + enabled: true diff --git a/templates/tests/multitenant-test.yaml b/templates/tests/multitenant-test.yaml index 1bda839..4468fd1 100644 --- a/templates/tests/multitenant-test.yaml +++ b/templates/tests/multitenant-test.yaml @@ -33,12 +33,14 @@ spec: - name: {{ $name | quote }} image: {{ include "smartface.image" (dict "local" .Values.tests.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} imagePullPolicy: {{ .Values.tests.image.pullPolicy }} - args: ['--filter', 'Category=Multitenant'] + args: ['--filter', 'Category=Multitenant{{- if not .Values.dbSynchronizationLeader.enabled }}&FullyQualifiedName!=SmartFace.CloudFunctionalTests.Multitenant.CloudLeaderMultitenantWlSyncTests.Test_Correct_Dispatching_Of_Wl_Updates_For_Tenants{{- end}}'] env: - name: "SF_TEST_API_URL" value: {{ $apiUrl | quote }} - name: "SF_TEST_GQL_API_URL" value: "http://{{ include "smartface.graphqlApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.graphqlApi.servicePort }}" + - name: "DBSYNC_LEADER_TEST_API_URL" + value: "http://{{ include "smartface.dbSynchronizationLeader.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.dbSynchronizationLeader.servicePort }}" - name: "SF_API_METRICS_URL" value: {{ $apiMetricsUrl | quote }} {{- include "smartface.testsAuthConfig" . | nindent 4 }} From aca75b3da55265125e035f44ca4c400f62e9d4a7 Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Thu, 25 Apr 2024 12:51:05 +0200 Subject: [PATCH 02/20] enable authentication for db sync leader in multitenant test --- ci/multitenant-values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/multitenant-values.yaml b/ci/multitenant-values.yaml index c6baf57..084f368 100644 --- a/ci/multitenant-values.yaml +++ b/ci/multitenant-values.yaml @@ -11,3 +11,4 @@ sf-tenant-operator: dbSynchronizationLeader: enabled: true + enableAuth: true From a61090981f18baf9330d10b7952c89adeb65e04d Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Mon, 29 Apr 2024 10:26:07 +0200 Subject: [PATCH 03/20] improved tests [SMAR-2721] --- Chart.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index b6b9281..f224809 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.26.0.6218-x64-dev" +appVersion: "v5_4.26.0.6232-x64-dev" diff --git a/README.md b/README.md index ac27592..bf5e3a5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6218-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6218--x64--dev-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6232-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6232--x64--dev-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments From 5fe34ba2a356a64667fd24ac9d929568155fbf90 Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Mon, 29 Apr 2024 11:56:22 +0200 Subject: [PATCH 04/20] fix tests [SMAR-2721] --- Chart.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index f224809..1ee3c7e 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.26.0.6232-x64-dev" +appVersion: "v5_4.26.0.6233-x64-dev" diff --git a/README.md b/README.md index bf5e3a5..80d5a8d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6232-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6232--x64--dev-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6233-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6233--x64--dev-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments From 94ea42de62b88ddf394779674a456e698c4445b9 Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Mon, 29 Apr 2024 13:36:30 +0200 Subject: [PATCH 05/20] provide rmq host to tests [SMAR-2721] --- templates/tests/multitenant-test.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/tests/multitenant-test.yaml b/templates/tests/multitenant-test.yaml index 4468fd1..a8d3393 100644 --- a/templates/tests/multitenant-test.yaml +++ b/templates/tests/multitenant-test.yaml @@ -43,6 +43,11 @@ spec: value: "http://{{ include "smartface.dbSynchronizationLeader.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.dbSynchronizationLeader.servicePort }}" - name: "SF_API_METRICS_URL" value: {{ $apiMetricsUrl | quote }} + - name: "SF_RMQ_HOST" + valueFrom: + configMapKeyRef: + name: {{ include "smartface.rabbitmq.name" . | quote }} + key: "hostname" {{- include "smartface.testsAuthConfig" . | nindent 4 }} volumeMounts: {{- include "smartface.licVolumeMount" . | nindent 4 }} From 0faa4fa018234611f212a1ba0afef95922e7f17f Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Fri, 3 May 2024 09:39:06 +0200 Subject: [PATCH 06/20] Use test specialized for cloud [SMAR-2721] --- Chart.yaml | 2 +- README.md | 2 +- templates/tests/multitenant-test.yaml | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 1ee3c7e..f50151a 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.26.0.6233-x64-dev" +appVersion: "v5_4.26.0.6239-x64-dev" diff --git a/README.md b/README.md index 80d5a8d..85d2348 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6233-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6233--x64--dev-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6239-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6239--x64--dev-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments diff --git a/templates/tests/multitenant-test.yaml b/templates/tests/multitenant-test.yaml index a8d3393..86cf660 100644 --- a/templates/tests/multitenant-test.yaml +++ b/templates/tests/multitenant-test.yaml @@ -33,7 +33,7 @@ spec: - name: {{ $name | quote }} image: {{ include "smartface.image" (dict "local" .Values.tests.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} imagePullPolicy: {{ .Values.tests.image.pullPolicy }} - args: ['--filter', 'Category=Multitenant{{- if not .Values.dbSynchronizationLeader.enabled }}&FullyQualifiedName!=SmartFace.CloudFunctionalTests.Multitenant.CloudLeaderMultitenantWlSyncTests.Test_Correct_Dispatching_Of_Wl_Updates_For_Tenants{{- end}}'] + args: ['--filter', 'Category=Multitenant{{- if not .Values.dbSynchronizationLeader.enabled }}&FullyQualifiedName!=SmartFace.CloudFunctionalTests.Multitenant.CloudLeaderMultitenantWlSyncTests.Wl_Updates_For_Tenants_Smoke_Test{{- end}}'] env: - name: "SF_TEST_API_URL" value: {{ $apiUrl | quote }} @@ -43,11 +43,6 @@ spec: value: "http://{{ include "smartface.dbSynchronizationLeader.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.dbSynchronizationLeader.servicePort }}" - name: "SF_API_METRICS_URL" value: {{ $apiMetricsUrl | quote }} - - name: "SF_RMQ_HOST" - valueFrom: - configMapKeyRef: - name: {{ include "smartface.rabbitmq.name" . | quote }} - key: "hostname" {{- include "smartface.testsAuthConfig" . | nindent 4 }} volumeMounts: {{- include "smartface.licVolumeMount" . | nindent 4 }} From eb7d6bc1257dadee068a31fd43df8a05e1039271 Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Fri, 3 May 2024 13:55:45 +0200 Subject: [PATCH 07/20] Fixed disposing of api client in test [SMAR-2721] --- Chart.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index f50151a..d71c55d 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.26.0.6239-x64-dev" +appVersion: "v5_4.26.0.6255-x64-dev" diff --git a/README.md b/README.md index 85d2348..d2d9d14 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6239-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6239--x64--dev-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6255-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6255--x64--dev-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments From 7cffffc07e4d678b79808999918357afe5b25345 Mon Sep 17 00:00:00 2001 From: Marek Nereca Date: Tue, 7 May 2024 10:46:44 +0200 Subject: [PATCH 08/20] Add test for configuration of edge stream [SMAR-2721] --- Chart.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 63270f1..d7bc0a0 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.26.0.6255-x64-dev" +appVersion: "v5_4.26.0.6261-x64-dev" diff --git a/README.md b/README.md index af3e61b..206d903 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6255-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6255--x64--dev-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6261-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6261--x64--dev-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments From 99c7aa1e261a7bc6615a49f5e53c3aef1b3cadbd Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 19:14:51 +0200 Subject: [PATCH 09/20] add new env variables for access controller --- templates/edge-streams/access-controller-deployment.yaml | 7 +++++++ values.yaml | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index 8fb1eb7..0ab686f 100644 --- a/templates/edge-streams/access-controller-deployment.yaml +++ b/templates/edge-streams/access-controller-deployment.yaml @@ -59,6 +59,7 @@ spec: {{- include "smartface.commonEnv" . | nindent 8 }} {{- include "smartface.rmqConfig" . | nindent 8 }} {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- include "smartface.mqttConfig" . | nindent 8 }} - name: "Kestrel__EndPoints__Http__Url" value: "http://0.0.0.0:{{ .Values.accessController.containerPort }}" - name: "Kestrel__EndPoints__Http__RequireAuthentication" @@ -67,6 +68,12 @@ spec: value: "http://0.0.0.0:{{ .Values.accessController.authContainerPort }}" - name: "Kestrel__EndPoints__HttpAuth__RequireAuthentication" value: "true" + - name: "MQTT__Enabled" + value: {{ .Values.enabled | quote }} + - name: "MQTT__Topic" + value: {{ .Values.topic | quote }} + - name: "MQTT__SendImageData" + value: {{ .Values.sendImageData | quote }} resources: {{- toYaml .Values.accessController.resources | nindent 10 }} volumeMounts: diff --git a/values.yaml b/values.yaml index add8ff9..1d40f45 100644 --- a/values.yaml +++ b/values.yaml @@ -644,6 +644,10 @@ accessController: digest: null # -- Docker image pull policy pullPolicy: IfNotPresent + mqttConfig: + enabled: false + topic: "edge-stream/{sourceId}/access-notifications/{notificationType}" + sendImageData: false station: enabled: false From 806742f47949098051d525c8bff2671462f49de7 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 19:19:09 +0200 Subject: [PATCH 10/20] update versions --- Chart.yaml | 2 +- values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index fe2bfa9..2ecf55d 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.25.2" +appVersion: "v5_4.26.0" diff --git a/values.yaml b/values.yaml index 1d40f45..5732f45 100644 --- a/values.yaml +++ b/values.yaml @@ -639,7 +639,7 @@ accessController: # -- Docker image repository repository: innovatrics/smartface/sf-access-controller # -- Access Controller follows different versioning, so the chart app needs to be overridden - tag: "v5_1.9.1" + tag: "v5_1.11.0" # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy @@ -678,7 +678,7 @@ station: # -- Docker image repository repository: innovatrics/smartface/sf-station # -- Smartface Station follows different versioning, so the chart app needs to be overridden - tag: "v5_1.24.3" + tag: "v5_1.25.1" # -- Overrides the image tag with an image digest digest: null # -- Docker image pull policy From 307ec6634ebe21be3f2648d88f492045196d5514 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Wed, 26 Jun 2024 19:22:11 +0200 Subject: [PATCH 11/20] helm doc update readme --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a223018..08051d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.25.2](https://img.shields.io/badge/AppVersion-v5_4.25.2-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0](https://img.shields.io/badge/AppVersion-v5_4.26.0-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments @@ -149,7 +149,10 @@ metadata: | accessController.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | | accessController.image.registry | string | `nil` | The Docker registry, overrides `global.image.registry` | | accessController.image.repository | string | `"innovatrics/smartface/sf-access-controller"` | Docker image repository | -| accessController.image.tag | string | `"v5_1.9.1"` | Access Controller follows different versioning, so the chart app needs to be overridden | +| accessController.image.tag | string | `"v5_1.11.0"` | Access Controller follows different versioning, so the chart app needs to be overridden | +| accessController.mqttConfig.enabled | bool | `false` | | +| accessController.mqttConfig.sendImageData | bool | `false` | | +| accessController.mqttConfig.topic | string | `"edge-stream/{sourceId}/access-notifications/{notificationType}"` | | | accessController.name | string | `"access-controller"` | | | accessController.nodeSelector | object | `{}` | | | accessController.podAnnotations | object | `{}` | Annotations for accessController pods | @@ -532,7 +535,7 @@ metadata: | station.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | | station.image.registry | string | `nil` | The Docker registry, overrides `global.image.registry` | | station.image.repository | string | `"innovatrics/smartface/sf-station"` | Docker image repository | -| station.image.tag | string | `"v5_1.24.3"` | Smartface Station follows different versioning, so the chart app needs to be overridden | +| station.image.tag | string | `"v5_1.25.1"` | Smartface Station follows different versioning, so the chart app needs to be overridden | | station.name | string | `"station"` | | | station.nodeSelector | object | `{}` | | | station.podAnnotations | object | `{}` | Annotations for station pods | From 43cc4bfe4ee3a738cd9e17c931f79cc97c531c86 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Thu, 27 Jun 2024 16:42:05 +0200 Subject: [PATCH 12/20] fix wrong values congig + changelog --- CHANGELOG.md | 1 + templates/edge-streams/access-controller-deployment.yaml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d3df87..2515942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration - Added support for tenant management API (ingress) - Deployment revisionHistoryLimit and updateStrategy are configurable via values +- Access Controller MQTT settings are configurable via values ### Changed - Bumped version of `sf-tenant-management` subchart diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index 0ab686f..d19cef0 100644 --- a/templates/edge-streams/access-controller-deployment.yaml +++ b/templates/edge-streams/access-controller-deployment.yaml @@ -69,11 +69,11 @@ spec: - name: "Kestrel__EndPoints__HttpAuth__RequireAuthentication" value: "true" - name: "MQTT__Enabled" - value: {{ .Values.enabled | quote }} + value: {{ .Values.accessController.mqttConfig.enabled | quote }} - name: "MQTT__Topic" - value: {{ .Values.topic | quote }} + value: {{ .Values.accessController.mqttConfig.topic | quote }} - name: "MQTT__SendImageData" - value: {{ .Values.sendImageData | quote }} + value: {{ .Values.accessController.mqttConfig.sendImageData | quote }} resources: {{- toYaml .Values.accessController.resources | nindent 10 }} volumeMounts: From 55b34614760395737cc5ffa9f4fabca9b311d379 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Thu, 27 Jun 2024 16:55:53 +0200 Subject: [PATCH 13/20] Update changelog --- CHANGELOG.md | 3 ++ old-egid.values.yaml | 93 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 old-egid.values.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2515942..cb60e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ - Added support for tenant management API (ingress) - Deployment revisionHistoryLimit and updateStrategy are configurable via values - Access Controller MQTT settings are configurable via values +- Bumped version of SmartFace Station to 1.25.1 +- Bumped version of SmartFace Platform to 4.26.0 +- Bumped version of Access Controller to 1.11.0 ### Changed - Bumped version of `sf-tenant-management` subchart diff --git a/old-egid.values.yaml b/old-egid.values.yaml new file mode 100644 index 0000000..f5e0d3e --- /dev/null +++ b/old-egid.values.yaml @@ -0,0 +1,93 @@ +"accessController": + "dnsHost": "ac.egid.smartfacecloud.com" +"api": + "dnsHost": "" + "enabled": false +"authApi": + "dnsHost": "api.egid.smartfacecloud.com" + "enabled": true +"autoscaling": + "cron": + "enabled": false + "rmq": + "enabled": true +"configurations": + "apiAuth": + "existingConfigMapName": "auth-config" + "s3": + "existingConfigMapName": "s3-config" +"countlyPublisher": + "clusterName": "egid" + "enabled": false +"dbSynchronizationLeader": + "dnsHost": "" + "enableAuth": true + "enabled": false +"detector": + "resources": + "requests": + "cpu": "100m" +"extractor": + "resources": + "requests": + "cpu": "100m" +"features": + "edgeStreams": + "enabled": false + "multitenancy": + "enabled": true +"graphqlApi": + "dnsHost": "graphql.egid.smartfacecloud.com" + "enableAuth": true +"ingress": + "certificateArn": "arn:aws:acm:eu-central-1:291501518763:certificate/8e94db10-74ad-4736-ab56-e07d04d7227f" + "class": "alb" + "includeAlbAnnotations": true +"liveness": + "resources": + "requests": + "cpu": "100m" +"matcher": + "resources": + "requests": + "cpu": "100m" +"metrics": + "enabled": false +"minio": + "enabled": false +"postgresql": + "enabled": false +"rabbitmq": + "auth": + "erlangCookie": "]Lc3gffKkpGYH[xq>sxVy(o1H Date: Thu, 27 Jun 2024 15:02:28 +0000 Subject: [PATCH 14/20] fix end lines --- .gitignore | 8 +- CHANGELOG.md | 228 +-- templates/_matcher.tpl | 160 +- templates/api-deployment.yaml | 190 +- templates/auth-api-deployment.yaml | 200 +- templates/countly-publisher-deployment.yaml | 174 +- .../db-synchronization-leader-deployment.yaml | 166 +- templates/detector-deployment.yaml | 150 +- .../access-controller-deployment.yaml | 182 +- templates/edge-streams/base-deployment.yaml | 156 +- .../edge-stream-processor-deployment.yaml | 152 +- .../edge-streams-state-sync-deployment.yaml | 154 +- .../edge-streams/face-matcher-deployment.yaml | 152 +- .../stream-data-db-worker-deployment.yaml | 156 +- templates/extractor-deployment.yaml | 150 +- templates/graphql-deployment.yaml | 190 +- templates/liveness-deployment.yaml | 146 +- .../readonly-api/api-nginx-deployment.yaml | 88 +- .../auth-api-nginx-deployment.yaml | 88 +- templates/station-deployment.yaml | 274 +-- values.yaml | 1796 ++++++++--------- 21 files changed, 2480 insertions(+), 2480 deletions(-) diff --git a/.gitignore b/.gitignore index 3639c7d..72e9b60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*.tgz -*.zip -.devcontainer/ -egid.values.yaml +*.tgz +*.zip +.devcontainer/ +egid.values.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index cb60e23..a70fef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,114 +1,114 @@ -# Changelog - -## [v0.8.0] - -### Added - -- Added test pods supporting `helm test` command - - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration -- Added support for tenant management API (ingress) -- Deployment revisionHistoryLimit and updateStrategy are configurable via values -- Access Controller MQTT settings are configurable via values -- Bumped version of SmartFace Station to 1.25.1 -- Bumped version of SmartFace Platform to 4.26.0 -- Bumped version of Access Controller to 1.11.0 - -### Changed -- Bumped version of `sf-tenant-management` subchart - - since the chart was renamed all references to previous name were changes - -### Breaking change - -- Changed default behavior for creating Authentication configuration. If you like to continue managing the previously created Authentication config map please use the `configurations.apiAuth.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.apiAuth` - - This change also includes renaming previous field `configurations.apiAuth.configName` -> `configurations.apiAuth.existingConfigMapName` - -## [v0.7.1] - -### Changed - -- Fixed condition for DbSynchronizationLeader deployment - -## [v0.7.0] - -### Added - -- Support for DbSynchronizationLeader has been added - -### Changed - -- Bumped version of sf-tenant-operator to 0.3.0 - -## [v0.6.0] - -### Changed - -- Bumped version of SmartFace Station to 1.22 - -### Breaking change - -- deployment of SmartFace Station is now disabled by default. To reenable previous behavior with deploying SmartFace Station please set the `station.enabled` value to `true`. - - previous behavior with enabled SmartFace Station caused the installation of helm chart with default values to fail on validation because SmartFace Station is currently dependant on SmartFace API with enabled authentication, which in turn requires the existence of external authentication provider and correct configuration of relevant SmartFace services - -## [v0.5.2] - -### Changed - -- Bumped version of SmartFace Platform to 4.24 - -## [v0.5.1] - -### Changed - -- Bumped version of SmartFace Platform and SmartFace Station - -## [v0.5.0] - -### Added - -- Support for using [minio subchart](https://github.com/bitnami/charts/tree/main/bitnami/minio) in place of S3 bucket - - This is now default behavior of the helm chart -- Support for using [postgresql subchart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) in place of externally managed PgSQL instance - - This is now default behavior of the helm chart - -### Breaking change - -- MinIO subchart is enabled and used by default. To keep using S3 bucket managed outside of this helm chart please set the `minio.enabled` value to `false` and provide configuration details via `configurations.s3` -- Postgresql subchart is enabled and used by default. To keep using PgSQL instance managed outside of this helm chart please set the `postgresql.enabled` value to `false` and provide configuration details via `configurations.database` - -## [v0.4.0] - -### Added - -- Common labels with option to specify custom labels/annotation for objects -- PodDisruptionBudgets for deployments that can be scaled -- Support for custom KEDA triggers -- Existing configmap for rabbitMQ and S3 is no longer necessary and the chart can create them from provided values, which is also the new default behavior for S3 - -### Breaking change - -- Changed default behavior for creating S3 configuration. If you like to continue managing the previously created S3 config map please use the `configurations.s3.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.s3` - - The ConfigMap keys for existing config map are no longer configurable, so if you want to keep using the ConfigMap not managed by this chart then please make sure that the key match what the helm chart expects -- Some values have had their keys changed or moved around: - - database secret -> value key changed from `configurations.database.secretName` to `configurations.database.existingSecretName` - - rmq secret values moved to auth parent object -> from `rabbitmq.existingSecretName` to `rabbitmq.auth.existingSecretName` and `rabbitmq.secretKey` to `rabbitmq.auth.secretKey` - - rmq configuration reworked -> value key `rabbitmq.configMapName` and `rabbitmq.mqttConfigMapName` replaced with `existingConfigMapName` key in `rabbitmq.rmqConfiguration` and `rabbitmq.mqttConfiguration` objects respectively - - mqtt dns host configuration changed -> value key `rabbitmq.mqttDnsHost` replaced with object with key `rabbitmq.mqttPublicService` that can be disabled - - deployment selectors changed - - autoscaling configuration reworked -> moved rmq and cron configuration related to services their respective sub-objects e.g. for detector from `autoscaling.detector` to `autoscaling.cron.detector` and `autoscaling.rmq.detector` -- Deployment label selectors and pod labels were modified to use a more standardized approach. Unfortunately since label selector are immutable and thus the helm release cannot be upgraded. Please first use `helm uninstall` and a fresh `helm install` for upgrading. For more information see the [official documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#label-selector-updates) - -## [v0.3.0] - -### Added - -- Support for pushing watchlist data to edge streams via EdgeStreamsStateSynchronizer - -## [v0.2.0] - -### Added - -- Initial implementation -- Chart can be configured to support following scenarios: - - Lightweight Face Identification System (LFIS) - single-tenant and multi-tenant - - Edge stream processing - single tenant only -- Chart can be configured to use externally-managed rabbitmq (e.g. [AmazonMQ](https://aws.amazon.com/amazon-mq/)) or deploy a rabbitmq [subchart](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq) +# Changelog + +## [v0.8.0] + +### Added + +- Added test pods supporting `helm test` command + - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration +- Added support for tenant management API (ingress) +- Deployment revisionHistoryLimit and updateStrategy are configurable via values +- Access Controller MQTT settings are configurable via values +- Bumped version of SmartFace Station to 1.25.1 +- Bumped version of SmartFace Platform to 4.26.0 +- Bumped version of Access Controller to 1.11.0 + +### Changed +- Bumped version of `sf-tenant-management` subchart + - since the chart was renamed all references to previous name were changes + +### Breaking change + +- Changed default behavior for creating Authentication configuration. If you like to continue managing the previously created Authentication config map please use the `configurations.apiAuth.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.apiAuth` + - This change also includes renaming previous field `configurations.apiAuth.configName` -> `configurations.apiAuth.existingConfigMapName` + +## [v0.7.1] + +### Changed + +- Fixed condition for DbSynchronizationLeader deployment + +## [v0.7.0] + +### Added + +- Support for DbSynchronizationLeader has been added + +### Changed + +- Bumped version of sf-tenant-operator to 0.3.0 + +## [v0.6.0] + +### Changed + +- Bumped version of SmartFace Station to 1.22 + +### Breaking change + +- deployment of SmartFace Station is now disabled by default. To reenable previous behavior with deploying SmartFace Station please set the `station.enabled` value to `true`. + - previous behavior with enabled SmartFace Station caused the installation of helm chart with default values to fail on validation because SmartFace Station is currently dependant on SmartFace API with enabled authentication, which in turn requires the existence of external authentication provider and correct configuration of relevant SmartFace services + +## [v0.5.2] + +### Changed + +- Bumped version of SmartFace Platform to 4.24 + +## [v0.5.1] + +### Changed + +- Bumped version of SmartFace Platform and SmartFace Station + +## [v0.5.0] + +### Added + +- Support for using [minio subchart](https://github.com/bitnami/charts/tree/main/bitnami/minio) in place of S3 bucket + - This is now default behavior of the helm chart +- Support for using [postgresql subchart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) in place of externally managed PgSQL instance + - This is now default behavior of the helm chart + +### Breaking change + +- MinIO subchart is enabled and used by default. To keep using S3 bucket managed outside of this helm chart please set the `minio.enabled` value to `false` and provide configuration details via `configurations.s3` +- Postgresql subchart is enabled and used by default. To keep using PgSQL instance managed outside of this helm chart please set the `postgresql.enabled` value to `false` and provide configuration details via `configurations.database` + +## [v0.4.0] + +### Added + +- Common labels with option to specify custom labels/annotation for objects +- PodDisruptionBudgets for deployments that can be scaled +- Support for custom KEDA triggers +- Existing configmap for rabbitMQ and S3 is no longer necessary and the chart can create them from provided values, which is also the new default behavior for S3 + +### Breaking change + +- Changed default behavior for creating S3 configuration. If you like to continue managing the previously created S3 config map please use the `configurations.s3.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.s3` + - The ConfigMap keys for existing config map are no longer configurable, so if you want to keep using the ConfigMap not managed by this chart then please make sure that the key match what the helm chart expects +- Some values have had their keys changed or moved around: + - database secret -> value key changed from `configurations.database.secretName` to `configurations.database.existingSecretName` + - rmq secret values moved to auth parent object -> from `rabbitmq.existingSecretName` to `rabbitmq.auth.existingSecretName` and `rabbitmq.secretKey` to `rabbitmq.auth.secretKey` + - rmq configuration reworked -> value key `rabbitmq.configMapName` and `rabbitmq.mqttConfigMapName` replaced with `existingConfigMapName` key in `rabbitmq.rmqConfiguration` and `rabbitmq.mqttConfiguration` objects respectively + - mqtt dns host configuration changed -> value key `rabbitmq.mqttDnsHost` replaced with object with key `rabbitmq.mqttPublicService` that can be disabled + - deployment selectors changed + - autoscaling configuration reworked -> moved rmq and cron configuration related to services their respective sub-objects e.g. for detector from `autoscaling.detector` to `autoscaling.cron.detector` and `autoscaling.rmq.detector` +- Deployment label selectors and pod labels were modified to use a more standardized approach. Unfortunately since label selector are immutable and thus the helm release cannot be upgraded. Please first use `helm uninstall` and a fresh `helm install` for upgrading. For more information see the [official documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#label-selector-updates) + +## [v0.3.0] + +### Added + +- Support for pushing watchlist data to edge streams via EdgeStreamsStateSynchronizer + +## [v0.2.0] + +### Added + +- Initial implementation +- Chart can be configured to support following scenarios: + - Lightweight Face Identification System (LFIS) - single-tenant and multi-tenant + - Edge stream processing - single tenant only +- Chart can be configured to use externally-managed rabbitmq (e.g. [AmazonMQ](https://aws.amazon.com/amazon-mq/)) or deploy a rabbitmq [subchart](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq) diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl index 0b813ba..5a96d6b 100644 --- a/templates/_matcher.tpl +++ b/templates/_matcher.tpl @@ -1,80 +1,80 @@ - -{{/* -Definition of matcher deployment manifest. Will either be used by tenant operator or directly -*/}} -{{- define "smartface.matcherDefinition" -}} -{{- $name := include "smartface.matcher.name" . -}} -{{- $selectorLabels := include "smartface.matcher.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.matcher.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.matcher.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.matcher.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matcher.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matcher.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ .Values.matcher.name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.matcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.matcher.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.matcher.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.matcher.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matcher.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} + +{{/* +Definition of matcher deployment manifest. Will either be used by tenant operator or directly +*/}} +{{- define "smartface.matcherDefinition" -}} +{{- $name := include "smartface.matcher.name" . -}} +{{- $selectorLabels := include "smartface.matcher.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.matcher.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.matcher.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.matcher.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.matcher.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.matcher.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ .Values.matcher.name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.matcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.matcher.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.matcher.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.matcher.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.matcher.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml index a88fb19..6661ee8 100644 --- a/templates/api-deployment.yaml +++ b/templates/api-deployment.yaml @@ -1,95 +1,95 @@ -{{- if .Values.api.enabled }} -{{- $name := include "smartface.api.name" . -}} -{{- $selectorLabels := include "smartface.api.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.api.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.api.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.api.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.api.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.api.image.pullPolicy }} - ports: - - name: "http" - containerPort: {{ .Values.api.containerPort }} - - name: {{ .Values.metrics.portName | quote }} - containerPort: {{ .Values.metrics.port }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} - {{- include "smartface.statisticsPublish" . | nindent 8 }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.api.containerPort | quote }} - resources: - {{- toYaml .Values.api.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - {{- if and .Values.migration.enabled .Values.api.initMigration }} - initContainers: - {{- include "smartface.migrationInitContainer" . | nindent 6 }} - {{- end }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.api.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.api.enabled }} +{{- $name := include "smartface.api.name" . -}} +{{- $selectorLabels := include "smartface.api.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.api.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.api.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.api.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.api.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.api.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.api.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.api.image.pullPolicy }} + ports: + - name: "http" + containerPort: {{ .Values.api.containerPort }} + - name: {{ .Values.metrics.portName | quote }} + containerPort: {{ .Values.metrics.port }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} + {{- include "smartface.statisticsPublish" . | nindent 8 }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.api.containerPort | quote }} + resources: + {{- toYaml .Values.api.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + {{- if and .Values.migration.enabled .Values.api.initMigration }} + initContainers: + {{- include "smartface.migrationInitContainer" . | nindent 6 }} + {{- end }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.api.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.api.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/auth-api-deployment.yaml b/templates/auth-api-deployment.yaml index a9045e2..b72e2eb 100644 --- a/templates/auth-api-deployment.yaml +++ b/templates/auth-api-deployment.yaml @@ -1,100 +1,100 @@ -{{- if .Values.authApi.enabled }} -{{- $name := include "smartface.authApi.name" . -}} -{{- $selectorLabels := include "smartface.authApi.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.authApi.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.authApi.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.api.enabled ) }} - replicas: {{ .Values.authApi.replicas }} - {{- end }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.authApi.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.authApi.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.authApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.authApi.image.pullPolicy }} - ports: - - name: "http" - containerPort: {{ .Values.authApi.containerPort }} - - name: {{ .Values.metrics.portName | quote }} - containerPort: {{ .Values.metrics.port }} - env: - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} - {{- include "smartface.statisticsPublish" . | nindent 8 }} - - name: "Multitenancy__UseMultitenancy" - value: {{ .Values.features.multitenancy.enabled | quote }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.authApi.containerPort | quote }} - resources: - {{- toYaml .Values.authApi.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - {{- if and .Values.migration.enabled .Values.authApi.initMigration }} - initContainers: - {{- include "smartface.migrationInitContainer" . | nindent 6 }} - {{- end }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.authApi.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.authApi.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.authApi.enabled }} +{{- $name := include "smartface.authApi.name" . -}} +{{- $selectorLabels := include "smartface.authApi.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.authApi.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.authApi.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.api.enabled ) }} + replicas: {{ .Values.authApi.replicas }} + {{- end }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.authApi.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.authApi.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.authApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.authApi.image.pullPolicy }} + ports: + - name: "http" + containerPort: {{ .Values.authApi.containerPort }} + - name: {{ .Values.metrics.portName | quote }} + containerPort: {{ .Values.metrics.port }} + env: + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} + {{- include "smartface.statisticsPublish" . | nindent 8 }} + - name: "Multitenancy__UseMultitenancy" + value: {{ .Values.features.multitenancy.enabled | quote }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.authApi.containerPort | quote }} + resources: + {{- toYaml .Values.authApi.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + {{- if and .Values.migration.enabled .Values.authApi.initMigration }} + initContainers: + {{- include "smartface.migrationInitContainer" . | nindent 6 }} + {{- end }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.authApi.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.authApi.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/countly-publisher-deployment.yaml b/templates/countly-publisher-deployment.yaml index e5cbf09..745bddc 100644 --- a/templates/countly-publisher-deployment.yaml +++ b/templates/countly-publisher-deployment.yaml @@ -1,87 +1,87 @@ -{{- if .Values.countlyPublisher.enabled }} -{{- $name := include "smartface.countlyPublisher.name" . -}} -{{- $selectorLabels := include "smartface.countlyPublisher.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.countlyPublisher.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.countlyPublisher.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.countlyPublisher.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.countlyPublisher.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.countlyPublisher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.countlyPublisher.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - - name: "CountlyConfiguration__ServerUrl" - valueFrom: - configMapKeyRef: - name: countly-config - key: url - - name: "CountlyConfiguration__AppKey" - valueFrom: - secretKeyRef: - name: counlty-app-key - key: key - - name: "CountlyConfiguration__AdditionalSegmentations__0__Key" - value: "Cluster" - - name: "CountlyConfiguration__AdditionalSegmentations__0__Value" - value: {{ .Values.countlyPublisher.clusterName | quote }} - - name: "PrometheusConfiguration__Endpoints__0" - value: "http://+:{{ .Values.metrics.port }}/" - resources: - {{- toYaml .Values.countlyPublisher.resources | nindent 10 }} - {{- with .Values.countlyPublisher.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.countlyPublisher.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.countlyPublisher.enabled }} +{{- $name := include "smartface.countlyPublisher.name" . -}} +{{- $selectorLabels := include "smartface.countlyPublisher.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.countlyPublisher.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.countlyPublisher.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.countlyPublisher.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.countlyPublisher.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.countlyPublisher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.countlyPublisher.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + - name: "CountlyConfiguration__ServerUrl" + valueFrom: + configMapKeyRef: + name: countly-config + key: url + - name: "CountlyConfiguration__AppKey" + valueFrom: + secretKeyRef: + name: counlty-app-key + key: key + - name: "CountlyConfiguration__AdditionalSegmentations__0__Key" + value: "Cluster" + - name: "CountlyConfiguration__AdditionalSegmentations__0__Value" + value: {{ .Values.countlyPublisher.clusterName | quote }} + - name: "PrometheusConfiguration__Endpoints__0" + value: "http://+:{{ .Values.metrics.port }}/" + resources: + {{- toYaml .Values.countlyPublisher.resources | nindent 10 }} + {{- with .Values.countlyPublisher.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.countlyPublisher.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/db-synchronization-leader-deployment.yaml b/templates/db-synchronization-leader-deployment.yaml index 826035d..5770a2f 100644 --- a/templates/db-synchronization-leader-deployment.yaml +++ b/templates/db-synchronization-leader-deployment.yaml @@ -1,83 +1,83 @@ -{{- if and .Values.dbSynchronizationLeader.enabled (index .Values "sf-tenant-management" "enabled") }} -{{- $name := include "smartface.dbSynchronizationLeader.name" . -}} -{{- $selectorLabels := include "smartface.dbSynchronizationLeader.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.dbSynchronizationLeader.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.dbSynchronizationLeader.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.dbSynchronizationLeader.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.dbSynchronizationLeader.image.pullPolicy }} - ports: - - containerPort: {{ .Values.dbSynchronizationLeader.containerPort }} - env: - {{- if .Values.dbSynchronizationLeader.enableAuth }} - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - - name: "Multitenancy__UseMultitenancy" - value: {{ .Values.features.multitenancy.enabled | quote }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.dbSynchronizationLeader.containerPort | quote }} - resources: - {{- toYaml .Values.dbSynchronizationLeader.resources | nindent 10 }} - {{- with .Values.dbSynchronizationLeader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if and .Values.dbSynchronizationLeader.enabled (index .Values "sf-tenant-management" "enabled") }} +{{- $name := include "smartface.dbSynchronizationLeader.name" . -}} +{{- $selectorLabels := include "smartface.dbSynchronizationLeader.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.dbSynchronizationLeader.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.dbSynchronizationLeader.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.dbSynchronizationLeader.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.dbSynchronizationLeader.image.pullPolicy }} + ports: + - containerPort: {{ .Values.dbSynchronizationLeader.containerPort }} + env: + {{- if .Values.dbSynchronizationLeader.enableAuth }} + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + - name: "Multitenancy__UseMultitenancy" + value: {{ .Values.features.multitenancy.enabled | quote }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.dbSynchronizationLeader.containerPort | quote }} + resources: + {{- toYaml .Values.dbSynchronizationLeader.resources | nindent 10 }} + {{- with .Values.dbSynchronizationLeader.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml index 9cf7015..90412c1 100644 --- a/templates/detector-deployment.yaml +++ b/templates/detector-deployment.yaml @@ -1,75 +1,75 @@ -{{- $name := include "smartface.detector.name" . -}} -{{- $selectorLabels := include "smartface.detector.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.detector.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.detector.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.detector.enabled ) }} - replicas: {{ .Values.detector.replicas }} - {{- end }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.detector.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.detector.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.detector.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.detector.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.detector.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.detector.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.detector.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{- $name := include "smartface.detector.name" . -}} +{{- $selectorLabels := include "smartface.detector.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.detector.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.detector.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.detector.enabled ) }} + replicas: {{ .Values.detector.replicas }} + {{- end }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.detector.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.detector.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.detector.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.detector.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.detector.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.detector.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.detector.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index d19cef0..5db9cc2 100644 --- a/templates/edge-streams/access-controller-deployment.yaml +++ b/templates/edge-streams/access-controller-deployment.yaml @@ -1,91 +1,91 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.accessController.name" . -}} -{{- $selectorLabels := include "smartface.accessController.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.accessController.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.accessController.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.accessController.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.accessController.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.accessController.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.accessController.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - - name: "Kestrel__EndPoints__Http__Url" - value: "http://0.0.0.0:{{ .Values.accessController.containerPort }}" - - name: "Kestrel__EndPoints__Http__RequireAuthentication" - value: "false" - - name: "Kestrel__EndPoints__HttpAuth__Url" - value: "http://0.0.0.0:{{ .Values.accessController.authContainerPort }}" - - name: "Kestrel__EndPoints__HttpAuth__RequireAuthentication" - value: "true" - - name: "MQTT__Enabled" - value: {{ .Values.accessController.mqttConfig.enabled | quote }} - - name: "MQTT__Topic" - value: {{ .Values.accessController.mqttConfig.topic | quote }} - - name: "MQTT__SendImageData" - value: {{ .Values.accessController.mqttConfig.sendImageData | quote }} - resources: - {{- toYaml .Values.accessController.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.accessController.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.accessController.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.accessController.name" . -}} +{{- $selectorLabels := include "smartface.accessController.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.accessController.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.accessController.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.accessController.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.accessController.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.accessController.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.accessController.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + - name: "Kestrel__EndPoints__Http__Url" + value: "http://0.0.0.0:{{ .Values.accessController.containerPort }}" + - name: "Kestrel__EndPoints__Http__RequireAuthentication" + value: "false" + - name: "Kestrel__EndPoints__HttpAuth__Url" + value: "http://0.0.0.0:{{ .Values.accessController.authContainerPort }}" + - name: "Kestrel__EndPoints__HttpAuth__RequireAuthentication" + value: "true" + - name: "MQTT__Enabled" + value: {{ .Values.accessController.mqttConfig.enabled | quote }} + - name: "MQTT__Topic" + value: {{ .Values.accessController.mqttConfig.topic | quote }} + - name: "MQTT__SendImageData" + value: {{ .Values.accessController.mqttConfig.sendImageData | quote }} + resources: + {{- toYaml .Values.accessController.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.accessController.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.accessController.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/base-deployment.yaml b/templates/edge-streams/base-deployment.yaml index aa22917..02d40a5 100644 --- a/templates/edge-streams/base-deployment.yaml +++ b/templates/edge-streams/base-deployment.yaml @@ -1,78 +1,78 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.base.name" . -}} -{{- $selectorLabels := include "smartface.base.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.base.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.base.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.base.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.base.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.base.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.base.image.pullPolicy }} - args: ["--serviceName", "SFBase"] - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - resources: - {{- toYaml .Values.base.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.base.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.base.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.base.name" . -}} +{{- $selectorLabels := include "smartface.base.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.base.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.base.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.base.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.base.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.base.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.base.image.pullPolicy }} + args: ["--serviceName", "SFBase"] + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + resources: + {{- toYaml .Values.base.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.base.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.base.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/edge-stream-processor-deployment.yaml b/templates/edge-streams/edge-stream-processor-deployment.yaml index 873da08..6965007 100644 --- a/templates/edge-streams/edge-stream-processor-deployment.yaml +++ b/templates/edge-streams/edge-stream-processor-deployment.yaml @@ -1,76 +1,76 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.edgeStreamProcessor.name" . -}} -{{- $selectorLabels := include "smartface.edgeStreamProcessor.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.edgeStreamProcessor.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.edgeStreamProcessor.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.edgeStreamProcessor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.edgeStreamProcessor.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.edgeStreamProcessor.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.edgeStreamProcessor.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.edgeStreamProcessor.name" . -}} +{{- $selectorLabels := include "smartface.edgeStreamProcessor.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.edgeStreamProcessor.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.edgeStreamProcessor.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.edgeStreamProcessor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.edgeStreamProcessor.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.edgeStreamProcessor.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.edgeStreamProcessor.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/edge-streams-state-sync-deployment.yaml b/templates/edge-streams/edge-streams-state-sync-deployment.yaml index d609fd1..4db8539 100644 --- a/templates/edge-streams/edge-streams-state-sync-deployment.yaml +++ b/templates/edge-streams/edge-streams-state-sync-deployment.yaml @@ -1,77 +1,77 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.edgeStreamsStateSync.name" . -}} -{{- $selectorLabels := include "smartface.edgeStreamsStateSync.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.edgeStreamsStateSync.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.edgeStreamsStateSync.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.edgeStreamsStateSync.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.edgeStreamsStateSync.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.edgeStreamsStateSync.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.edgeStreamsStateSync.name" . -}} +{{- $selectorLabels := include "smartface.edgeStreamsStateSync.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.edgeStreamsStateSync.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.edgeStreamsStateSync.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.edgeStreamsStateSync.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.edgeStreamsStateSync.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.edgeStreamsStateSync.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/face-matcher-deployment.yaml b/templates/edge-streams/face-matcher-deployment.yaml index a8f5d5b..d4ce930 100644 --- a/templates/edge-streams/face-matcher-deployment.yaml +++ b/templates/edge-streams/face-matcher-deployment.yaml @@ -1,76 +1,76 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.faceMatcher.name" . -}} -{{- $selectorLabels := include "smartface.faceMatcher.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.faceMatcher.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.faceMatcher.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.faceMatcher.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.faceMatcher.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.faceMatcher.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.faceMatcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.faceMatcher.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.faceMatcher.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.faceMatcher.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.faceMatcher.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.faceMatcher.name" . -}} +{{- $selectorLabels := include "smartface.faceMatcher.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.faceMatcher.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.faceMatcher.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.faceMatcher.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.faceMatcher.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.faceMatcher.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.faceMatcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.faceMatcher.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.faceMatcher.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.faceMatcher.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.faceMatcher.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/stream-data-db-worker-deployment.yaml b/templates/edge-streams/stream-data-db-worker-deployment.yaml index 36dd69c..1473487 100644 --- a/templates/edge-streams/stream-data-db-worker-deployment.yaml +++ b/templates/edge-streams/stream-data-db-worker-deployment.yaml @@ -1,78 +1,78 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.streamDataDbWorker.name" . -}} -{{- $selectorLabels := include "smartface.streamDataDbWorker.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.streamDataDbWorker.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.streamDataDbWorker.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.streamDataDbWorker.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.streamDataDbWorker.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.streamDataDbWorker.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.streamDataDbWorker.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.streamDataDbWorker.image.pullPolicy }} - ports: - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.streamDataDbWorker.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.streamDataDbWorker.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.streamDataDbWorker.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.streamDataDbWorker.name" . -}} +{{- $selectorLabels := include "smartface.streamDataDbWorker.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.streamDataDbWorker.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.streamDataDbWorker.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.streamDataDbWorker.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.streamDataDbWorker.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.streamDataDbWorker.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.streamDataDbWorker.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.streamDataDbWorker.image.pullPolicy }} + ports: + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.streamDataDbWorker.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.streamDataDbWorker.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.streamDataDbWorker.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/extractor-deployment.yaml b/templates/extractor-deployment.yaml index f831fc9..7ec9487 100644 --- a/templates/extractor-deployment.yaml +++ b/templates/extractor-deployment.yaml @@ -1,75 +1,75 @@ -{{- $name := include "smartface.extractor.name" . -}} -{{- $selectorLabels := include "smartface.extractor.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.extractor.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.extractor.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.extractor.enabled ) }} - replicas: {{ .Values.extractor.replicas }} - {{- end }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.extractor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.extractor.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.extractor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.extractor.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.extractor.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.extractor.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.extractor.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{- $name := include "smartface.extractor.name" . -}} +{{- $selectorLabels := include "smartface.extractor.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.extractor.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.extractor.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.extractor.enabled ) }} + replicas: {{ .Values.extractor.replicas }} + {{- end }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.extractor.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.extractor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.extractor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.extractor.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.extractor.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.extractor.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.extractor.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/graphql-deployment.yaml b/templates/graphql-deployment.yaml index 314cd70..b107d2a 100644 --- a/templates/graphql-deployment.yaml +++ b/templates/graphql-deployment.yaml @@ -1,95 +1,95 @@ -{{- if .Values.graphqlApi.enabled }} -{{- $name := include "smartface.graphqlApi.name" . -}} -{{- $selectorLabels := include "smartface.graphqlApi.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.graphqlApi.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.graphqlApi.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.graphqlApi.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.graphqlApi.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.graphqlApi.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.graphqlApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.graphqlApi.image.pullPolicy }} - ports: - - containerPort: {{ .Values.graphqlApi.containerPort }} - env: - {{- if .Values.graphqlApi.enableAuth }} - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- end }} - - name: "Multitenancy__UseMultitenancy" - value: {{ .Values.features.multitenancy.enabled | quote }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.graphqlApi.containerPort | quote }} - resources: - {{- toYaml .Values.graphqlApi.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - {{- if and .Values.migration.enabled .Values.graphqlApi.initMigration }} - initContainers: - {{- include "smartface.migrationInitContainer" . | nindent 6 }} - {{- end }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.graphqlApi.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.graphqlApi.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.graphqlApi.enabled }} +{{- $name := include "smartface.graphqlApi.name" . -}} +{{- $selectorLabels := include "smartface.graphqlApi.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.graphqlApi.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.graphqlApi.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.graphqlApi.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.graphqlApi.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.graphqlApi.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.graphqlApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.graphqlApi.image.pullPolicy }} + ports: + - containerPort: {{ .Values.graphqlApi.containerPort }} + env: + {{- if .Values.graphqlApi.enableAuth }} + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- end }} + - name: "Multitenancy__UseMultitenancy" + value: {{ .Values.features.multitenancy.enabled | quote }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.graphqlApi.containerPort | quote }} + resources: + {{- toYaml .Values.graphqlApi.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + {{- if and .Values.migration.enabled .Values.graphqlApi.initMigration }} + initContainers: + {{- include "smartface.migrationInitContainer" . | nindent 6 }} + {{- end }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.graphqlApi.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.graphqlApi.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/liveness-deployment.yaml b/templates/liveness-deployment.yaml index a5362b4..ef7605b 100644 --- a/templates/liveness-deployment.yaml +++ b/templates/liveness-deployment.yaml @@ -1,73 +1,73 @@ -{{- $name := include "smartface.liveness.name" . -}} -{{- $selectorLabels := include "smartface.liveness.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.liveness.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.liveness.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.liveness.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.liveness.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.liveness.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.liveness.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.liveness.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.liveness.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.liveness.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.liveness.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{- $name := include "smartface.liveness.name" . -}} +{{- $selectorLabels := include "smartface.liveness.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.liveness.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.liveness.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.liveness.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.liveness.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.liveness.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.liveness.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.liveness.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.liveness.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.liveness.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.liveness.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/readonly-api/api-nginx-deployment.yaml b/templates/readonly-api/api-nginx-deployment.yaml index ad13fce..50653e5 100644 --- a/templates/readonly-api/api-nginx-deployment.yaml +++ b/templates/readonly-api/api-nginx-deployment.yaml @@ -1,44 +1,44 @@ -{{- if and .Values.readonlyApi.enabled .Values.api.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.readonlyApi.noAuthName | quote }} -spec: - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - app: {{ .Values.readonlyApi.noAuthName | quote }} - replicas: 1 - template: - metadata: - labels: - app: {{ .Values.readonlyApi.noAuthName | quote }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - containers: - - name: nginx - image: nginx:1.25.1 - ports: - - name: "http" - containerPort: {{ .Values.api.containerPort }} - volumeMounts: - - name: nginx-conf - mountPath: /etc/nginx/conf.d/default.conf - subPath: nginx.conf - readOnly: true - resources: - {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} - volumes: - - name: nginx-conf - configMap: - name: {{ .Values.readonlyApi.noAuthName | quote }} - items: - - key: nginx.conf - path: nginx.conf -{{- end }} +{{- if and .Values.readonlyApi.enabled .Values.api.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.readonlyApi.noAuthName | quote }} +spec: + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + app: {{ .Values.readonlyApi.noAuthName | quote }} + replicas: 1 + template: + metadata: + labels: + app: {{ .Values.readonlyApi.noAuthName | quote }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + containers: + - name: nginx + image: nginx:1.25.1 + ports: + - name: "http" + containerPort: {{ .Values.api.containerPort }} + volumeMounts: + - name: nginx-conf + mountPath: /etc/nginx/conf.d/default.conf + subPath: nginx.conf + readOnly: true + resources: + {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} + volumes: + - name: nginx-conf + configMap: + name: {{ .Values.readonlyApi.noAuthName | quote }} + items: + - key: nginx.conf + path: nginx.conf +{{- end }} diff --git a/templates/readonly-api/auth-api-nginx-deployment.yaml b/templates/readonly-api/auth-api-nginx-deployment.yaml index bb9d154..388cc90 100644 --- a/templates/readonly-api/auth-api-nginx-deployment.yaml +++ b/templates/readonly-api/auth-api-nginx-deployment.yaml @@ -1,44 +1,44 @@ -{{- if and .Values.readonlyApi.enabled .Values.authApi.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.readonlyApi.authName | quote }} -spec: - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - app: {{ .Values.readonlyApi.authName | quote }} - replicas: 1 - template: - metadata: - labels: - app: {{ .Values.readonlyApi.authName | quote }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - containers: - - name: nginx - image: nginx:1.25.1 - ports: - - name: "http" - containerPort: {{ .Values.authApi.containerPort }} - volumeMounts: - - name: nginx-conf - mountPath: /etc/nginx/conf.d/default.conf - subPath: nginx.conf - readOnly: true - resources: - {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} - volumes: - - name: nginx-conf - configMap: - name: {{ .Values.readonlyApi.authName | quote }} - items: - - key: nginx.conf - path: nginx.conf -{{- end }} +{{- if and .Values.readonlyApi.enabled .Values.authApi.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.readonlyApi.authName | quote }} +spec: + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + app: {{ .Values.readonlyApi.authName | quote }} + replicas: 1 + template: + metadata: + labels: + app: {{ .Values.readonlyApi.authName | quote }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + containers: + - name: nginx + image: nginx:1.25.1 + ports: + - name: "http" + containerPort: {{ .Values.authApi.containerPort }} + volumeMounts: + - name: nginx-conf + mountPath: /etc/nginx/conf.d/default.conf + subPath: nginx.conf + readOnly: true + resources: + {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} + volumes: + - name: nginx-conf + configMap: + name: {{ .Values.readonlyApi.authName | quote }} + items: + - key: nginx.conf + path: nginx.conf +{{- end }} diff --git a/templates/station-deployment.yaml b/templates/station-deployment.yaml index 220c2a7..5945b42 100644 --- a/templates/station-deployment.yaml +++ b/templates/station-deployment.yaml @@ -1,137 +1,137 @@ -{{- if .Values.station.enabled }} -{{- $name := include "smartface.station.name" . -}} -{{- $selectorLabels := include "smartface.station.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.station.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.station.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.station.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.station.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.station.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.station.image.pullPolicy }} - env: - {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} - - name: "HOST" - value: "0.0.0.0" - - name: "PORT" - value: {{ .Values.station.containerPort | quote }} - - name: "CORE_API_ROOT" - {{- if .Values.readonlyApi.enabled }} - value: "http://{{ .Values.readonlyApi.authName }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" - {{- else }} - value: "http://{{ include "smartface.authApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" - {{- end }} - - name: "ZERO_MQ_HOST" - value: "{{ include "smartface.base.name" . }}.{{ .Release.Namespace }}.svc.cluster.local" - - name: "ZERO_MQ_PORT" - value: "{{ .Values.base.zmqServicePort }}" - - name: "GRAPHQL_ROOT" - value: "http://{{ include "smartface.graphqlApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.graphqlApi.servicePort }}/graphql" - - name: "ACCESS_CONTROLLER_ADDRESS" - value: "{{ include "smartface.accessController.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.accessController.servicePort }}" - - name: "BLACKLIST_WATCHLIST_IDS" - value: "" - - name: "KEYCLOAK_ADMIN_URL" - value: "" - - name: "DOT_FACE_CAMERA_ENABLED" - value: "true" - - name: "IDENTIFICATION_ENABLED" - value: "true" - - - name: "AUTH0_AUTHENTICATION_ENABLED" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "use_auth" - - name: "AUTH0_AUDIENCE" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "audience" - - name: "AUTH0_DOMAIN" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "domain" - - name: "AUTH0_ISSUER" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "issuer" - - name: "AUTH0_JWKS_URI" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "jwks_uri" - - name: "AUTH_HEADER" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "auth_header" - - - name: "AUTH0_CLIENT_ID" - valueFrom: - secretKeyRef: - name: {{ .Values.configurations.stationAuth.secretName | quote }} - key: "client_id" - resources: - {{- toYaml .Values.station.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.station.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.station.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end}} +{{- if .Values.station.enabled }} +{{- $name := include "smartface.station.name" . -}} +{{- $selectorLabels := include "smartface.station.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.station.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.station.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.station.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.station.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.station.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.station.image.pullPolicy }} + env: + {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} + - name: "HOST" + value: "0.0.0.0" + - name: "PORT" + value: {{ .Values.station.containerPort | quote }} + - name: "CORE_API_ROOT" + {{- if .Values.readonlyApi.enabled }} + value: "http://{{ .Values.readonlyApi.authName }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" + {{- else }} + value: "http://{{ include "smartface.authApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" + {{- end }} + - name: "ZERO_MQ_HOST" + value: "{{ include "smartface.base.name" . }}.{{ .Release.Namespace }}.svc.cluster.local" + - name: "ZERO_MQ_PORT" + value: "{{ .Values.base.zmqServicePort }}" + - name: "GRAPHQL_ROOT" + value: "http://{{ include "smartface.graphqlApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.graphqlApi.servicePort }}/graphql" + - name: "ACCESS_CONTROLLER_ADDRESS" + value: "{{ include "smartface.accessController.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.accessController.servicePort }}" + - name: "BLACKLIST_WATCHLIST_IDS" + value: "" + - name: "KEYCLOAK_ADMIN_URL" + value: "" + - name: "DOT_FACE_CAMERA_ENABLED" + value: "true" + - name: "IDENTIFICATION_ENABLED" + value: "true" + + - name: "AUTH0_AUTHENTICATION_ENABLED" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "use_auth" + - name: "AUTH0_AUDIENCE" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "audience" + - name: "AUTH0_DOMAIN" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "domain" + - name: "AUTH0_ISSUER" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "issuer" + - name: "AUTH0_JWKS_URI" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "jwks_uri" + - name: "AUTH_HEADER" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "auth_header" + + - name: "AUTH0_CLIENT_ID" + valueFrom: + secretKeyRef: + name: {{ .Values.configurations.stationAuth.secretName | quote }} + key: "client_id" + resources: + {{- toYaml .Values.station.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.station.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.station.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end}} diff --git a/values.yaml b/values.yaml index 5732f45..844f508 100644 --- a/values.yaml +++ b/values.yaml @@ -1,898 +1,898 @@ -# Default values for smartface. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -global: - image: - # -- Overrides the Docker registry globally for all images - registry: "registry.gitlab.com" - -# -- Overrides the chart's name -nameOverride: null -# -- Common annotations for all deployments/StatefulSets -annotations: {} -# -- Common annotations for all pods -podAnnotations: {} -# -- Common labels for all pods -podLabels: {} -# -- Common annotations for all services -serviceAnnotations: {} -# -- Common labels for all services -serviceLabels: {} -# -- Common revisionHistoryLimit for all deployments -revisionHistoryLimit: -# -- Common updateStrategy for all deployments -updateStrategy: {} - -# -- docker secrets used to pull images with -imagePullSecrets: - - name: "sf-gitlab-registry-creds" - -configurations: - database: - # -- connection string needs to be provided as a dependency of the chart - existingSecretName: "db-cs" - # -- key within the existing secret which contains the connection string, see https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/connection-strings - connectionStringKey: "cs" - s3: - # -- supply to bring your own configmap. the configmap needs following keys: `name`, `region`, `folder`, `authType` and `useBucketRegion` - existingConfigMapName: "" - # -- name of S3 bucket - bucketName: "" - # -- system name of AWS region of S3 bucket e.g. `eu-central-1` - bucketRegion: "" - # -- prefix (folder) used for S3 objects - bucketFolder: "" - # -- type of authentication to be used. Currently `AssumedRole` and `InstanceProfile` are usable - authType: "AssumedRole" - # -- mechanism to resolve bucket endpoint - if `true` then connection is made based on bucket region. If `false` then bucket endpoint needs to be set manually - useBucketRegion: true - license: - secretName: "iface-lic" - volumeMountName: "license" - mountPath: "/etc/innovatrics" - apiAuth: - # -- supply to bring your own configmap. the configmap needs following keys: `authority`, `audience`, `oauth_token_url` and `oauth_authorize_url` - existingConfigMapName: "" - # -- issuer of JWT which the API will trust - authority: "" - # -- audience representing the API - audience: "" - # -- used only for enabling OAuth flows in swagger UI - oauthTokenUrl: "" - # -- used only for enabling OAuth flows in swagger UI - oauthAuthorizeUrl: "" - stationAuth: - # -- config containing authorization configuration for SF Station used when authentication is enabled for SF Station - configName: "station-auth-config" - secretName: "station-client-id" - -features: - multitenancy: - # -- enabled for multitenant deployment - enabled: false - edgeStreams: - # -- sf-tenant-management.enabled needs to be enabled since tenant operator is responsible for populating wlStream - enabled: false - -# -- config for rabbitmq subchart, see https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq -rabbitmq: - # -- configure if rabbitmq subchart should be included - enabled: true - extraPlugins: "rabbitmq_stream rabbitmq_stream_management rabbitmq_mqtt" - # -- service to publicly expose mqtt interface to be used by edge streams. Currently requires ALB controller https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.6/ - mqttPublicService: - enabled: false - mqttDnsHost: "" - # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on rabbitmq - rmqConfiguration: - # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, `useSsl`, and optionally `streamsPort` when `features.edgeStreams.enabled` is `true`. Other configuration is not used if You provide existing config map. - existingConfigMapName: "" - # -- username for existing RabbitMQ instance - username: "" - # -- hostname of existing RabbitMQ instance - hostname: "" - # -- port of existing RabbitMQ instance - port: 5672 - # -- set to `true` if existing RabbitMQ instance uses TLS - useSsl: false - # -- port for RabbitMQ streams protocol used only when `features.edgeStreams.enabled` is `true` - streamsPort: 5552 - # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on MQTT broker when `features.edgeStreams.enabled` is `true` - mqttConfiguration: - # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, and `useSsl`. Other configuration is not used if You provide existing config map. - existingConfigMapName: "" - # -- username for existing RabbitMQ instance - username: "" - # -- hostname of existing MQTT broker - hostname: "" - # -- port of existing MQTT broker - port: 1883 - # -- set to `true` if existing MQTT broker uses TLS - useSsl: false - auth: - # -- supply to bring you own secret. The secret needs to contain rabbitmq password under the key with name defined in `rabbitmq.auth.secretKey` - existingSecretName: "" - # -- define key of rabbitmq password in existing/provisioned secret - secretKey: "rabbitmq-password" - # -- username of created user in case that `rabbitmq.enabled` is `true` - username: "smartface" - # -- used by subchart - erlangCookie: "" - # -- used by subchart - password: "" - service: - extraPorts: - - name: mqtt - port: 1883 - targetPort: 1883 - - name: rmq-stream - port: 5552 - targetPort: 5552 - -# -- config for minio subchart, see https://github.com/bitnami/charts/tree/main/bitnami/minio -minio: - enabled: true - defaultBuckets: "smartface" - -# -- config for postgresql subchart, see https://github.com/bitnami/charts/tree/main/bitnami/postgresql -postgresql: - enabled: true - primary: - initdb: - scripts: - create-database.sql: "CREATE DATABASE smartface" - -api: - enabled: true - name: "api" - servicePort: 80 - containerPort: 80 - dnsHost: "" - initMigration: true - # -- Annotations for api deployment - annotations: {} - # -- Annotations for api pods - podAnnotations: {} - # -- Additional labels for each api pod - podLabels: {} - service: - # -- Annotations for api Service - annotations: {} - # -- Additional labels for api Service - labels: {} - pdb: - # -- create PodDisruptionBudget for api component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-api - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -authApi: - enabled: false - name: "auth-api" - servicePort: 8098 - containerPort: 80 - dnsHost: "" - initMigration: true - # -- Annotations for authApi deployment - annotations: {} - # -- Annotations for authApi pods - podAnnotations: {} - # -- Additional labels for each authApi pod - podLabels: {} - service: - # -- Annotations for authApi Service - annotations: {} - # -- Additional labels for authApi Service - labels: {} - pdb: - # -- create PodDisruptionBudget for authApi component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - # -- number of replicas to use when autoscaling is not enabled for this component - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-api - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -dbSynchronizationLeader: - # -- features.multitenancy needs to be enabled since tenant operator is responsible for populating wlStream - enabled: false - name: "db-synchronization-leader" - servicePort: 8100 - containerPort: 80 - dnsHost: "" - enableAuth: false - # -- Annotations for dbSynchronizationLeader deployment - annotations: {} - # -- Annotations for dbSynchronizationLeader pods - podAnnotations: {} - # -- Additional labels for each dbSynchronizationLeader pod - podLabels: {} - service: - # -- Annotations for dbSynchronizationLeader Service - annotations: {} - # -- Additional labels for dbSynchronizationLeader Service - labels: {} - pdb: - # -- create PodDisruptionBudget for dbSynchronizationLeader component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-db-synchronization-leader - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -graphqlApi: - enabled: true - name: "graphql-api" - servicePort: 8097 - containerPort: 80 - dnsHost: "" - enableAuth: false - initMigration: false - # -- Annotations for graphqlApi deployment - annotations: {} - # -- Annotations for graphqlApi pods - podAnnotations: {} - # -- Additional labels for each graphqlApi pod - podLabels: {} - service: - # -- Annotations for graphqlApi Service - annotations: {} - # -- Additional labels for graphqlApi Service - labels: {} - pdb: - # -- create PodDisruptionBudget for graphqlApi component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-graphql-api - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -ingress: - # -- enable creation of ingress object - enabled: true - # -- set ingress class - class: "" - # -- supply custom ingress annotation - annotations: - # -- if enabled then the ingress will include default ALB annotations - includeAlbAnnotations: false - # -- only used if includeAlbAnnotations == true - certificateArn: "" - -detector: - name: "detector" - # -- Annotations for detector deployment - annotations: {} - # -- Annotations for detector pods - podAnnotations: {} - # -- Additional labels for each detector pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for detector component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "600M" - cpu: "750m" - limits: - memory: "1500M" - nodeSelector: {} - tolerations: [] - # -- number of replicas to use when autoscaling is not enabled for this component - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-detector - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -extractor: - name: "extractor" - # -- Annotations for extractor deployment - annotations: {} - # -- Annotations for extractor pods - podAnnotations: {} - # -- Additional labels for each extractor pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for extractor component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "500M" - cpu: "750m" - limits: - memory: "1G" - nodeSelector: {} - tolerations: [] - # -- number of replicas to use when autoscaling is not enabled for this component - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-extractor - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -matcher: - name: "matcher" - # -- Annotations for matcher deployment - annotations: {} - # -- Annotations for matcher pods - podAnnotations: {} - # -- Additional labels for each matcher pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for matcher component. Only works when `features.multitenancy` is disabled as PDB is not compatible with tenant operator - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "200M" - cpu: "750m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-matcher - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -liveness: - name: "liveness" - # -- Annotations for liveness deployment - annotations: {} - # -- Annotations for liveness pods - podAnnotations: {} - # -- Additional labels for each liveness pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for liveness component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "200M" - cpu: "750m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-liveness - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -edgeStreamProcessor: - name: "edge-stream-processor" - # -- Annotations for edgeStreamProcessor deployment - annotations: {} - # -- Annotations for edgeStreamProcessor pods - podAnnotations: {} - # -- Additional labels for each edgeStreamProcessor pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for edgeStreamProcessor component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-edge-stream-processor - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -edgeStreamsStateSync: - name: "edge-streams-state-synchronizer" - # -- Annotations for edgeStreamsStateSync deployment - annotations: {} - # -- Annotations for edgeStreamsStateSync pods - podAnnotations: {} - # -- Additional labels for each edgeStreamsStateSync pod - podLabels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-edge-streams-state-synchronizer - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -wlStreamPopulationJob: - enabled: false - resources: {} - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-admin - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -base: - name: "base" - zmqServicePort: 2406 - zmqContainerPort: 2406 - # -- Annotations for base deployment - annotations: {} - # -- Annotations for base pods - podAnnotations: {} - # -- Additional labels for each base pod - podLabels: {} - service: - # -- Annotations for base Service - annotations: {} - # -- Additional labels for base Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-base - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -faceMatcher: - name: "face-matcher" - # -- Annotations for faceMatcher deployment - annotations: {} - # -- Annotations for faceMatcher pods - podAnnotations: {} - # -- Additional labels for each faceMatcher pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for faceMatcher component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-face-matcher - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -accessController: - name: "access-controller" - authServiceName: "auth-access-controller" - dnsHost: "" - servicePort: 5050 - containerPort: 80 - authServicePort: 5051 - authContainerPort: 5051 - # -- Annotations for accessController deployment - annotations: {} - # -- Annotations for accessController pods - podAnnotations: {} - # -- Additional labels for each accessController pod - podLabels: {} - service: - # -- Annotations for accessController Service - annotations: {} - # -- Additional labels for accessController Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-access-controller - # -- Access Controller follows different versioning, so the chart app needs to be overridden - tag: "v5_1.11.0" - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - mqttConfig: - enabled: false - topic: "edge-stream/{sourceId}/access-notifications/{notificationType}" - sendImageData: false - -station: - enabled: false - name: "station" - servicePort: 8000 - containerPort: 80 - dnsHost: "" - # -- Annotations for station deployment - annotations: {} - # -- Annotations for station pods - podAnnotations: {} - # -- Additional labels for each station pod - podLabels: {} - service: - # -- Annotations for station Service - annotations: {} - # -- Additional labels for station Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-station - # -- Smartface Station follows different versioning, so the chart app needs to be overridden - tag: "v5_1.25.1" - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -streamDataDbWorker: - name: "stream-data-db-worker" - # -- Annotations for streamDataDbWorker deployment - annotations: {} - # -- Annotations for streamDataDbWorker pods - podAnnotations: {} - # -- Additional labels for each streamDataDbWorker pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for streamDataDbWorker component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-streamdatadbworker - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -jaegerTracing: - enabled: true - hostname: grafana-agent.monitoring.svc.cluster.local - -migration: - enabled: true - initContainer: - resources: {} - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-admin - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -autoscaling: - cron: - # -- enables predefined workhours-based cron triggers on ScaledObjects - enabled: false - # -- see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - timezone: "Europe/Bratislava" - detector: - workHoursReplicas: 2 - nonWorkHoursReplicas: 1 - extractor: - workHoursReplicas: 2 - nonWorkHoursReplicas: 1 - api: - workHoursReplicas: 2 - nonWorkHoursReplicas: 1 - rmq: - # -- enables predefined rabbitmq triggers based on requests per second on ScaledObjects - enabled: false - triggerAuthName: "keda-trigger-auth-rabbitmq-conn" - hostSecretName: "rmq-management-uri-with-creds" - detector: - requestsPerSecond: 15 - extractor: - requestsPerSecond: 12 - api: - requestsPerSecond: 17 - detector: - # -- enables ScaledObject for detector - enabled: true - minReplicas: 1 - maxReplicas: 3 - # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers - triggers: [] - extractor: - # -- enables ScaledObject for extractor - enabled: true - minReplicas: 1 - maxReplicas: 3 - # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers - triggers: [] - api: - # -- enables ScaledObject for rest API - enabled: true - minReplicas: 1 - maxReplicas: 3 - # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers - triggers: [] - -# -- configuration for sf-tenant-management subchart -sf-tenant-management: - # -- configure if sf-tenant-management subchart should be included - enabled: false - apiDnsHost: "" - config: - mapName: "operator-config" - fileName: "appsettings.override.json" - configDir: "/etc/components" - installCrd: false - imagePullSecrets: - - name: "sf-gitlab-registry-creds" - api: - enabled: false - name: "sf-tenant-api" - servicePort: 80 - -countlyPublisher: - enabled: false - name: "countly-publisher" - clusterName: "" - # -- Annotations for countlyPublisher deployment - annotations: {} - # -- Annotations for countlyPublisher pods - podAnnotations: {} - # -- Additional labels for each countlyPublisher pod - podLabels: {} - service: - # -- Annotations for countlyPublisher Service - annotations: {} - # -- Additional labels for countlyPublisher Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-countly-publisher - # -- Countly publisher follows different versioning, so the chart app needs to be overridden - tag: "31" - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -tests: - authentication: - tenant1: - name: "" - clientId: "" - clientSecret: "" - tenant2: - name: "" - clientId: "" - clientSecret: "" - # -- Annotations for test pods - podAnnotations: {} - # -- Additional labels for test pods - podLabels: {} - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-cloud-func-tests - # -- Countly publisher follows different versioning, so the chart app needs to be overridden - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -metrics: - enabled: false - monitorDiscoveryLabel: - instance: primary - serviceDiscoveryLabels: - sf-metrics: "true" - portName: "metrics" - port: 4318 - -readonlyApi: - enabled: false - authName: "readonly-auth-api" - noAuthName: "readonly-noauth-api" - proxyContainer: - resources: {} - nodeSelector: {} - tolerations: [] - -serviceAccount: - # -- Specifies whether a ServiceAccount should be created - create: true - # -- The name of the ServiceAccount to use. - name: "sf-service-account" - # -- Image pull secrets for the service account - imagePullSecrets: [] - # -- Annotations for the service account - annotations: {} - # -- Labels for the service account - labels: {} - # -- Set this toggle to false to opt out of automounting API credentials for the service account - automountServiceAccountToken: true - -# -- due to ArgoCD limitations this can be used to skip validations that use the `lookup` helm function - for more information see https://github.com/argoproj/argo-cd/issues/5202 -skipLookupBasedValidations: false +# Default values for smartface. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +global: + image: + # -- Overrides the Docker registry globally for all images + registry: "registry.gitlab.com" + +# -- Overrides the chart's name +nameOverride: null +# -- Common annotations for all deployments/StatefulSets +annotations: {} +# -- Common annotations for all pods +podAnnotations: {} +# -- Common labels for all pods +podLabels: {} +# -- Common annotations for all services +serviceAnnotations: {} +# -- Common labels for all services +serviceLabels: {} +# -- Common revisionHistoryLimit for all deployments +revisionHistoryLimit: +# -- Common updateStrategy for all deployments +updateStrategy: {} + +# -- docker secrets used to pull images with +imagePullSecrets: + - name: "sf-gitlab-registry-creds" + +configurations: + database: + # -- connection string needs to be provided as a dependency of the chart + existingSecretName: "db-cs" + # -- key within the existing secret which contains the connection string, see https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/connection-strings + connectionStringKey: "cs" + s3: + # -- supply to bring your own configmap. the configmap needs following keys: `name`, `region`, `folder`, `authType` and `useBucketRegion` + existingConfigMapName: "" + # -- name of S3 bucket + bucketName: "" + # -- system name of AWS region of S3 bucket e.g. `eu-central-1` + bucketRegion: "" + # -- prefix (folder) used for S3 objects + bucketFolder: "" + # -- type of authentication to be used. Currently `AssumedRole` and `InstanceProfile` are usable + authType: "AssumedRole" + # -- mechanism to resolve bucket endpoint - if `true` then connection is made based on bucket region. If `false` then bucket endpoint needs to be set manually + useBucketRegion: true + license: + secretName: "iface-lic" + volumeMountName: "license" + mountPath: "/etc/innovatrics" + apiAuth: + # -- supply to bring your own configmap. the configmap needs following keys: `authority`, `audience`, `oauth_token_url` and `oauth_authorize_url` + existingConfigMapName: "" + # -- issuer of JWT which the API will trust + authority: "" + # -- audience representing the API + audience: "" + # -- used only for enabling OAuth flows in swagger UI + oauthTokenUrl: "" + # -- used only for enabling OAuth flows in swagger UI + oauthAuthorizeUrl: "" + stationAuth: + # -- config containing authorization configuration for SF Station used when authentication is enabled for SF Station + configName: "station-auth-config" + secretName: "station-client-id" + +features: + multitenancy: + # -- enabled for multitenant deployment + enabled: false + edgeStreams: + # -- sf-tenant-management.enabled needs to be enabled since tenant operator is responsible for populating wlStream + enabled: false + +# -- config for rabbitmq subchart, see https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq +rabbitmq: + # -- configure if rabbitmq subchart should be included + enabled: true + extraPlugins: "rabbitmq_stream rabbitmq_stream_management rabbitmq_mqtt" + # -- service to publicly expose mqtt interface to be used by edge streams. Currently requires ALB controller https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.6/ + mqttPublicService: + enabled: false + mqttDnsHost: "" + # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on rabbitmq + rmqConfiguration: + # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, `useSsl`, and optionally `streamsPort` when `features.edgeStreams.enabled` is `true`. Other configuration is not used if You provide existing config map. + existingConfigMapName: "" + # -- username for existing RabbitMQ instance + username: "" + # -- hostname of existing RabbitMQ instance + hostname: "" + # -- port of existing RabbitMQ instance + port: 5672 + # -- set to `true` if existing RabbitMQ instance uses TLS + useSsl: false + # -- port for RabbitMQ streams protocol used only when `features.edgeStreams.enabled` is `true` + streamsPort: 5552 + # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on MQTT broker when `features.edgeStreams.enabled` is `true` + mqttConfiguration: + # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, and `useSsl`. Other configuration is not used if You provide existing config map. + existingConfigMapName: "" + # -- username for existing RabbitMQ instance + username: "" + # -- hostname of existing MQTT broker + hostname: "" + # -- port of existing MQTT broker + port: 1883 + # -- set to `true` if existing MQTT broker uses TLS + useSsl: false + auth: + # -- supply to bring you own secret. The secret needs to contain rabbitmq password under the key with name defined in `rabbitmq.auth.secretKey` + existingSecretName: "" + # -- define key of rabbitmq password in existing/provisioned secret + secretKey: "rabbitmq-password" + # -- username of created user in case that `rabbitmq.enabled` is `true` + username: "smartface" + # -- used by subchart + erlangCookie: "" + # -- used by subchart + password: "" + service: + extraPorts: + - name: mqtt + port: 1883 + targetPort: 1883 + - name: rmq-stream + port: 5552 + targetPort: 5552 + +# -- config for minio subchart, see https://github.com/bitnami/charts/tree/main/bitnami/minio +minio: + enabled: true + defaultBuckets: "smartface" + +# -- config for postgresql subchart, see https://github.com/bitnami/charts/tree/main/bitnami/postgresql +postgresql: + enabled: true + primary: + initdb: + scripts: + create-database.sql: "CREATE DATABASE smartface" + +api: + enabled: true + name: "api" + servicePort: 80 + containerPort: 80 + dnsHost: "" + initMigration: true + # -- Annotations for api deployment + annotations: {} + # -- Annotations for api pods + podAnnotations: {} + # -- Additional labels for each api pod + podLabels: {} + service: + # -- Annotations for api Service + annotations: {} + # -- Additional labels for api Service + labels: {} + pdb: + # -- create PodDisruptionBudget for api component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-api + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +authApi: + enabled: false + name: "auth-api" + servicePort: 8098 + containerPort: 80 + dnsHost: "" + initMigration: true + # -- Annotations for authApi deployment + annotations: {} + # -- Annotations for authApi pods + podAnnotations: {} + # -- Additional labels for each authApi pod + podLabels: {} + service: + # -- Annotations for authApi Service + annotations: {} + # -- Additional labels for authApi Service + labels: {} + pdb: + # -- create PodDisruptionBudget for authApi component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + # -- number of replicas to use when autoscaling is not enabled for this component + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-api + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +dbSynchronizationLeader: + # -- features.multitenancy needs to be enabled since tenant operator is responsible for populating wlStream + enabled: false + name: "db-synchronization-leader" + servicePort: 8100 + containerPort: 80 + dnsHost: "" + enableAuth: false + # -- Annotations for dbSynchronizationLeader deployment + annotations: {} + # -- Annotations for dbSynchronizationLeader pods + podAnnotations: {} + # -- Additional labels for each dbSynchronizationLeader pod + podLabels: {} + service: + # -- Annotations for dbSynchronizationLeader Service + annotations: {} + # -- Additional labels for dbSynchronizationLeader Service + labels: {} + pdb: + # -- create PodDisruptionBudget for dbSynchronizationLeader component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-db-synchronization-leader + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +graphqlApi: + enabled: true + name: "graphql-api" + servicePort: 8097 + containerPort: 80 + dnsHost: "" + enableAuth: false + initMigration: false + # -- Annotations for graphqlApi deployment + annotations: {} + # -- Annotations for graphqlApi pods + podAnnotations: {} + # -- Additional labels for each graphqlApi pod + podLabels: {} + service: + # -- Annotations for graphqlApi Service + annotations: {} + # -- Additional labels for graphqlApi Service + labels: {} + pdb: + # -- create PodDisruptionBudget for graphqlApi component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-graphql-api + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +ingress: + # -- enable creation of ingress object + enabled: true + # -- set ingress class + class: "" + # -- supply custom ingress annotation + annotations: + # -- if enabled then the ingress will include default ALB annotations + includeAlbAnnotations: false + # -- only used if includeAlbAnnotations == true + certificateArn: "" + +detector: + name: "detector" + # -- Annotations for detector deployment + annotations: {} + # -- Annotations for detector pods + podAnnotations: {} + # -- Additional labels for each detector pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for detector component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "600M" + cpu: "750m" + limits: + memory: "1500M" + nodeSelector: {} + tolerations: [] + # -- number of replicas to use when autoscaling is not enabled for this component + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-detector + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +extractor: + name: "extractor" + # -- Annotations for extractor deployment + annotations: {} + # -- Annotations for extractor pods + podAnnotations: {} + # -- Additional labels for each extractor pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for extractor component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "500M" + cpu: "750m" + limits: + memory: "1G" + nodeSelector: {} + tolerations: [] + # -- number of replicas to use when autoscaling is not enabled for this component + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-extractor + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +matcher: + name: "matcher" + # -- Annotations for matcher deployment + annotations: {} + # -- Annotations for matcher pods + podAnnotations: {} + # -- Additional labels for each matcher pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for matcher component. Only works when `features.multitenancy` is disabled as PDB is not compatible with tenant operator + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "200M" + cpu: "750m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-matcher + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +liveness: + name: "liveness" + # -- Annotations for liveness deployment + annotations: {} + # -- Annotations for liveness pods + podAnnotations: {} + # -- Additional labels for each liveness pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for liveness component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "200M" + cpu: "750m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-liveness + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +edgeStreamProcessor: + name: "edge-stream-processor" + # -- Annotations for edgeStreamProcessor deployment + annotations: {} + # -- Annotations for edgeStreamProcessor pods + podAnnotations: {} + # -- Additional labels for each edgeStreamProcessor pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for edgeStreamProcessor component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-edge-stream-processor + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +edgeStreamsStateSync: + name: "edge-streams-state-synchronizer" + # -- Annotations for edgeStreamsStateSync deployment + annotations: {} + # -- Annotations for edgeStreamsStateSync pods + podAnnotations: {} + # -- Additional labels for each edgeStreamsStateSync pod + podLabels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-edge-streams-state-synchronizer + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +wlStreamPopulationJob: + enabled: false + resources: {} + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-admin + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +base: + name: "base" + zmqServicePort: 2406 + zmqContainerPort: 2406 + # -- Annotations for base deployment + annotations: {} + # -- Annotations for base pods + podAnnotations: {} + # -- Additional labels for each base pod + podLabels: {} + service: + # -- Annotations for base Service + annotations: {} + # -- Additional labels for base Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-base + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +faceMatcher: + name: "face-matcher" + # -- Annotations for faceMatcher deployment + annotations: {} + # -- Annotations for faceMatcher pods + podAnnotations: {} + # -- Additional labels for each faceMatcher pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for faceMatcher component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-face-matcher + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +accessController: + name: "access-controller" + authServiceName: "auth-access-controller" + dnsHost: "" + servicePort: 5050 + containerPort: 80 + authServicePort: 5051 + authContainerPort: 5051 + # -- Annotations for accessController deployment + annotations: {} + # -- Annotations for accessController pods + podAnnotations: {} + # -- Additional labels for each accessController pod + podLabels: {} + service: + # -- Annotations for accessController Service + annotations: {} + # -- Additional labels for accessController Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-access-controller + # -- Access Controller follows different versioning, so the chart app needs to be overridden + tag: "v5_1.11.0" + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + mqttConfig: + enabled: false + topic: "edge-stream/{sourceId}/access-notifications/{notificationType}" + sendImageData: false + +station: + enabled: false + name: "station" + servicePort: 8000 + containerPort: 80 + dnsHost: "" + # -- Annotations for station deployment + annotations: {} + # -- Annotations for station pods + podAnnotations: {} + # -- Additional labels for each station pod + podLabels: {} + service: + # -- Annotations for station Service + annotations: {} + # -- Additional labels for station Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-station + # -- Smartface Station follows different versioning, so the chart app needs to be overridden + tag: "v5_1.25.1" + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +streamDataDbWorker: + name: "stream-data-db-worker" + # -- Annotations for streamDataDbWorker deployment + annotations: {} + # -- Annotations for streamDataDbWorker pods + podAnnotations: {} + # -- Additional labels for each streamDataDbWorker pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for streamDataDbWorker component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-streamdatadbworker + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +jaegerTracing: + enabled: true + hostname: grafana-agent.monitoring.svc.cluster.local + +migration: + enabled: true + initContainer: + resources: {} + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-admin + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +autoscaling: + cron: + # -- enables predefined workhours-based cron triggers on ScaledObjects + enabled: false + # -- see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + timezone: "Europe/Bratislava" + detector: + workHoursReplicas: 2 + nonWorkHoursReplicas: 1 + extractor: + workHoursReplicas: 2 + nonWorkHoursReplicas: 1 + api: + workHoursReplicas: 2 + nonWorkHoursReplicas: 1 + rmq: + # -- enables predefined rabbitmq triggers based on requests per second on ScaledObjects + enabled: false + triggerAuthName: "keda-trigger-auth-rabbitmq-conn" + hostSecretName: "rmq-management-uri-with-creds" + detector: + requestsPerSecond: 15 + extractor: + requestsPerSecond: 12 + api: + requestsPerSecond: 17 + detector: + # -- enables ScaledObject for detector + enabled: true + minReplicas: 1 + maxReplicas: 3 + # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers + triggers: [] + extractor: + # -- enables ScaledObject for extractor + enabled: true + minReplicas: 1 + maxReplicas: 3 + # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers + triggers: [] + api: + # -- enables ScaledObject for rest API + enabled: true + minReplicas: 1 + maxReplicas: 3 + # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers + triggers: [] + +# -- configuration for sf-tenant-management subchart +sf-tenant-management: + # -- configure if sf-tenant-management subchart should be included + enabled: false + apiDnsHost: "" + config: + mapName: "operator-config" + fileName: "appsettings.override.json" + configDir: "/etc/components" + installCrd: false + imagePullSecrets: + - name: "sf-gitlab-registry-creds" + api: + enabled: false + name: "sf-tenant-api" + servicePort: 80 + +countlyPublisher: + enabled: false + name: "countly-publisher" + clusterName: "" + # -- Annotations for countlyPublisher deployment + annotations: {} + # -- Annotations for countlyPublisher pods + podAnnotations: {} + # -- Additional labels for each countlyPublisher pod + podLabels: {} + service: + # -- Annotations for countlyPublisher Service + annotations: {} + # -- Additional labels for countlyPublisher Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-countly-publisher + # -- Countly publisher follows different versioning, so the chart app needs to be overridden + tag: "31" + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +tests: + authentication: + tenant1: + name: "" + clientId: "" + clientSecret: "" + tenant2: + name: "" + clientId: "" + clientSecret: "" + # -- Annotations for test pods + podAnnotations: {} + # -- Additional labels for test pods + podLabels: {} + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-cloud-func-tests + # -- Countly publisher follows different versioning, so the chart app needs to be overridden + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +metrics: + enabled: false + monitorDiscoveryLabel: + instance: primary + serviceDiscoveryLabels: + sf-metrics: "true" + portName: "metrics" + port: 4318 + +readonlyApi: + enabled: false + authName: "readonly-auth-api" + noAuthName: "readonly-noauth-api" + proxyContainer: + resources: {} + nodeSelector: {} + tolerations: [] + +serviceAccount: + # -- Specifies whether a ServiceAccount should be created + create: true + # -- The name of the ServiceAccount to use. + name: "sf-service-account" + # -- Image pull secrets for the service account + imagePullSecrets: [] + # -- Annotations for the service account + annotations: {} + # -- Labels for the service account + labels: {} + # -- Set this toggle to false to opt out of automounting API credentials for the service account + automountServiceAccountToken: true + +# -- due to ArgoCD limitations this can be used to skip validations that use the `lookup` helm function - for more information see https://github.com/argoproj/argo-cd/issues/5202 +skipLookupBasedValidations: false From 2ead51c806bf7c7c5cbb87c51ea4c3b72cd2abdf Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Fri, 28 Jun 2024 09:15:15 +0200 Subject: [PATCH 15/20] Revert "fix end lines" This reverts commit 2f57cdb47e84eff8a3c160335801a5bbf348eda7. --- .gitignore | 8 +- CHANGELOG.md | 228 +-- templates/_matcher.tpl | 160 +- templates/api-deployment.yaml | 190 +- templates/auth-api-deployment.yaml | 200 +- templates/countly-publisher-deployment.yaml | 174 +- .../db-synchronization-leader-deployment.yaml | 166 +- templates/detector-deployment.yaml | 150 +- .../access-controller-deployment.yaml | 182 +- templates/edge-streams/base-deployment.yaml | 156 +- .../edge-stream-processor-deployment.yaml | 152 +- .../edge-streams-state-sync-deployment.yaml | 154 +- .../edge-streams/face-matcher-deployment.yaml | 152 +- .../stream-data-db-worker-deployment.yaml | 156 +- templates/extractor-deployment.yaml | 150 +- templates/graphql-deployment.yaml | 190 +- templates/liveness-deployment.yaml | 146 +- .../readonly-api/api-nginx-deployment.yaml | 88 +- .../auth-api-nginx-deployment.yaml | 88 +- templates/station-deployment.yaml | 274 +-- values.yaml | 1796 ++++++++--------- 21 files changed, 2480 insertions(+), 2480 deletions(-) diff --git a/.gitignore b/.gitignore index 72e9b60..3639c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*.tgz -*.zip -.devcontainer/ -egid.values.yaml +*.tgz +*.zip +.devcontainer/ +egid.values.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index a70fef9..cb60e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,114 +1,114 @@ -# Changelog - -## [v0.8.0] - -### Added - -- Added test pods supporting `helm test` command - - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration -- Added support for tenant management API (ingress) -- Deployment revisionHistoryLimit and updateStrategy are configurable via values -- Access Controller MQTT settings are configurable via values -- Bumped version of SmartFace Station to 1.25.1 -- Bumped version of SmartFace Platform to 4.26.0 -- Bumped version of Access Controller to 1.11.0 - -### Changed -- Bumped version of `sf-tenant-management` subchart - - since the chart was renamed all references to previous name were changes - -### Breaking change - -- Changed default behavior for creating Authentication configuration. If you like to continue managing the previously created Authentication config map please use the `configurations.apiAuth.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.apiAuth` - - This change also includes renaming previous field `configurations.apiAuth.configName` -> `configurations.apiAuth.existingConfigMapName` - -## [v0.7.1] - -### Changed - -- Fixed condition for DbSynchronizationLeader deployment - -## [v0.7.0] - -### Added - -- Support for DbSynchronizationLeader has been added - -### Changed - -- Bumped version of sf-tenant-operator to 0.3.0 - -## [v0.6.0] - -### Changed - -- Bumped version of SmartFace Station to 1.22 - -### Breaking change - -- deployment of SmartFace Station is now disabled by default. To reenable previous behavior with deploying SmartFace Station please set the `station.enabled` value to `true`. - - previous behavior with enabled SmartFace Station caused the installation of helm chart with default values to fail on validation because SmartFace Station is currently dependant on SmartFace API with enabled authentication, which in turn requires the existence of external authentication provider and correct configuration of relevant SmartFace services - -## [v0.5.2] - -### Changed - -- Bumped version of SmartFace Platform to 4.24 - -## [v0.5.1] - -### Changed - -- Bumped version of SmartFace Platform and SmartFace Station - -## [v0.5.0] - -### Added - -- Support for using [minio subchart](https://github.com/bitnami/charts/tree/main/bitnami/minio) in place of S3 bucket - - This is now default behavior of the helm chart -- Support for using [postgresql subchart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) in place of externally managed PgSQL instance - - This is now default behavior of the helm chart - -### Breaking change - -- MinIO subchart is enabled and used by default. To keep using S3 bucket managed outside of this helm chart please set the `minio.enabled` value to `false` and provide configuration details via `configurations.s3` -- Postgresql subchart is enabled and used by default. To keep using PgSQL instance managed outside of this helm chart please set the `postgresql.enabled` value to `false` and provide configuration details via `configurations.database` - -## [v0.4.0] - -### Added - -- Common labels with option to specify custom labels/annotation for objects -- PodDisruptionBudgets for deployments that can be scaled -- Support for custom KEDA triggers -- Existing configmap for rabbitMQ and S3 is no longer necessary and the chart can create them from provided values, which is also the new default behavior for S3 - -### Breaking change - -- Changed default behavior for creating S3 configuration. If you like to continue managing the previously created S3 config map please use the `configurations.s3.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.s3` - - The ConfigMap keys for existing config map are no longer configurable, so if you want to keep using the ConfigMap not managed by this chart then please make sure that the key match what the helm chart expects -- Some values have had their keys changed or moved around: - - database secret -> value key changed from `configurations.database.secretName` to `configurations.database.existingSecretName` - - rmq secret values moved to auth parent object -> from `rabbitmq.existingSecretName` to `rabbitmq.auth.existingSecretName` and `rabbitmq.secretKey` to `rabbitmq.auth.secretKey` - - rmq configuration reworked -> value key `rabbitmq.configMapName` and `rabbitmq.mqttConfigMapName` replaced with `existingConfigMapName` key in `rabbitmq.rmqConfiguration` and `rabbitmq.mqttConfiguration` objects respectively - - mqtt dns host configuration changed -> value key `rabbitmq.mqttDnsHost` replaced with object with key `rabbitmq.mqttPublicService` that can be disabled - - deployment selectors changed - - autoscaling configuration reworked -> moved rmq and cron configuration related to services their respective sub-objects e.g. for detector from `autoscaling.detector` to `autoscaling.cron.detector` and `autoscaling.rmq.detector` -- Deployment label selectors and pod labels were modified to use a more standardized approach. Unfortunately since label selector are immutable and thus the helm release cannot be upgraded. Please first use `helm uninstall` and a fresh `helm install` for upgrading. For more information see the [official documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#label-selector-updates) - -## [v0.3.0] - -### Added - -- Support for pushing watchlist data to edge streams via EdgeStreamsStateSynchronizer - -## [v0.2.0] - -### Added - -- Initial implementation -- Chart can be configured to support following scenarios: - - Lightweight Face Identification System (LFIS) - single-tenant and multi-tenant - - Edge stream processing - single tenant only -- Chart can be configured to use externally-managed rabbitmq (e.g. [AmazonMQ](https://aws.amazon.com/amazon-mq/)) or deploy a rabbitmq [subchart](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq) +# Changelog + +## [v0.8.0] + +### Added + +- Added test pods supporting `helm test` command + - There are multiple test pods, some of which run based on what is possible to test in the selected chart configuration +- Added support for tenant management API (ingress) +- Deployment revisionHistoryLimit and updateStrategy are configurable via values +- Access Controller MQTT settings are configurable via values +- Bumped version of SmartFace Station to 1.25.1 +- Bumped version of SmartFace Platform to 4.26.0 +- Bumped version of Access Controller to 1.11.0 + +### Changed +- Bumped version of `sf-tenant-management` subchart + - since the chart was renamed all references to previous name were changes + +### Breaking change + +- Changed default behavior for creating Authentication configuration. If you like to continue managing the previously created Authentication config map please use the `configurations.apiAuth.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.apiAuth` + - This change also includes renaming previous field `configurations.apiAuth.configName` -> `configurations.apiAuth.existingConfigMapName` + +## [v0.7.1] + +### Changed + +- Fixed condition for DbSynchronizationLeader deployment + +## [v0.7.0] + +### Added + +- Support for DbSynchronizationLeader has been added + +### Changed + +- Bumped version of sf-tenant-operator to 0.3.0 + +## [v0.6.0] + +### Changed + +- Bumped version of SmartFace Station to 1.22 + +### Breaking change + +- deployment of SmartFace Station is now disabled by default. To reenable previous behavior with deploying SmartFace Station please set the `station.enabled` value to `true`. + - previous behavior with enabled SmartFace Station caused the installation of helm chart with default values to fail on validation because SmartFace Station is currently dependant on SmartFace API with enabled authentication, which in turn requires the existence of external authentication provider and correct configuration of relevant SmartFace services + +## [v0.5.2] + +### Changed + +- Bumped version of SmartFace Platform to 4.24 + +## [v0.5.1] + +### Changed + +- Bumped version of SmartFace Platform and SmartFace Station + +## [v0.5.0] + +### Added + +- Support for using [minio subchart](https://github.com/bitnami/charts/tree/main/bitnami/minio) in place of S3 bucket + - This is now default behavior of the helm chart +- Support for using [postgresql subchart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) in place of externally managed PgSQL instance + - This is now default behavior of the helm chart + +### Breaking change + +- MinIO subchart is enabled and used by default. To keep using S3 bucket managed outside of this helm chart please set the `minio.enabled` value to `false` and provide configuration details via `configurations.s3` +- Postgresql subchart is enabled and used by default. To keep using PgSQL instance managed outside of this helm chart please set the `postgresql.enabled` value to `false` and provide configuration details via `configurations.database` + +## [v0.4.0] + +### Added + +- Common labels with option to specify custom labels/annotation for objects +- PodDisruptionBudgets for deployments that can be scaled +- Support for custom KEDA triggers +- Existing configmap for rabbitMQ and S3 is no longer necessary and the chart can create them from provided values, which is also the new default behavior for S3 + +### Breaking change + +- Changed default behavior for creating S3 configuration. If you like to continue managing the previously created S3 config map please use the `configurations.s3.existingConfigMapName` field. Otherwise the ConfigMap will be managed by the helm chart using the values provided in `configurations.s3` + - The ConfigMap keys for existing config map are no longer configurable, so if you want to keep using the ConfigMap not managed by this chart then please make sure that the key match what the helm chart expects +- Some values have had their keys changed or moved around: + - database secret -> value key changed from `configurations.database.secretName` to `configurations.database.existingSecretName` + - rmq secret values moved to auth parent object -> from `rabbitmq.existingSecretName` to `rabbitmq.auth.existingSecretName` and `rabbitmq.secretKey` to `rabbitmq.auth.secretKey` + - rmq configuration reworked -> value key `rabbitmq.configMapName` and `rabbitmq.mqttConfigMapName` replaced with `existingConfigMapName` key in `rabbitmq.rmqConfiguration` and `rabbitmq.mqttConfiguration` objects respectively + - mqtt dns host configuration changed -> value key `rabbitmq.mqttDnsHost` replaced with object with key `rabbitmq.mqttPublicService` that can be disabled + - deployment selectors changed + - autoscaling configuration reworked -> moved rmq and cron configuration related to services their respective sub-objects e.g. for detector from `autoscaling.detector` to `autoscaling.cron.detector` and `autoscaling.rmq.detector` +- Deployment label selectors and pod labels were modified to use a more standardized approach. Unfortunately since label selector are immutable and thus the helm release cannot be upgraded. Please first use `helm uninstall` and a fresh `helm install` for upgrading. For more information see the [official documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#label-selector-updates) + +## [v0.3.0] + +### Added + +- Support for pushing watchlist data to edge streams via EdgeStreamsStateSynchronizer + +## [v0.2.0] + +### Added + +- Initial implementation +- Chart can be configured to support following scenarios: + - Lightweight Face Identification System (LFIS) - single-tenant and multi-tenant + - Edge stream processing - single tenant only +- Chart can be configured to use externally-managed rabbitmq (e.g. [AmazonMQ](https://aws.amazon.com/amazon-mq/)) or deploy a rabbitmq [subchart](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq) diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl index 5a96d6b..0b813ba 100644 --- a/templates/_matcher.tpl +++ b/templates/_matcher.tpl @@ -1,80 +1,80 @@ - -{{/* -Definition of matcher deployment manifest. Will either be used by tenant operator or directly -*/}} -{{- define "smartface.matcherDefinition" -}} -{{- $name := include "smartface.matcher.name" . -}} -{{- $selectorLabels := include "smartface.matcher.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.matcher.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.matcher.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.matcher.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matcher.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matcher.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ .Values.matcher.name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.matcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.matcher.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.matcher.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.matcher.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.matcher.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} + +{{/* +Definition of matcher deployment manifest. Will either be used by tenant operator or directly +*/}} +{{- define "smartface.matcherDefinition" -}} +{{- $name := include "smartface.matcher.name" . -}} +{{- $selectorLabels := include "smartface.matcher.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.matcher.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.matcher.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.matcher.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.matcher.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.matcher.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ .Values.matcher.name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.matcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.matcher.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.matcher.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.matcher.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.matcher.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/api-deployment.yaml b/templates/api-deployment.yaml index 6661ee8..a88fb19 100644 --- a/templates/api-deployment.yaml +++ b/templates/api-deployment.yaml @@ -1,95 +1,95 @@ -{{- if .Values.api.enabled }} -{{- $name := include "smartface.api.name" . -}} -{{- $selectorLabels := include "smartface.api.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.api.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.api.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.api.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.api.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.api.image.pullPolicy }} - ports: - - name: "http" - containerPort: {{ .Values.api.containerPort }} - - name: {{ .Values.metrics.portName | quote }} - containerPort: {{ .Values.metrics.port }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} - {{- include "smartface.statisticsPublish" . | nindent 8 }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.api.containerPort | quote }} - resources: - {{- toYaml .Values.api.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - {{- if and .Values.migration.enabled .Values.api.initMigration }} - initContainers: - {{- include "smartface.migrationInitContainer" . | nindent 6 }} - {{- end }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.api.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.api.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.api.enabled }} +{{- $name := include "smartface.api.name" . -}} +{{- $selectorLabels := include "smartface.api.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.api.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.api.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.api.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.api.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.api.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.api.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.api.image.pullPolicy }} + ports: + - name: "http" + containerPort: {{ .Values.api.containerPort }} + - name: {{ .Values.metrics.portName | quote }} + containerPort: {{ .Values.metrics.port }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} + {{- include "smartface.statisticsPublish" . | nindent 8 }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.api.containerPort | quote }} + resources: + {{- toYaml .Values.api.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + {{- if and .Values.migration.enabled .Values.api.initMigration }} + initContainers: + {{- include "smartface.migrationInitContainer" . | nindent 6 }} + {{- end }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.api.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.api.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/auth-api-deployment.yaml b/templates/auth-api-deployment.yaml index b72e2eb..a9045e2 100644 --- a/templates/auth-api-deployment.yaml +++ b/templates/auth-api-deployment.yaml @@ -1,100 +1,100 @@ -{{- if .Values.authApi.enabled }} -{{- $name := include "smartface.authApi.name" . -}} -{{- $selectorLabels := include "smartface.authApi.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.authApi.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.authApi.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.api.enabled ) }} - replicas: {{ .Values.authApi.replicas }} - {{- end }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.authApi.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.authApi.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.authApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.authApi.image.pullPolicy }} - ports: - - name: "http" - containerPort: {{ .Values.authApi.containerPort }} - - name: {{ .Values.metrics.portName | quote }} - containerPort: {{ .Values.metrics.port }} - env: - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} - {{- include "smartface.statisticsPublish" . | nindent 8 }} - - name: "Multitenancy__UseMultitenancy" - value: {{ .Values.features.multitenancy.enabled | quote }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.authApi.containerPort | quote }} - resources: - {{- toYaml .Values.authApi.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - {{- if and .Values.migration.enabled .Values.authApi.initMigration }} - initContainers: - {{- include "smartface.migrationInitContainer" . | nindent 6 }} - {{- end }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.authApi.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.authApi.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.authApi.enabled }} +{{- $name := include "smartface.authApi.name" . -}} +{{- $selectorLabels := include "smartface.authApi.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.authApi.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.authApi.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.api.enabled ) }} + replicas: {{ .Values.authApi.replicas }} + {{- end }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.authApi.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.authApi.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.authApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.authApi.image.pullPolicy }} + ports: + - name: "http" + containerPort: {{ .Values.authApi.containerPort }} + - name: {{ .Values.metrics.portName | quote }} + containerPort: {{ .Values.metrics.port }} + env: + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} + {{- include "smartface.statisticsPublish" . | nindent 8 }} + - name: "Multitenancy__UseMultitenancy" + value: {{ .Values.features.multitenancy.enabled | quote }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.authApi.containerPort | quote }} + resources: + {{- toYaml .Values.authApi.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + {{- if and .Values.migration.enabled .Values.authApi.initMigration }} + initContainers: + {{- include "smartface.migrationInitContainer" . | nindent 6 }} + {{- end }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.authApi.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.authApi.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/countly-publisher-deployment.yaml b/templates/countly-publisher-deployment.yaml index 745bddc..e5cbf09 100644 --- a/templates/countly-publisher-deployment.yaml +++ b/templates/countly-publisher-deployment.yaml @@ -1,87 +1,87 @@ -{{- if .Values.countlyPublisher.enabled }} -{{- $name := include "smartface.countlyPublisher.name" . -}} -{{- $selectorLabels := include "smartface.countlyPublisher.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.countlyPublisher.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.countlyPublisher.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.countlyPublisher.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.countlyPublisher.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.countlyPublisher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.countlyPublisher.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - - name: "CountlyConfiguration__ServerUrl" - valueFrom: - configMapKeyRef: - name: countly-config - key: url - - name: "CountlyConfiguration__AppKey" - valueFrom: - secretKeyRef: - name: counlty-app-key - key: key - - name: "CountlyConfiguration__AdditionalSegmentations__0__Key" - value: "Cluster" - - name: "CountlyConfiguration__AdditionalSegmentations__0__Value" - value: {{ .Values.countlyPublisher.clusterName | quote }} - - name: "PrometheusConfiguration__Endpoints__0" - value: "http://+:{{ .Values.metrics.port }}/" - resources: - {{- toYaml .Values.countlyPublisher.resources | nindent 10 }} - {{- with .Values.countlyPublisher.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.countlyPublisher.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.countlyPublisher.enabled }} +{{- $name := include "smartface.countlyPublisher.name" . -}} +{{- $selectorLabels := include "smartface.countlyPublisher.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.countlyPublisher.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.countlyPublisher.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.countlyPublisher.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.countlyPublisher.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.countlyPublisher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.countlyPublisher.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + - name: "CountlyConfiguration__ServerUrl" + valueFrom: + configMapKeyRef: + name: countly-config + key: url + - name: "CountlyConfiguration__AppKey" + valueFrom: + secretKeyRef: + name: counlty-app-key + key: key + - name: "CountlyConfiguration__AdditionalSegmentations__0__Key" + value: "Cluster" + - name: "CountlyConfiguration__AdditionalSegmentations__0__Value" + value: {{ .Values.countlyPublisher.clusterName | quote }} + - name: "PrometheusConfiguration__Endpoints__0" + value: "http://+:{{ .Values.metrics.port }}/" + resources: + {{- toYaml .Values.countlyPublisher.resources | nindent 10 }} + {{- with .Values.countlyPublisher.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.countlyPublisher.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/db-synchronization-leader-deployment.yaml b/templates/db-synchronization-leader-deployment.yaml index 5770a2f..826035d 100644 --- a/templates/db-synchronization-leader-deployment.yaml +++ b/templates/db-synchronization-leader-deployment.yaml @@ -1,83 +1,83 @@ -{{- if and .Values.dbSynchronizationLeader.enabled (index .Values "sf-tenant-management" "enabled") }} -{{- $name := include "smartface.dbSynchronizationLeader.name" . -}} -{{- $selectorLabels := include "smartface.dbSynchronizationLeader.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.dbSynchronizationLeader.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.dbSynchronizationLeader.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.dbSynchronizationLeader.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.dbSynchronizationLeader.image.pullPolicy }} - ports: - - containerPort: {{ .Values.dbSynchronizationLeader.containerPort }} - env: - {{- if .Values.dbSynchronizationLeader.enableAuth }} - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - - name: "Multitenancy__UseMultitenancy" - value: {{ .Values.features.multitenancy.enabled | quote }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.dbSynchronizationLeader.containerPort | quote }} - resources: - {{- toYaml .Values.dbSynchronizationLeader.resources | nindent 10 }} - {{- with .Values.dbSynchronizationLeader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dbSynchronizationLeader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if and .Values.dbSynchronizationLeader.enabled (index .Values "sf-tenant-management" "enabled") }} +{{- $name := include "smartface.dbSynchronizationLeader.name" . -}} +{{- $selectorLabels := include "smartface.dbSynchronizationLeader.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.dbSynchronizationLeader.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.dbSynchronizationLeader.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.dbSynchronizationLeader.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.dbSynchronizationLeader.image.pullPolicy }} + ports: + - containerPort: {{ .Values.dbSynchronizationLeader.containerPort }} + env: + {{- if .Values.dbSynchronizationLeader.enableAuth }} + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + - name: "Multitenancy__UseMultitenancy" + value: {{ .Values.features.multitenancy.enabled | quote }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.dbSynchronizationLeader.containerPort | quote }} + resources: + {{- toYaml .Values.dbSynchronizationLeader.resources | nindent 10 }} + {{- with .Values.dbSynchronizationLeader.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.dbSynchronizationLeader.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/detector-deployment.yaml b/templates/detector-deployment.yaml index 90412c1..9cf7015 100644 --- a/templates/detector-deployment.yaml +++ b/templates/detector-deployment.yaml @@ -1,75 +1,75 @@ -{{- $name := include "smartface.detector.name" . -}} -{{- $selectorLabels := include "smartface.detector.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.detector.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.detector.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.detector.enabled ) }} - replicas: {{ .Values.detector.replicas }} - {{- end }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.detector.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.detector.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.detector.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.detector.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.detector.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.detector.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.detector.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{- $name := include "smartface.detector.name" . -}} +{{- $selectorLabels := include "smartface.detector.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.detector.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.detector.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.detector.enabled ) }} + replicas: {{ .Values.detector.replicas }} + {{- end }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.detector.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.detector.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.detector.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.detector.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.detector.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.detector.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.detector.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index 5db9cc2..d19cef0 100644 --- a/templates/edge-streams/access-controller-deployment.yaml +++ b/templates/edge-streams/access-controller-deployment.yaml @@ -1,91 +1,91 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.accessController.name" . -}} -{{- $selectorLabels := include "smartface.accessController.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.accessController.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.accessController.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.accessController.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.accessController.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.accessController.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.accessController.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - - name: "Kestrel__EndPoints__Http__Url" - value: "http://0.0.0.0:{{ .Values.accessController.containerPort }}" - - name: "Kestrel__EndPoints__Http__RequireAuthentication" - value: "false" - - name: "Kestrel__EndPoints__HttpAuth__Url" - value: "http://0.0.0.0:{{ .Values.accessController.authContainerPort }}" - - name: "Kestrel__EndPoints__HttpAuth__RequireAuthentication" - value: "true" - - name: "MQTT__Enabled" - value: {{ .Values.accessController.mqttConfig.enabled | quote }} - - name: "MQTT__Topic" - value: {{ .Values.accessController.mqttConfig.topic | quote }} - - name: "MQTT__SendImageData" - value: {{ .Values.accessController.mqttConfig.sendImageData | quote }} - resources: - {{- toYaml .Values.accessController.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.accessController.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.accessController.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.accessController.name" . -}} +{{- $selectorLabels := include "smartface.accessController.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.accessController.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.accessController.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.accessController.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.accessController.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.accessController.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.accessController.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + - name: "Kestrel__EndPoints__Http__Url" + value: "http://0.0.0.0:{{ .Values.accessController.containerPort }}" + - name: "Kestrel__EndPoints__Http__RequireAuthentication" + value: "false" + - name: "Kestrel__EndPoints__HttpAuth__Url" + value: "http://0.0.0.0:{{ .Values.accessController.authContainerPort }}" + - name: "Kestrel__EndPoints__HttpAuth__RequireAuthentication" + value: "true" + - name: "MQTT__Enabled" + value: {{ .Values.accessController.mqttConfig.enabled | quote }} + - name: "MQTT__Topic" + value: {{ .Values.accessController.mqttConfig.topic | quote }} + - name: "MQTT__SendImageData" + value: {{ .Values.accessController.mqttConfig.sendImageData | quote }} + resources: + {{- toYaml .Values.accessController.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.accessController.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.accessController.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/base-deployment.yaml b/templates/edge-streams/base-deployment.yaml index 02d40a5..aa22917 100644 --- a/templates/edge-streams/base-deployment.yaml +++ b/templates/edge-streams/base-deployment.yaml @@ -1,78 +1,78 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.base.name" . -}} -{{- $selectorLabels := include "smartface.base.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.base.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.base.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.base.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.base.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.base.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.base.image.pullPolicy }} - args: ["--serviceName", "SFBase"] - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - resources: - {{- toYaml .Values.base.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.base.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.base.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.base.name" . -}} +{{- $selectorLabels := include "smartface.base.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.base.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.base.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.base.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.base.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.base.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.base.image.pullPolicy }} + args: ["--serviceName", "SFBase"] + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + resources: + {{- toYaml .Values.base.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.base.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.base.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/edge-stream-processor-deployment.yaml b/templates/edge-streams/edge-stream-processor-deployment.yaml index 6965007..873da08 100644 --- a/templates/edge-streams/edge-stream-processor-deployment.yaml +++ b/templates/edge-streams/edge-stream-processor-deployment.yaml @@ -1,76 +1,76 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.edgeStreamProcessor.name" . -}} -{{- $selectorLabels := include "smartface.edgeStreamProcessor.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.edgeStreamProcessor.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.edgeStreamProcessor.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.edgeStreamProcessor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.edgeStreamProcessor.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.edgeStreamProcessor.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.edgeStreamProcessor.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamProcessor.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.edgeStreamProcessor.name" . -}} +{{- $selectorLabels := include "smartface.edgeStreamProcessor.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.edgeStreamProcessor.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.edgeStreamProcessor.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.edgeStreamProcessor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.edgeStreamProcessor.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.edgeStreamProcessor.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.edgeStreamProcessor.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamProcessor.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/edge-streams-state-sync-deployment.yaml b/templates/edge-streams/edge-streams-state-sync-deployment.yaml index 4db8539..d609fd1 100644 --- a/templates/edge-streams/edge-streams-state-sync-deployment.yaml +++ b/templates/edge-streams/edge-streams-state-sync-deployment.yaml @@ -1,77 +1,77 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.edgeStreamsStateSync.name" . -}} -{{- $selectorLabels := include "smartface.edgeStreamsStateSync.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.edgeStreamsStateSync.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.edgeStreamsStateSync.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.edgeStreamsStateSync.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.edgeStreamsStateSync.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.edgeStreamsStateSync.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.edgeStreamsStateSync.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.edgeStreamsStateSync.name" . -}} +{{- $selectorLabels := include "smartface.edgeStreamsStateSync.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.edgeStreamsStateSync.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.edgeStreamsStateSync.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.edgeStreamsStateSync.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.edgeStreamsStateSync.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.edgeStreamsStateSync.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.edgeStreamsStateSync.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/face-matcher-deployment.yaml b/templates/edge-streams/face-matcher-deployment.yaml index d4ce930..a8f5d5b 100644 --- a/templates/edge-streams/face-matcher-deployment.yaml +++ b/templates/edge-streams/face-matcher-deployment.yaml @@ -1,76 +1,76 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.faceMatcher.name" . -}} -{{- $selectorLabels := include "smartface.faceMatcher.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.faceMatcher.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.faceMatcher.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.faceMatcher.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.faceMatcher.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.faceMatcher.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.faceMatcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.faceMatcher.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.faceMatcher.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.faceMatcher.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.faceMatcher.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.faceMatcher.name" . -}} +{{- $selectorLabels := include "smartface.faceMatcher.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.faceMatcher.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.faceMatcher.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.faceMatcher.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.faceMatcher.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.faceMatcher.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.faceMatcher.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.faceMatcher.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.faceMatcher.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.faceMatcher.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.faceMatcher.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/edge-streams/stream-data-db-worker-deployment.yaml b/templates/edge-streams/stream-data-db-worker-deployment.yaml index 1473487..36dd69c 100644 --- a/templates/edge-streams/stream-data-db-worker-deployment.yaml +++ b/templates/edge-streams/stream-data-db-worker-deployment.yaml @@ -1,78 +1,78 @@ -{{- if .Values.features.edgeStreams.enabled }} -{{- $name := include "smartface.streamDataDbWorker.name" . -}} -{{- $selectorLabels := include "smartface.streamDataDbWorker.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.streamDataDbWorker.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.streamDataDbWorker.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.streamDataDbWorker.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.streamDataDbWorker.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.streamDataDbWorker.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.streamDataDbWorker.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.streamDataDbWorker.image.pullPolicy }} - ports: - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.streamDataDbWorker.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.streamDataDbWorker.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.streamDataDbWorker.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.features.edgeStreams.enabled }} +{{- $name := include "smartface.streamDataDbWorker.name" . -}} +{{- $selectorLabels := include "smartface.streamDataDbWorker.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.streamDataDbWorker.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.streamDataDbWorker.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.streamDataDbWorker.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.streamDataDbWorker.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.streamDataDbWorker.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.streamDataDbWorker.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.streamDataDbWorker.image.pullPolicy }} + ports: + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.streamDataDbWorker.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.streamDataDbWorker.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.streamDataDbWorker.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/extractor-deployment.yaml b/templates/extractor-deployment.yaml index 7ec9487..f831fc9 100644 --- a/templates/extractor-deployment.yaml +++ b/templates/extractor-deployment.yaml @@ -1,75 +1,75 @@ -{{- $name := include "smartface.extractor.name" . -}} -{{- $selectorLabels := include "smartface.extractor.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.extractor.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.extractor.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.extractor.enabled ) }} - replicas: {{ .Values.extractor.replicas }} - {{- end }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.extractor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.extractor.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.extractor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.extractor.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.extractor.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.extractor.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.extractor.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{- $name := include "smartface.extractor.name" . -}} +{{- $selectorLabels := include "smartface.extractor.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.extractor.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.extractor.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if not (and (or .Values.autoscaling.cron.enabled .Values.autoscaling.rmq.enabled) .Values.autoscaling.extractor.enabled ) }} + replicas: {{ .Values.extractor.replicas }} + {{- end }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.extractor.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.extractor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.extractor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.extractor.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.extractor.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.extractor.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.extractor.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/graphql-deployment.yaml b/templates/graphql-deployment.yaml index b107d2a..314cd70 100644 --- a/templates/graphql-deployment.yaml +++ b/templates/graphql-deployment.yaml @@ -1,95 +1,95 @@ -{{- if .Values.graphqlApi.enabled }} -{{- $name := include "smartface.graphqlApi.name" . -}} -{{- $selectorLabels := include "smartface.graphqlApi.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.graphqlApi.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.graphqlApi.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.graphqlApi.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.graphqlApi.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.graphqlApi.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.graphqlApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.graphqlApi.image.pullPolicy }} - ports: - - containerPort: {{ .Values.graphqlApi.containerPort }} - env: - {{- if .Values.graphqlApi.enableAuth }} - {{- include "smartface.authenticationConfig" . | nindent 8 }} - {{- end }} - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.dbConfig" . | nindent 8 }} - {{- include "smartface.s3Config" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} - {{- include "smartface.mqttConfig" . | nindent 8 }} - {{- end }} - - name: "Multitenancy__UseMultitenancy" - value: {{ .Values.features.multitenancy.enabled | quote }} - - name: "Hosting__Host" - value: "http://0.0.0.0" - - name: "Hosting__Port" - value: {{ .Values.graphqlApi.containerPort | quote }} - resources: - {{- toYaml .Values.graphqlApi.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - {{- if and .Values.migration.enabled .Values.graphqlApi.initMigration }} - initContainers: - {{- include "smartface.migrationInitContainer" . | nindent 6 }} - {{- end }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.graphqlApi.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.graphqlApi.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} +{{- if .Values.graphqlApi.enabled }} +{{- $name := include "smartface.graphqlApi.name" . -}} +{{- $selectorLabels := include "smartface.graphqlApi.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.graphqlApi.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.graphqlApi.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.graphqlApi.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.graphqlApi.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.graphqlApi.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.graphqlApi.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.graphqlApi.image.pullPolicy }} + ports: + - containerPort: {{ .Values.graphqlApi.containerPort }} + env: + {{- if .Values.graphqlApi.enableAuth }} + {{- include "smartface.authenticationConfig" . | nindent 8 }} + {{- end }} + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.dbConfig" . | nindent 8 }} + {{- include "smartface.s3Config" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- if and .Values.features.edgeStreams.enabled (or .Values.rabbitmq.enabled (not .Values.rabbitmq.mqttConfiguration.existingConfigMapName)) }} + {{- include "smartface.mqttConfig" . | nindent 8 }} + {{- end }} + - name: "Multitenancy__UseMultitenancy" + value: {{ .Values.features.multitenancy.enabled | quote }} + - name: "Hosting__Host" + value: "http://0.0.0.0" + - name: "Hosting__Port" + value: {{ .Values.graphqlApi.containerPort | quote }} + resources: + {{- toYaml .Values.graphqlApi.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + {{- if and .Values.migration.enabled .Values.graphqlApi.initMigration }} + initContainers: + {{- include "smartface.migrationInitContainer" . | nindent 6 }} + {{- end }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.graphqlApi.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.graphqlApi.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end }} diff --git a/templates/liveness-deployment.yaml b/templates/liveness-deployment.yaml index ef7605b..a5362b4 100644 --- a/templates/liveness-deployment.yaml +++ b/templates/liveness-deployment.yaml @@ -1,73 +1,73 @@ -{{- $name := include "smartface.liveness.name" . -}} -{{- $selectorLabels := include "smartface.liveness.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.liveness.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.liveness.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.liveness.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.liveness.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.liveness.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.liveness.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.liveness.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - resources: - {{- toYaml .Values.liveness.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.liveness.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.liveness.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +{{- $name := include "smartface.liveness.name" . -}} +{{- $selectorLabels := include "smartface.liveness.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.liveness.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.liveness.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.liveness.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.liveness.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.liveness.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.liveness.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.liveness.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + resources: + {{- toYaml .Values.liveness.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.liveness.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.liveness.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/readonly-api/api-nginx-deployment.yaml b/templates/readonly-api/api-nginx-deployment.yaml index 50653e5..ad13fce 100644 --- a/templates/readonly-api/api-nginx-deployment.yaml +++ b/templates/readonly-api/api-nginx-deployment.yaml @@ -1,44 +1,44 @@ -{{- if and .Values.readonlyApi.enabled .Values.api.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.readonlyApi.noAuthName | quote }} -spec: - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - app: {{ .Values.readonlyApi.noAuthName | quote }} - replicas: 1 - template: - metadata: - labels: - app: {{ .Values.readonlyApi.noAuthName | quote }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - containers: - - name: nginx - image: nginx:1.25.1 - ports: - - name: "http" - containerPort: {{ .Values.api.containerPort }} - volumeMounts: - - name: nginx-conf - mountPath: /etc/nginx/conf.d/default.conf - subPath: nginx.conf - readOnly: true - resources: - {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} - volumes: - - name: nginx-conf - configMap: - name: {{ .Values.readonlyApi.noAuthName | quote }} - items: - - key: nginx.conf - path: nginx.conf -{{- end }} +{{- if and .Values.readonlyApi.enabled .Values.api.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.readonlyApi.noAuthName | quote }} +spec: + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + app: {{ .Values.readonlyApi.noAuthName | quote }} + replicas: 1 + template: + metadata: + labels: + app: {{ .Values.readonlyApi.noAuthName | quote }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + containers: + - name: nginx + image: nginx:1.25.1 + ports: + - name: "http" + containerPort: {{ .Values.api.containerPort }} + volumeMounts: + - name: nginx-conf + mountPath: /etc/nginx/conf.d/default.conf + subPath: nginx.conf + readOnly: true + resources: + {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} + volumes: + - name: nginx-conf + configMap: + name: {{ .Values.readonlyApi.noAuthName | quote }} + items: + - key: nginx.conf + path: nginx.conf +{{- end }} diff --git a/templates/readonly-api/auth-api-nginx-deployment.yaml b/templates/readonly-api/auth-api-nginx-deployment.yaml index 388cc90..bb9d154 100644 --- a/templates/readonly-api/auth-api-nginx-deployment.yaml +++ b/templates/readonly-api/auth-api-nginx-deployment.yaml @@ -1,44 +1,44 @@ -{{- if and .Values.readonlyApi.enabled .Values.authApi.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ .Values.readonlyApi.authName | quote }} -spec: - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - app: {{ .Values.readonlyApi.authName | quote }} - replicas: 1 - template: - metadata: - labels: - app: {{ .Values.readonlyApi.authName | quote }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - containers: - - name: nginx - image: nginx:1.25.1 - ports: - - name: "http" - containerPort: {{ .Values.authApi.containerPort }} - volumeMounts: - - name: nginx-conf - mountPath: /etc/nginx/conf.d/default.conf - subPath: nginx.conf - readOnly: true - resources: - {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} - volumes: - - name: nginx-conf - configMap: - name: {{ .Values.readonlyApi.authName | quote }} - items: - - key: nginx.conf - path: nginx.conf -{{- end }} +{{- if and .Values.readonlyApi.enabled .Values.authApi.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.readonlyApi.authName | quote }} +spec: + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + app: {{ .Values.readonlyApi.authName | quote }} + replicas: 1 + template: + metadata: + labels: + app: {{ .Values.readonlyApi.authName | quote }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + containers: + - name: nginx + image: nginx:1.25.1 + ports: + - name: "http" + containerPort: {{ .Values.authApi.containerPort }} + volumeMounts: + - name: nginx-conf + mountPath: /etc/nginx/conf.d/default.conf + subPath: nginx.conf + readOnly: true + resources: + {{- toYaml .Values.readonlyApi.proxyContainer.resources | nindent 10 }} + volumes: + - name: nginx-conf + configMap: + name: {{ .Values.readonlyApi.authName | quote }} + items: + - key: nginx.conf + path: nginx.conf +{{- end }} diff --git a/templates/station-deployment.yaml b/templates/station-deployment.yaml index 5945b42..220c2a7 100644 --- a/templates/station-deployment.yaml +++ b/templates/station-deployment.yaml @@ -1,137 +1,137 @@ -{{- if .Values.station.enabled }} -{{- $name := include "smartface.station.name" . -}} -{{- $selectorLabels := include "smartface.station.selectorLabels" . -}} -apiVersion: "apps/v1" -kind: "Deployment" -metadata: - name: {{ $name | quote }} - labels: - {{- include "smartface.station.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.station.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: 1 - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.station.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.station.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.station.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.station.image.pullPolicy }} - env: - {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} - - name: "HOST" - value: "0.0.0.0" - - name: "PORT" - value: {{ .Values.station.containerPort | quote }} - - name: "CORE_API_ROOT" - {{- if .Values.readonlyApi.enabled }} - value: "http://{{ .Values.readonlyApi.authName }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" - {{- else }} - value: "http://{{ include "smartface.authApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" - {{- end }} - - name: "ZERO_MQ_HOST" - value: "{{ include "smartface.base.name" . }}.{{ .Release.Namespace }}.svc.cluster.local" - - name: "ZERO_MQ_PORT" - value: "{{ .Values.base.zmqServicePort }}" - - name: "GRAPHQL_ROOT" - value: "http://{{ include "smartface.graphqlApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.graphqlApi.servicePort }}/graphql" - - name: "ACCESS_CONTROLLER_ADDRESS" - value: "{{ include "smartface.accessController.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.accessController.servicePort }}" - - name: "BLACKLIST_WATCHLIST_IDS" - value: "" - - name: "KEYCLOAK_ADMIN_URL" - value: "" - - name: "DOT_FACE_CAMERA_ENABLED" - value: "true" - - name: "IDENTIFICATION_ENABLED" - value: "true" - - - name: "AUTH0_AUTHENTICATION_ENABLED" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "use_auth" - - name: "AUTH0_AUDIENCE" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "audience" - - name: "AUTH0_DOMAIN" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "domain" - - name: "AUTH0_ISSUER" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "issuer" - - name: "AUTH0_JWKS_URI" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "jwks_uri" - - name: "AUTH_HEADER" - valueFrom: - configMapKeyRef: - name: {{ .Values.configurations.stationAuth.configName | quote }} - key: "auth_header" - - - name: "AUTH0_CLIENT_ID" - valueFrom: - secretKeyRef: - name: {{ .Values.configurations.stationAuth.secretName | quote }} - key: "client_id" - resources: - {{- toYaml .Values.station.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.station.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.station.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end}} +{{- if .Values.station.enabled }} +{{- $name := include "smartface.station.name" . -}} +{{- $selectorLabels := include "smartface.station.selectorLabels" . -}} +apiVersion: "apps/v1" +kind: "Deployment" +metadata: + name: {{ $name | quote }} + labels: + {{- include "smartface.station.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.station.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: 1 + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.station.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.station.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.station.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.station.image.pullPolicy }} + env: + {{- include "smartface.apiFeaturesConfig" . | nindent 8 }} + - name: "HOST" + value: "0.0.0.0" + - name: "PORT" + value: {{ .Values.station.containerPort | quote }} + - name: "CORE_API_ROOT" + {{- if .Values.readonlyApi.enabled }} + value: "http://{{ .Values.readonlyApi.authName }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" + {{- else }} + value: "http://{{ include "smartface.authApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.authApi.servicePort }}/api/v1" + {{- end }} + - name: "ZERO_MQ_HOST" + value: "{{ include "smartface.base.name" . }}.{{ .Release.Namespace }}.svc.cluster.local" + - name: "ZERO_MQ_PORT" + value: "{{ .Values.base.zmqServicePort }}" + - name: "GRAPHQL_ROOT" + value: "http://{{ include "smartface.graphqlApi.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.graphqlApi.servicePort }}/graphql" + - name: "ACCESS_CONTROLLER_ADDRESS" + value: "{{ include "smartface.accessController.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.accessController.servicePort }}" + - name: "BLACKLIST_WATCHLIST_IDS" + value: "" + - name: "KEYCLOAK_ADMIN_URL" + value: "" + - name: "DOT_FACE_CAMERA_ENABLED" + value: "true" + - name: "IDENTIFICATION_ENABLED" + value: "true" + + - name: "AUTH0_AUTHENTICATION_ENABLED" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "use_auth" + - name: "AUTH0_AUDIENCE" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "audience" + - name: "AUTH0_DOMAIN" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "domain" + - name: "AUTH0_ISSUER" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "issuer" + - name: "AUTH0_JWKS_URI" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "jwks_uri" + - name: "AUTH_HEADER" + valueFrom: + configMapKeyRef: + name: {{ .Values.configurations.stationAuth.configName | quote }} + key: "auth_header" + + - name: "AUTH0_CLIENT_ID" + valueFrom: + secretKeyRef: + name: {{ .Values.configurations.stationAuth.secretName | quote }} + key: "client_id" + resources: + {{- toYaml .Values.station.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.station.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.station.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} +{{- end}} diff --git a/values.yaml b/values.yaml index 844f508..5732f45 100644 --- a/values.yaml +++ b/values.yaml @@ -1,898 +1,898 @@ -# Default values for smartface. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -global: - image: - # -- Overrides the Docker registry globally for all images - registry: "registry.gitlab.com" - -# -- Overrides the chart's name -nameOverride: null -# -- Common annotations for all deployments/StatefulSets -annotations: {} -# -- Common annotations for all pods -podAnnotations: {} -# -- Common labels for all pods -podLabels: {} -# -- Common annotations for all services -serviceAnnotations: {} -# -- Common labels for all services -serviceLabels: {} -# -- Common revisionHistoryLimit for all deployments -revisionHistoryLimit: -# -- Common updateStrategy for all deployments -updateStrategy: {} - -# -- docker secrets used to pull images with -imagePullSecrets: - - name: "sf-gitlab-registry-creds" - -configurations: - database: - # -- connection string needs to be provided as a dependency of the chart - existingSecretName: "db-cs" - # -- key within the existing secret which contains the connection string, see https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/connection-strings - connectionStringKey: "cs" - s3: - # -- supply to bring your own configmap. the configmap needs following keys: `name`, `region`, `folder`, `authType` and `useBucketRegion` - existingConfigMapName: "" - # -- name of S3 bucket - bucketName: "" - # -- system name of AWS region of S3 bucket e.g. `eu-central-1` - bucketRegion: "" - # -- prefix (folder) used for S3 objects - bucketFolder: "" - # -- type of authentication to be used. Currently `AssumedRole` and `InstanceProfile` are usable - authType: "AssumedRole" - # -- mechanism to resolve bucket endpoint - if `true` then connection is made based on bucket region. If `false` then bucket endpoint needs to be set manually - useBucketRegion: true - license: - secretName: "iface-lic" - volumeMountName: "license" - mountPath: "/etc/innovatrics" - apiAuth: - # -- supply to bring your own configmap. the configmap needs following keys: `authority`, `audience`, `oauth_token_url` and `oauth_authorize_url` - existingConfigMapName: "" - # -- issuer of JWT which the API will trust - authority: "" - # -- audience representing the API - audience: "" - # -- used only for enabling OAuth flows in swagger UI - oauthTokenUrl: "" - # -- used only for enabling OAuth flows in swagger UI - oauthAuthorizeUrl: "" - stationAuth: - # -- config containing authorization configuration for SF Station used when authentication is enabled for SF Station - configName: "station-auth-config" - secretName: "station-client-id" - -features: - multitenancy: - # -- enabled for multitenant deployment - enabled: false - edgeStreams: - # -- sf-tenant-management.enabled needs to be enabled since tenant operator is responsible for populating wlStream - enabled: false - -# -- config for rabbitmq subchart, see https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq -rabbitmq: - # -- configure if rabbitmq subchart should be included - enabled: true - extraPlugins: "rabbitmq_stream rabbitmq_stream_management rabbitmq_mqtt" - # -- service to publicly expose mqtt interface to be used by edge streams. Currently requires ALB controller https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.6/ - mqttPublicService: - enabled: false - mqttDnsHost: "" - # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on rabbitmq - rmqConfiguration: - # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, `useSsl`, and optionally `streamsPort` when `features.edgeStreams.enabled` is `true`. Other configuration is not used if You provide existing config map. - existingConfigMapName: "" - # -- username for existing RabbitMQ instance - username: "" - # -- hostname of existing RabbitMQ instance - hostname: "" - # -- port of existing RabbitMQ instance - port: 5672 - # -- set to `true` if existing RabbitMQ instance uses TLS - useSsl: false - # -- port for RabbitMQ streams protocol used only when `features.edgeStreams.enabled` is `true` - streamsPort: 5552 - # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on MQTT broker when `features.edgeStreams.enabled` is `true` - mqttConfiguration: - # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, and `useSsl`. Other configuration is not used if You provide existing config map. - existingConfigMapName: "" - # -- username for existing RabbitMQ instance - username: "" - # -- hostname of existing MQTT broker - hostname: "" - # -- port of existing MQTT broker - port: 1883 - # -- set to `true` if existing MQTT broker uses TLS - useSsl: false - auth: - # -- supply to bring you own secret. The secret needs to contain rabbitmq password under the key with name defined in `rabbitmq.auth.secretKey` - existingSecretName: "" - # -- define key of rabbitmq password in existing/provisioned secret - secretKey: "rabbitmq-password" - # -- username of created user in case that `rabbitmq.enabled` is `true` - username: "smartface" - # -- used by subchart - erlangCookie: "" - # -- used by subchart - password: "" - service: - extraPorts: - - name: mqtt - port: 1883 - targetPort: 1883 - - name: rmq-stream - port: 5552 - targetPort: 5552 - -# -- config for minio subchart, see https://github.com/bitnami/charts/tree/main/bitnami/minio -minio: - enabled: true - defaultBuckets: "smartface" - -# -- config for postgresql subchart, see https://github.com/bitnami/charts/tree/main/bitnami/postgresql -postgresql: - enabled: true - primary: - initdb: - scripts: - create-database.sql: "CREATE DATABASE smartface" - -api: - enabled: true - name: "api" - servicePort: 80 - containerPort: 80 - dnsHost: "" - initMigration: true - # -- Annotations for api deployment - annotations: {} - # -- Annotations for api pods - podAnnotations: {} - # -- Additional labels for each api pod - podLabels: {} - service: - # -- Annotations for api Service - annotations: {} - # -- Additional labels for api Service - labels: {} - pdb: - # -- create PodDisruptionBudget for api component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-api - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -authApi: - enabled: false - name: "auth-api" - servicePort: 8098 - containerPort: 80 - dnsHost: "" - initMigration: true - # -- Annotations for authApi deployment - annotations: {} - # -- Annotations for authApi pods - podAnnotations: {} - # -- Additional labels for each authApi pod - podLabels: {} - service: - # -- Annotations for authApi Service - annotations: {} - # -- Additional labels for authApi Service - labels: {} - pdb: - # -- create PodDisruptionBudget for authApi component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - # -- number of replicas to use when autoscaling is not enabled for this component - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-api - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -dbSynchronizationLeader: - # -- features.multitenancy needs to be enabled since tenant operator is responsible for populating wlStream - enabled: false - name: "db-synchronization-leader" - servicePort: 8100 - containerPort: 80 - dnsHost: "" - enableAuth: false - # -- Annotations for dbSynchronizationLeader deployment - annotations: {} - # -- Annotations for dbSynchronizationLeader pods - podAnnotations: {} - # -- Additional labels for each dbSynchronizationLeader pod - podLabels: {} - service: - # -- Annotations for dbSynchronizationLeader Service - annotations: {} - # -- Additional labels for dbSynchronizationLeader Service - labels: {} - pdb: - # -- create PodDisruptionBudget for dbSynchronizationLeader component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-db-synchronization-leader - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -graphqlApi: - enabled: true - name: "graphql-api" - servicePort: 8097 - containerPort: 80 - dnsHost: "" - enableAuth: false - initMigration: false - # -- Annotations for graphqlApi deployment - annotations: {} - # -- Annotations for graphqlApi pods - podAnnotations: {} - # -- Additional labels for each graphqlApi pod - podLabels: {} - service: - # -- Annotations for graphqlApi Service - annotations: {} - # -- Additional labels for graphqlApi Service - labels: {} - pdb: - # -- create PodDisruptionBudget for graphqlApi component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "300M" - cpu: "250m" - limits: - memory: "4G" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-graphql-api - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -ingress: - # -- enable creation of ingress object - enabled: true - # -- set ingress class - class: "" - # -- supply custom ingress annotation - annotations: - # -- if enabled then the ingress will include default ALB annotations - includeAlbAnnotations: false - # -- only used if includeAlbAnnotations == true - certificateArn: "" - -detector: - name: "detector" - # -- Annotations for detector deployment - annotations: {} - # -- Annotations for detector pods - podAnnotations: {} - # -- Additional labels for each detector pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for detector component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "600M" - cpu: "750m" - limits: - memory: "1500M" - nodeSelector: {} - tolerations: [] - # -- number of replicas to use when autoscaling is not enabled for this component - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-detector - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -extractor: - name: "extractor" - # -- Annotations for extractor deployment - annotations: {} - # -- Annotations for extractor pods - podAnnotations: {} - # -- Additional labels for each extractor pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for extractor component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "500M" - cpu: "750m" - limits: - memory: "1G" - nodeSelector: {} - tolerations: [] - # -- number of replicas to use when autoscaling is not enabled for this component - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-extractor - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -matcher: - name: "matcher" - # -- Annotations for matcher deployment - annotations: {} - # -- Annotations for matcher pods - podAnnotations: {} - # -- Additional labels for each matcher pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for matcher component. Only works when `features.multitenancy` is disabled as PDB is not compatible with tenant operator - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "200M" - cpu: "750m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-matcher - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -liveness: - name: "liveness" - # -- Annotations for liveness deployment - annotations: {} - # -- Annotations for liveness pods - podAnnotations: {} - # -- Additional labels for each liveness pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for liveness component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "200M" - cpu: "750m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-liveness - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -edgeStreamProcessor: - name: "edge-stream-processor" - # -- Annotations for edgeStreamProcessor deployment - annotations: {} - # -- Annotations for edgeStreamProcessor pods - podAnnotations: {} - # -- Additional labels for each edgeStreamProcessor pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for edgeStreamProcessor component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-edge-stream-processor - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -edgeStreamsStateSync: - name: "edge-streams-state-synchronizer" - # -- Annotations for edgeStreamsStateSync deployment - annotations: {} - # -- Annotations for edgeStreamsStateSync pods - podAnnotations: {} - # -- Additional labels for each edgeStreamsStateSync pod - podLabels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-edge-streams-state-synchronizer - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -wlStreamPopulationJob: - enabled: false - resources: {} - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-admin - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -base: - name: "base" - zmqServicePort: 2406 - zmqContainerPort: 2406 - # -- Annotations for base deployment - annotations: {} - # -- Annotations for base pods - podAnnotations: {} - # -- Additional labels for each base pod - podLabels: {} - service: - # -- Annotations for base Service - annotations: {} - # -- Additional labels for base Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-base - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -faceMatcher: - name: "face-matcher" - # -- Annotations for faceMatcher deployment - annotations: {} - # -- Annotations for faceMatcher pods - podAnnotations: {} - # -- Additional labels for each faceMatcher pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for faceMatcher component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-face-matcher - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -accessController: - name: "access-controller" - authServiceName: "auth-access-controller" - dnsHost: "" - servicePort: 5050 - containerPort: 80 - authServicePort: 5051 - authContainerPort: 5051 - # -- Annotations for accessController deployment - annotations: {} - # -- Annotations for accessController pods - podAnnotations: {} - # -- Additional labels for each accessController pod - podLabels: {} - service: - # -- Annotations for accessController Service - annotations: {} - # -- Additional labels for accessController Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-access-controller - # -- Access Controller follows different versioning, so the chart app needs to be overridden - tag: "v5_1.11.0" - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - mqttConfig: - enabled: false - topic: "edge-stream/{sourceId}/access-notifications/{notificationType}" - sendImageData: false - -station: - enabled: false - name: "station" - servicePort: 8000 - containerPort: 80 - dnsHost: "" - # -- Annotations for station deployment - annotations: {} - # -- Annotations for station pods - podAnnotations: {} - # -- Additional labels for each station pod - podLabels: {} - service: - # -- Annotations for station Service - annotations: {} - # -- Additional labels for station Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-station - # -- Smartface Station follows different versioning, so the chart app needs to be overridden - tag: "v5_1.25.1" - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -streamDataDbWorker: - name: "stream-data-db-worker" - # -- Annotations for streamDataDbWorker deployment - annotations: {} - # -- Annotations for streamDataDbWorker pods - podAnnotations: {} - # -- Additional labels for each streamDataDbWorker pod - podLabels: {} - pdb: - # -- create PodDisruptionBudget for streamDataDbWorker component - create: false - minAvailable: 1 - maxUnavailable: "" - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - replicas: 1 - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-streamdatadbworker - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -jaegerTracing: - enabled: true - hostname: grafana-agent.monitoring.svc.cluster.local - -migration: - enabled: true - initContainer: - resources: {} - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-admin - # -- Overrides the image tag whose default is the chart's appVersion - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -autoscaling: - cron: - # -- enables predefined workhours-based cron triggers on ScaledObjects - enabled: false - # -- see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - timezone: "Europe/Bratislava" - detector: - workHoursReplicas: 2 - nonWorkHoursReplicas: 1 - extractor: - workHoursReplicas: 2 - nonWorkHoursReplicas: 1 - api: - workHoursReplicas: 2 - nonWorkHoursReplicas: 1 - rmq: - # -- enables predefined rabbitmq triggers based on requests per second on ScaledObjects - enabled: false - triggerAuthName: "keda-trigger-auth-rabbitmq-conn" - hostSecretName: "rmq-management-uri-with-creds" - detector: - requestsPerSecond: 15 - extractor: - requestsPerSecond: 12 - api: - requestsPerSecond: 17 - detector: - # -- enables ScaledObject for detector - enabled: true - minReplicas: 1 - maxReplicas: 3 - # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers - triggers: [] - extractor: - # -- enables ScaledObject for extractor - enabled: true - minReplicas: 1 - maxReplicas: 3 - # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers - triggers: [] - api: - # -- enables ScaledObject for rest API - enabled: true - minReplicas: 1 - maxReplicas: 3 - # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers - triggers: [] - -# -- configuration for sf-tenant-management subchart -sf-tenant-management: - # -- configure if sf-tenant-management subchart should be included - enabled: false - apiDnsHost: "" - config: - mapName: "operator-config" - fileName: "appsettings.override.json" - configDir: "/etc/components" - installCrd: false - imagePullSecrets: - - name: "sf-gitlab-registry-creds" - api: - enabled: false - name: "sf-tenant-api" - servicePort: 80 - -countlyPublisher: - enabled: false - name: "countly-publisher" - clusterName: "" - # -- Annotations for countlyPublisher deployment - annotations: {} - # -- Annotations for countlyPublisher pods - podAnnotations: {} - # -- Additional labels for each countlyPublisher pod - podLabels: {} - service: - # -- Annotations for countlyPublisher Service - annotations: {} - # -- Additional labels for countlyPublisher Service - labels: {} - resources: - requests: - memory: "100M" - cpu: "100m" - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-countly-publisher - # -- Countly publisher follows different versioning, so the chart app needs to be overridden - tag: "31" - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -tests: - authentication: - tenant1: - name: "" - clientId: "" - clientSecret: "" - tenant2: - name: "" - clientId: "" - clientSecret: "" - # -- Annotations for test pods - podAnnotations: {} - # -- Additional labels for test pods - podLabels: {} - nodeSelector: {} - tolerations: [] - image: - # -- The Docker registry, overrides `global.image.registry` - registry: null - # -- Docker image repository - repository: innovatrics/smartface/sf-cloud-func-tests - # -- Countly publisher follows different versioning, so the chart app needs to be overridden - tag: null - # -- Overrides the image tag with an image digest - digest: null - # -- Docker image pull policy - pullPolicy: IfNotPresent - -metrics: - enabled: false - monitorDiscoveryLabel: - instance: primary - serviceDiscoveryLabels: - sf-metrics: "true" - portName: "metrics" - port: 4318 - -readonlyApi: - enabled: false - authName: "readonly-auth-api" - noAuthName: "readonly-noauth-api" - proxyContainer: - resources: {} - nodeSelector: {} - tolerations: [] - -serviceAccount: - # -- Specifies whether a ServiceAccount should be created - create: true - # -- The name of the ServiceAccount to use. - name: "sf-service-account" - # -- Image pull secrets for the service account - imagePullSecrets: [] - # -- Annotations for the service account - annotations: {} - # -- Labels for the service account - labels: {} - # -- Set this toggle to false to opt out of automounting API credentials for the service account - automountServiceAccountToken: true - -# -- due to ArgoCD limitations this can be used to skip validations that use the `lookup` helm function - for more information see https://github.com/argoproj/argo-cd/issues/5202 -skipLookupBasedValidations: false +# Default values for smartface. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +global: + image: + # -- Overrides the Docker registry globally for all images + registry: "registry.gitlab.com" + +# -- Overrides the chart's name +nameOverride: null +# -- Common annotations for all deployments/StatefulSets +annotations: {} +# -- Common annotations for all pods +podAnnotations: {} +# -- Common labels for all pods +podLabels: {} +# -- Common annotations for all services +serviceAnnotations: {} +# -- Common labels for all services +serviceLabels: {} +# -- Common revisionHistoryLimit for all deployments +revisionHistoryLimit: +# -- Common updateStrategy for all deployments +updateStrategy: {} + +# -- docker secrets used to pull images with +imagePullSecrets: + - name: "sf-gitlab-registry-creds" + +configurations: + database: + # -- connection string needs to be provided as a dependency of the chart + existingSecretName: "db-cs" + # -- key within the existing secret which contains the connection string, see https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/connection-strings + connectionStringKey: "cs" + s3: + # -- supply to bring your own configmap. the configmap needs following keys: `name`, `region`, `folder`, `authType` and `useBucketRegion` + existingConfigMapName: "" + # -- name of S3 bucket + bucketName: "" + # -- system name of AWS region of S3 bucket e.g. `eu-central-1` + bucketRegion: "" + # -- prefix (folder) used for S3 objects + bucketFolder: "" + # -- type of authentication to be used. Currently `AssumedRole` and `InstanceProfile` are usable + authType: "AssumedRole" + # -- mechanism to resolve bucket endpoint - if `true` then connection is made based on bucket region. If `false` then bucket endpoint needs to be set manually + useBucketRegion: true + license: + secretName: "iface-lic" + volumeMountName: "license" + mountPath: "/etc/innovatrics" + apiAuth: + # -- supply to bring your own configmap. the configmap needs following keys: `authority`, `audience`, `oauth_token_url` and `oauth_authorize_url` + existingConfigMapName: "" + # -- issuer of JWT which the API will trust + authority: "" + # -- audience representing the API + audience: "" + # -- used only for enabling OAuth flows in swagger UI + oauthTokenUrl: "" + # -- used only for enabling OAuth flows in swagger UI + oauthAuthorizeUrl: "" + stationAuth: + # -- config containing authorization configuration for SF Station used when authentication is enabled for SF Station + configName: "station-auth-config" + secretName: "station-client-id" + +features: + multitenancy: + # -- enabled for multitenant deployment + enabled: false + edgeStreams: + # -- sf-tenant-management.enabled needs to be enabled since tenant operator is responsible for populating wlStream + enabled: false + +# -- config for rabbitmq subchart, see https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq +rabbitmq: + # -- configure if rabbitmq subchart should be included + enabled: true + extraPlugins: "rabbitmq_stream rabbitmq_stream_management rabbitmq_mqtt" + # -- service to publicly expose mqtt interface to be used by edge streams. Currently requires ALB controller https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.6/ + mqttPublicService: + enabled: false + mqttDnsHost: "" + # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on rabbitmq + rmqConfiguration: + # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, `useSsl`, and optionally `streamsPort` when `features.edgeStreams.enabled` is `true`. Other configuration is not used if You provide existing config map. + existingConfigMapName: "" + # -- username for existing RabbitMQ instance + username: "" + # -- hostname of existing RabbitMQ instance + hostname: "" + # -- port of existing RabbitMQ instance + port: 5672 + # -- set to `true` if existing RabbitMQ instance uses TLS + useSsl: false + # -- port for RabbitMQ streams protocol used only when `features.edgeStreams.enabled` is `true` + streamsPort: 5552 + # -- if rabbitmq subchart is not included, then we need user-supplied configuration to satisfy SmartFace dependency on MQTT broker when `features.edgeStreams.enabled` is `true` + mqttConfiguration: + # -- supply to bring your own configmap. The configmap needs following keys: `hostname`, `username`, `port`, and `useSsl`. Other configuration is not used if You provide existing config map. + existingConfigMapName: "" + # -- username for existing RabbitMQ instance + username: "" + # -- hostname of existing MQTT broker + hostname: "" + # -- port of existing MQTT broker + port: 1883 + # -- set to `true` if existing MQTT broker uses TLS + useSsl: false + auth: + # -- supply to bring you own secret. The secret needs to contain rabbitmq password under the key with name defined in `rabbitmq.auth.secretKey` + existingSecretName: "" + # -- define key of rabbitmq password in existing/provisioned secret + secretKey: "rabbitmq-password" + # -- username of created user in case that `rabbitmq.enabled` is `true` + username: "smartface" + # -- used by subchart + erlangCookie: "" + # -- used by subchart + password: "" + service: + extraPorts: + - name: mqtt + port: 1883 + targetPort: 1883 + - name: rmq-stream + port: 5552 + targetPort: 5552 + +# -- config for minio subchart, see https://github.com/bitnami/charts/tree/main/bitnami/minio +minio: + enabled: true + defaultBuckets: "smartface" + +# -- config for postgresql subchart, see https://github.com/bitnami/charts/tree/main/bitnami/postgresql +postgresql: + enabled: true + primary: + initdb: + scripts: + create-database.sql: "CREATE DATABASE smartface" + +api: + enabled: true + name: "api" + servicePort: 80 + containerPort: 80 + dnsHost: "" + initMigration: true + # -- Annotations for api deployment + annotations: {} + # -- Annotations for api pods + podAnnotations: {} + # -- Additional labels for each api pod + podLabels: {} + service: + # -- Annotations for api Service + annotations: {} + # -- Additional labels for api Service + labels: {} + pdb: + # -- create PodDisruptionBudget for api component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-api + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +authApi: + enabled: false + name: "auth-api" + servicePort: 8098 + containerPort: 80 + dnsHost: "" + initMigration: true + # -- Annotations for authApi deployment + annotations: {} + # -- Annotations for authApi pods + podAnnotations: {} + # -- Additional labels for each authApi pod + podLabels: {} + service: + # -- Annotations for authApi Service + annotations: {} + # -- Additional labels for authApi Service + labels: {} + pdb: + # -- create PodDisruptionBudget for authApi component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + # -- number of replicas to use when autoscaling is not enabled for this component + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-api + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +dbSynchronizationLeader: + # -- features.multitenancy needs to be enabled since tenant operator is responsible for populating wlStream + enabled: false + name: "db-synchronization-leader" + servicePort: 8100 + containerPort: 80 + dnsHost: "" + enableAuth: false + # -- Annotations for dbSynchronizationLeader deployment + annotations: {} + # -- Annotations for dbSynchronizationLeader pods + podAnnotations: {} + # -- Additional labels for each dbSynchronizationLeader pod + podLabels: {} + service: + # -- Annotations for dbSynchronizationLeader Service + annotations: {} + # -- Additional labels for dbSynchronizationLeader Service + labels: {} + pdb: + # -- create PodDisruptionBudget for dbSynchronizationLeader component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-db-synchronization-leader + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +graphqlApi: + enabled: true + name: "graphql-api" + servicePort: 8097 + containerPort: 80 + dnsHost: "" + enableAuth: false + initMigration: false + # -- Annotations for graphqlApi deployment + annotations: {} + # -- Annotations for graphqlApi pods + podAnnotations: {} + # -- Additional labels for each graphqlApi pod + podLabels: {} + service: + # -- Annotations for graphqlApi Service + annotations: {} + # -- Additional labels for graphqlApi Service + labels: {} + pdb: + # -- create PodDisruptionBudget for graphqlApi component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "300M" + cpu: "250m" + limits: + memory: "4G" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-graphql-api + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +ingress: + # -- enable creation of ingress object + enabled: true + # -- set ingress class + class: "" + # -- supply custom ingress annotation + annotations: + # -- if enabled then the ingress will include default ALB annotations + includeAlbAnnotations: false + # -- only used if includeAlbAnnotations == true + certificateArn: "" + +detector: + name: "detector" + # -- Annotations for detector deployment + annotations: {} + # -- Annotations for detector pods + podAnnotations: {} + # -- Additional labels for each detector pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for detector component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "600M" + cpu: "750m" + limits: + memory: "1500M" + nodeSelector: {} + tolerations: [] + # -- number of replicas to use when autoscaling is not enabled for this component + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-detector + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +extractor: + name: "extractor" + # -- Annotations for extractor deployment + annotations: {} + # -- Annotations for extractor pods + podAnnotations: {} + # -- Additional labels for each extractor pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for extractor component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "500M" + cpu: "750m" + limits: + memory: "1G" + nodeSelector: {} + tolerations: [] + # -- number of replicas to use when autoscaling is not enabled for this component + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-extractor + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +matcher: + name: "matcher" + # -- Annotations for matcher deployment + annotations: {} + # -- Annotations for matcher pods + podAnnotations: {} + # -- Additional labels for each matcher pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for matcher component. Only works when `features.multitenancy` is disabled as PDB is not compatible with tenant operator + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "200M" + cpu: "750m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-matcher + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +liveness: + name: "liveness" + # -- Annotations for liveness deployment + annotations: {} + # -- Annotations for liveness pods + podAnnotations: {} + # -- Additional labels for each liveness pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for liveness component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "200M" + cpu: "750m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-liveness + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +edgeStreamProcessor: + name: "edge-stream-processor" + # -- Annotations for edgeStreamProcessor deployment + annotations: {} + # -- Annotations for edgeStreamProcessor pods + podAnnotations: {} + # -- Additional labels for each edgeStreamProcessor pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for edgeStreamProcessor component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-edge-stream-processor + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +edgeStreamsStateSync: + name: "edge-streams-state-synchronizer" + # -- Annotations for edgeStreamsStateSync deployment + annotations: {} + # -- Annotations for edgeStreamsStateSync pods + podAnnotations: {} + # -- Additional labels for each edgeStreamsStateSync pod + podLabels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-edge-streams-state-synchronizer + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +wlStreamPopulationJob: + enabled: false + resources: {} + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-admin + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +base: + name: "base" + zmqServicePort: 2406 + zmqContainerPort: 2406 + # -- Annotations for base deployment + annotations: {} + # -- Annotations for base pods + podAnnotations: {} + # -- Additional labels for each base pod + podLabels: {} + service: + # -- Annotations for base Service + annotations: {} + # -- Additional labels for base Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-base + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +faceMatcher: + name: "face-matcher" + # -- Annotations for faceMatcher deployment + annotations: {} + # -- Annotations for faceMatcher pods + podAnnotations: {} + # -- Additional labels for each faceMatcher pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for faceMatcher component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-face-matcher + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +accessController: + name: "access-controller" + authServiceName: "auth-access-controller" + dnsHost: "" + servicePort: 5050 + containerPort: 80 + authServicePort: 5051 + authContainerPort: 5051 + # -- Annotations for accessController deployment + annotations: {} + # -- Annotations for accessController pods + podAnnotations: {} + # -- Additional labels for each accessController pod + podLabels: {} + service: + # -- Annotations for accessController Service + annotations: {} + # -- Additional labels for accessController Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-access-controller + # -- Access Controller follows different versioning, so the chart app needs to be overridden + tag: "v5_1.11.0" + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + mqttConfig: + enabled: false + topic: "edge-stream/{sourceId}/access-notifications/{notificationType}" + sendImageData: false + +station: + enabled: false + name: "station" + servicePort: 8000 + containerPort: 80 + dnsHost: "" + # -- Annotations for station deployment + annotations: {} + # -- Annotations for station pods + podAnnotations: {} + # -- Additional labels for each station pod + podLabels: {} + service: + # -- Annotations for station Service + annotations: {} + # -- Additional labels for station Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-station + # -- Smartface Station follows different versioning, so the chart app needs to be overridden + tag: "v5_1.25.1" + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +streamDataDbWorker: + name: "stream-data-db-worker" + # -- Annotations for streamDataDbWorker deployment + annotations: {} + # -- Annotations for streamDataDbWorker pods + podAnnotations: {} + # -- Additional labels for each streamDataDbWorker pod + podLabels: {} + pdb: + # -- create PodDisruptionBudget for streamDataDbWorker component + create: false + minAvailable: 1 + maxUnavailable: "" + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + replicas: 1 + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-streamdatadbworker + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +jaegerTracing: + enabled: true + hostname: grafana-agent.monitoring.svc.cluster.local + +migration: + enabled: true + initContainer: + resources: {} + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-admin + # -- Overrides the image tag whose default is the chart's appVersion + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +autoscaling: + cron: + # -- enables predefined workhours-based cron triggers on ScaledObjects + enabled: false + # -- see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + timezone: "Europe/Bratislava" + detector: + workHoursReplicas: 2 + nonWorkHoursReplicas: 1 + extractor: + workHoursReplicas: 2 + nonWorkHoursReplicas: 1 + api: + workHoursReplicas: 2 + nonWorkHoursReplicas: 1 + rmq: + # -- enables predefined rabbitmq triggers based on requests per second on ScaledObjects + enabled: false + triggerAuthName: "keda-trigger-auth-rabbitmq-conn" + hostSecretName: "rmq-management-uri-with-creds" + detector: + requestsPerSecond: 15 + extractor: + requestsPerSecond: 12 + api: + requestsPerSecond: 17 + detector: + # -- enables ScaledObject for detector + enabled: true + minReplicas: 1 + maxReplicas: 3 + # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers + triggers: [] + extractor: + # -- enables ScaledObject for extractor + enabled: true + minReplicas: 1 + maxReplicas: 3 + # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers + triggers: [] + api: + # -- enables ScaledObject for rest API + enabled: true + minReplicas: 1 + maxReplicas: 3 + # -- provide additional triggers - see https://keda.sh/docs/2.12/concepts/scaling-deployments/#triggers + triggers: [] + +# -- configuration for sf-tenant-management subchart +sf-tenant-management: + # -- configure if sf-tenant-management subchart should be included + enabled: false + apiDnsHost: "" + config: + mapName: "operator-config" + fileName: "appsettings.override.json" + configDir: "/etc/components" + installCrd: false + imagePullSecrets: + - name: "sf-gitlab-registry-creds" + api: + enabled: false + name: "sf-tenant-api" + servicePort: 80 + +countlyPublisher: + enabled: false + name: "countly-publisher" + clusterName: "" + # -- Annotations for countlyPublisher deployment + annotations: {} + # -- Annotations for countlyPublisher pods + podAnnotations: {} + # -- Additional labels for each countlyPublisher pod + podLabels: {} + service: + # -- Annotations for countlyPublisher Service + annotations: {} + # -- Additional labels for countlyPublisher Service + labels: {} + resources: + requests: + memory: "100M" + cpu: "100m" + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-countly-publisher + # -- Countly publisher follows different versioning, so the chart app needs to be overridden + tag: "31" + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +tests: + authentication: + tenant1: + name: "" + clientId: "" + clientSecret: "" + tenant2: + name: "" + clientId: "" + clientSecret: "" + # -- Annotations for test pods + podAnnotations: {} + # -- Additional labels for test pods + podLabels: {} + nodeSelector: {} + tolerations: [] + image: + # -- The Docker registry, overrides `global.image.registry` + registry: null + # -- Docker image repository + repository: innovatrics/smartface/sf-cloud-func-tests + # -- Countly publisher follows different versioning, so the chart app needs to be overridden + tag: null + # -- Overrides the image tag with an image digest + digest: null + # -- Docker image pull policy + pullPolicy: IfNotPresent + +metrics: + enabled: false + monitorDiscoveryLabel: + instance: primary + serviceDiscoveryLabels: + sf-metrics: "true" + portName: "metrics" + port: 4318 + +readonlyApi: + enabled: false + authName: "readonly-auth-api" + noAuthName: "readonly-noauth-api" + proxyContainer: + resources: {} + nodeSelector: {} + tolerations: [] + +serviceAccount: + # -- Specifies whether a ServiceAccount should be created + create: true + # -- The name of the ServiceAccount to use. + name: "sf-service-account" + # -- Image pull secrets for the service account + imagePullSecrets: [] + # -- Annotations for the service account + annotations: {} + # -- Labels for the service account + labels: {} + # -- Set this toggle to false to opt out of automounting API credentials for the service account + automountServiceAccountToken: true + +# -- due to ArgoCD limitations this can be used to skip validations that use the `lookup` helm function - for more information see https://github.com/argoproj/argo-cd/issues/5202 +skipLookupBasedValidations: false From 775822ac34499b1ae650fede1d83690dbfd104d3 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Fri, 28 Jun 2024 09:25:00 +0200 Subject: [PATCH 16/20] try crazy commit difference --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3639c7d..ec3aff9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.zip .devcontainer/ egid.values.yaml + From 146ada243677589b7be1f3093cc8fbb3aa0c33b8 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Fri, 28 Jun 2024 09:26:17 +0200 Subject: [PATCH 17/20] remove values which are not used --- old-egid.values.yaml | 93 -------------------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 old-egid.values.yaml diff --git a/old-egid.values.yaml b/old-egid.values.yaml deleted file mode 100644 index f5e0d3e..0000000 --- a/old-egid.values.yaml +++ /dev/null @@ -1,93 +0,0 @@ -"accessController": - "dnsHost": "ac.egid.smartfacecloud.com" -"api": - "dnsHost": "" - "enabled": false -"authApi": - "dnsHost": "api.egid.smartfacecloud.com" - "enabled": true -"autoscaling": - "cron": - "enabled": false - "rmq": - "enabled": true -"configurations": - "apiAuth": - "existingConfigMapName": "auth-config" - "s3": - "existingConfigMapName": "s3-config" -"countlyPublisher": - "clusterName": "egid" - "enabled": false -"dbSynchronizationLeader": - "dnsHost": "" - "enableAuth": true - "enabled": false -"detector": - "resources": - "requests": - "cpu": "100m" -"extractor": - "resources": - "requests": - "cpu": "100m" -"features": - "edgeStreams": - "enabled": false - "multitenancy": - "enabled": true -"graphqlApi": - "dnsHost": "graphql.egid.smartfacecloud.com" - "enableAuth": true -"ingress": - "certificateArn": "arn:aws:acm:eu-central-1:291501518763:certificate/8e94db10-74ad-4736-ab56-e07d04d7227f" - "class": "alb" - "includeAlbAnnotations": true -"liveness": - "resources": - "requests": - "cpu": "100m" -"matcher": - "resources": - "requests": - "cpu": "100m" -"metrics": - "enabled": false -"minio": - "enabled": false -"postgresql": - "enabled": false -"rabbitmq": - "auth": - "erlangCookie": "]Lc3gffKkpGYH[xq>sxVy(o1H Date: Fri, 28 Jun 2024 09:30:34 +0200 Subject: [PATCH 18/20] remove unused empty line --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index ec3aff9..3639c7d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ *.zip .devcontainer/ egid.values.yaml - From 9cee8e5a2a208c2fd44b8afb6611a0ad88954ea2 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Fri, 28 Jun 2024 15:06:51 +0200 Subject: [PATCH 19/20] fix version --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index d7bc0a0..2ecf55d 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -38,4 +38,4 @@ maintainers: version: 0.8.0 -appVersion: "v5_4.26.0.6261-x64-dev" +appVersion: "v5_4.26.0" From a402ac0b9485eb8fda98616a67bac409e124e7c5 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Fri, 28 Jun 2024 15:10:26 +0200 Subject: [PATCH 20/20] helm doc fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 624fd1e..08051d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # smartface -![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0.6261-x64-dev](https://img.shields.io/badge/AppVersion-v5_4.26.0.6261--x64--dev-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v5_4.26.0](https://img.shields.io/badge/AppVersion-v5_4.26.0-informational?style=flat-square) SmartFace is a Scalable Facial Recognition Server Platform Able to Process Multiple Real-Time Video Streams. Currently the helm chart supports edge stream and Lightweight Face Identification System (LFIS) deployments