From 16b94329a2df4a0513bcfa6c64d067dff49d7aad Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Tue, 16 Nov 2021 12:28:33 -0800 Subject: [PATCH 1/4] update dotnet dependencies Signed-off-by: Kate Goldenring --- .../intermediate/Dockerfile.opencvsharp-build | 4 ++-- samples/brokers/onvif-video-broker/README.md | 2 +- .../onvif-video-broker/onvif-video-broker.csproj | 15 +++++++-------- .../opcua-monitoring-broker.csproj | 6 +++--- .../opcua-certificate-generator.csproj | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build/containers/intermediate/Dockerfile.opencvsharp-build b/build/containers/intermediate/Dockerfile.opencvsharp-build index c77250d92..08d32c17b 100644 --- a/build/containers/intermediate/Dockerfile.opencvsharp-build +++ b/build/containers/intermediate/Dockerfile.opencvsharp-build @@ -17,9 +17,9 @@ WORKDIR /app LABEL org.opencontainers.image.source https://github.com/project-akri/akri # based on https://xaviergeerinck.com/opencv-in-dotnet-core -ENV OPENCV_VERSION="4.1.1" +ENV OPENCV_VERSION="4.5.4" ENV OPENCV_INSTALLATION_DIR="/opt/opencv/" -ENV OPENCV_SHARP_VERSION="4.1.0.20190417" +ENV OPENCV_SHARP_VERSION="4.5.3.20210821" RUN whoami RUN pwd diff --git a/samples/brokers/onvif-video-broker/README.md b/samples/brokers/onvif-video-broker/README.md index 6f4ae42be..5b446d9c1 100644 --- a/samples/brokers/onvif-video-broker/README.md +++ b/samples/brokers/onvif-video-broker/README.md @@ -8,7 +8,7 @@ interface. 1. Install [opencvsharp](https://github.com/shimat/opencvsharp), the OpenCV wrapper for .NET 1. Build ```sh - cd ./samples/brokers/onvif-monitoring-broker + cd ./samples/brokers/onvif-video-broker dotnet build ``` 1. Run the broker, passing in the ONVIF service URL for the camera it should pull frames from. diff --git a/samples/brokers/onvif-video-broker/onvif-video-broker.csproj b/samples/brokers/onvif-video-broker/onvif-video-broker.csproj index e36baefb8..60cbd8ab4 100644 --- a/samples/brokers/onvif-video-broker/onvif-video-broker.csproj +++ b/samples/brokers/onvif-video-broker/onvif-video-broker.csproj @@ -8,18 +8,17 @@ - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/samples/brokers/opcua-monitoring-broker/opcua-monitoring-broker.csproj b/samples/brokers/opcua-monitoring-broker/opcua-monitoring-broker.csproj index bdfc1ea59..6e2963b40 100644 --- a/samples/brokers/opcua-monitoring-broker/opcua-monitoring-broker.csproj +++ b/samples/brokers/opcua-monitoring-broker/opcua-monitoring-broker.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/opcua-certificate-generator/opcua-certificate-generator.csproj b/samples/opcua-certificate-generator/opcua-certificate-generator.csproj index d7cc38163..036437427 100644 --- a/samples/opcua-certificate-generator/opcua-certificate-generator.csproj +++ b/samples/opcua-certificate-generator/opcua-certificate-generator.csproj @@ -7,7 +7,7 @@ - + From d6766d6ebb6651dec4e453943a86ae7766094d12 Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Tue, 16 Nov 2021 12:29:58 -0800 Subject: [PATCH 2/4] increase version Signed-off-by: Kate Goldenring --- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25d734ef0..9b335c38f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -390,7 +390,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-shared", "anyhow", @@ -432,7 +432,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -461,7 +461,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -485,7 +485,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.7.3" +version = "0.7.4" dependencies = [ "anyhow", "async-trait", @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "anyhow", @@ -980,7 +980,7 @@ checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" [[package]] name = "controller" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-shared", "anyhow", @@ -1195,7 +1195,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2428,7 +2428,7 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "onvif-discovery-handler" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2512,7 +2512,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4343,7 +4343,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4354,7 +4354,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.7.3" +version = "0.7.4" dependencies = [ "akri-shared", "env_logger", @@ -4617,7 +4617,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.7.3" +version = "0.7.4" dependencies = [ "actix", "actix-rt 2.3.0", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 00d562bd3..a6eeb76aa 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 038ade428..410288db9 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.7.3" +version = "0.7.4" authors = [""] edition = "2018" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index d68984739..86f0d895d 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.3 +version: 0.7.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.7.3 +appVersion: 0.7.4 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 3195acfdb..a8eba825f 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "debug-echo-discovery-handler" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 12f61de7a..74fbfab7e 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index bee84b7df..ced7f3fa1 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 8f2d61513..b44944e1f 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 9dd5686f8..6dc584dde 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index a71e34a29..b4eddc605 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index edfffad7e..5a6d5750c 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 5239ad45b..bc5930a41 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index 93ab6b604..78afe55f3 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring "] edition = "2018" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 41563999f..7c6136778 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.7.3" +version = "0.7.4" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 21caa7d81..67fe1038f 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.7.3" +version = "0.7.4" authors = [""] edition = "2018" diff --git a/version.txt b/version.txt index f38fc5393..0a1ffad4b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.7.3 +0.7.4 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 3b9105769..b3f49cb20 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.7.3" +version = "0.7.4" authors = ["DazWilkin "] edition = "2018" From fd41dc65c5e6800315b442c2c3b0eb93f8459032 Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Tue, 16 Nov 2021 12:57:12 -0800 Subject: [PATCH 3/4] increase OPENCV base version Signed-off-by: Kate Goldenring --- build/intermediate-containers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/intermediate-containers.mk b/build/intermediate-containers.mk index adb95305a..312a06532 100644 --- a/build/intermediate-containers.mk +++ b/build/intermediate-containers.mk @@ -1,7 +1,7 @@ BUILD_RUST_CROSSBUILD_VERSION = 0.0.7 -BUILD_OPENCV_BASE_VERSION = 0.0.8 +BUILD_OPENCV_BASE_VERSION = 0.0.9 CROSS_VERSION = 0.1.16 From 52aecccd655cb32cd3120a5aacfef7d49171e131 Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Tue, 16 Nov 2021 13:17:48 -0800 Subject: [PATCH 4/4] Fix library use Signed-off-by: Kate Goldenring --- samples/brokers/opcua-monitoring-broker/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/brokers/opcua-monitoring-broker/Program.cs b/samples/brokers/opcua-monitoring-broker/Program.cs index f549a9646..2fae0f317 100644 --- a/samples/brokers/opcua-monitoring-broker/Program.cs +++ b/samples/brokers/opcua-monitoring-broker/Program.cs @@ -284,7 +284,7 @@ private async Task CreateAndRunClient() if (haveAppCertificate) { - config.ApplicationUri = Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate); + config.ApplicationUri = X509Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate); config.CertificateValidator.CertificateValidation += new CertificateValidationEventHandler(CertificateValidator_CertificateValidation); } else