diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d3df87..cb60e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - 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 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/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 | diff --git a/ci/multitenant-values.yaml b/ci/multitenant-values.yaml index 664405c..0ac6868 100644 --- a/ci/multitenant-values.yaml +++ b/ci/multitenant-values.yaml @@ -8,3 +8,7 @@ api: sf-tenant-management: enabled: true installCrd: true + +dbSynchronizationLeader: + enabled: true + enableAuth: true diff --git a/templates/edge-streams/access-controller-deployment.yaml b/templates/edge-streams/access-controller-deployment.yaml index 8fb1eb7..d19cef0 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.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: diff --git a/templates/tests/multitenant-test.yaml b/templates/tests/multitenant-test.yaml index 1bda839..86cf660 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.Wl_Updates_For_Tenants_Smoke_Test{{- 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 }} diff --git a/values.yaml b/values.yaml index add8ff9..5732f45 100644 --- a/values.yaml +++ b/values.yaml @@ -639,11 +639,15 @@ 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 pullPolicy: IfNotPresent + mqttConfig: + enabled: false + topic: "edge-stream/{sourceId}/access-notifications/{notificationType}" + sendImageData: false station: enabled: false @@ -674,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