diff --git a/.github/workflows/build-agent-container.yml b/.github/workflows/build-agent-container.yml index f79bc12c3..c12b2555d 100644 --- a/.github/workflows/build-agent-container.yml +++ b/.github/workflows/build-agent-container.yml @@ -34,7 +34,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install @@ -87,7 +87,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/.github/workflows/build-controller-container.yml b/.github/workflows/build-controller-container.yml index 0bc17c9af..ecbc8d0ad 100644 --- a/.github/workflows/build-controller-container.yml +++ b/.github/workflows/build-controller-container.yml @@ -34,7 +34,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install @@ -82,7 +82,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/.github/workflows/build-discovery-handlers.yml b/.github/workflows/build-discovery-handlers.yml index 3051e83fa..fe6b8c639 100644 --- a/.github/workflows/build-discovery-handlers.yml +++ b/.github/workflows/build-discovery-handlers.yml @@ -36,7 +36,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install @@ -91,7 +91,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/.github/workflows/build-opencv-base-container.yml b/.github/workflows/build-opencv-base-container.yml index 22e7fba05..c4c8c64c0 100644 --- a/.github/workflows/build-opencv-base-container.yml +++ b/.github/workflows/build-opencv-base-container.yml @@ -121,7 +121,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/.github/workflows/build-rust-crossbuild-container.yml b/.github/workflows/build-rust-crossbuild-container.yml index a8e13a1d2..f311b81ac 100644 --- a/.github/workflows/build-rust-crossbuild-container.yml +++ b/.github/workflows/build-rust-crossbuild-container.yml @@ -121,7 +121,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/.github/workflows/build-udev-video-broker-container.yml b/.github/workflows/build-udev-video-broker-container.yml index a99757df4..2dfd0b5c4 100644 --- a/.github/workflows/build-udev-video-broker-container.yml +++ b/.github/workflows/build-udev-video-broker-container.yml @@ -35,7 +35,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install @@ -83,7 +83,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/.github/workflows/build-webhook-configuration-container.yml b/.github/workflows/build-webhook-configuration-container.yml index c67d6da55..dcc95414c 100644 --- a/.github/workflows/build-webhook-configuration-container.yml +++ b/.github/workflows/build-webhook-configuration-container.yml @@ -34,7 +34,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install @@ -80,7 +80,7 @@ jobs: - name: Prepare To Install uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 18 - name: Install Deps run: | yarn install diff --git a/Cargo.lock b/Cargo.lock index 739ad7345..a7381417b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -298,7 +298,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -358,7 +358,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-shared", "anyhow", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "anyhow", @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "anyhow", @@ -446,7 +446,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.12.13" +version = "0.12.14" dependencies = [ "anyhow", "async-trait", @@ -471,7 +471,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "anyhow", @@ -986,7 +986,7 @@ checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "controller" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-shared", "anyhow", @@ -1178,7 +1178,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "debug-echo-discovery-handler" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2479,7 +2479,7 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "onvif-discovery-handler" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2529,7 +2529,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4134,7 +4134,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.12.13" +version = "0.12.14" dependencies = [ "akri-shared", "env_logger", @@ -4422,7 +4422,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.12.13" +version = "0.12.14" dependencies = [ "actix-rt 2.7.0", "actix-web", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 46e0af7c3..0b9e8f073 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/agent/src/util/device_plugin_builder.rs b/agent/src/util/device_plugin_builder.rs index c9dd41b88..d20f161c9 100644 --- a/agent/src/util/device_plugin_builder.rs +++ b/agent/src/util/device_plugin_builder.rs @@ -249,8 +249,11 @@ impl DevicePluginBuilder { }; // We will ignore this dummy uri because UDS does not use it. + // Some servers will check the uri content so the uri needs to + // be in valid format even it's not used, the scheme part is used + // to specific what scheme to use, such as http or https let kubelet_socket_closure = kubelet_socket.to_string(); - let channel = Endpoint::try_from("http://[::]:50051")? + let channel = Endpoint::try_from("http://[::1]:50051")? .connect_with_connector(service_fn(move |_: Uri| { UnixStream::connect(kubelet_socket_closure.clone()) })) diff --git a/agent/src/util/discovery_operator.rs b/agent/src/util/discovery_operator.rs index eecb9ad97..e6fa5d0df 100644 --- a/agent/src/util/discovery_operator.rs +++ b/agent/src/util/discovery_operator.rs @@ -187,7 +187,10 @@ impl DiscoveryOperator { // Clone socket for closure which has static lifetime let socket = socket.clone(); // We will ignore this dummy uri because UDS does not use it. - match Endpoint::try_from("http://[::]:50051") + // Some servers will check the uri content so the uri needs to + // be in valid format even it's not used, the scheme part is used + // to specific what scheme to use, such as http or https + match Endpoint::try_from("http://[::1]:50051") .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { let endpoint = socket.clone(); diff --git a/agent/src/util/registration.rs b/agent/src/util/registration.rs index 4d5bd2204..9bf6d8204 100644 --- a/agent/src/util/registration.rs +++ b/agent/src/util/registration.rs @@ -365,7 +365,7 @@ mod tests { .await .is_ok()); // Connect to registration service - let channel = Endpoint::try_from("http://[::]:50051") + let channel = Endpoint::try_from("http://[::1]:50051") .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { UnixStream::connect(registration_socket_path_string.clone()) diff --git a/controller/Cargo.toml b/controller/Cargo.toml index aa54c6929..b10368aad 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["", ""] edition = "2018" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index 892b97127..5f89ee67d 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -16,9 +16,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.12.13 +version: 0.12.14 # 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.12.13 +appVersion: 0.12.14 diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index eaceb3cfa..3f1148b9e 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.12.13" +version = "0.12.14" license = "Apache-2.0" 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 6567e039f..8a9cfa36a 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.12.13" +version = "0.12.14" license = "Apache-2.0" 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 f483e6593..36517cca1 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.12.13" +version = "0.12.14" license = "Apache-2.0" 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 ef8dc15db..2ea176dee 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.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 57a2277a7..6e800435a 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.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index fe538b5f9..e6f66e4e9 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 60c5956fa..1da1fdfc0 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 92218834d..adda735de 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index f01f65ea4..8e04ca81b 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-utils/src/discovery/mod.rs b/discovery-utils/src/discovery/mod.rs index 874633b13..6e6d2914c 100644 --- a/discovery-utils/src/discovery/mod.rs +++ b/discovery-utils/src/discovery/mod.rs @@ -280,7 +280,7 @@ pub mod server { Vec::new(), ) .await; - let channel = Endpoint::try_from("http://[::]:50051") + let channel = Endpoint::try_from("http://[::1]:50051") .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { UnixStream::connect(discovery_handler_socket.clone()) diff --git a/discovery-utils/src/registration_client.rs b/discovery-utils/src/registration_client.rs index b9deb4e16..32da1384a 100644 --- a/discovery-utils/src/registration_client.rs +++ b/discovery-utils/src/registration_client.rs @@ -14,7 +14,10 @@ pub async fn register_discovery_handler( info!("register_discovery_handler - entered"); loop { // We will ignore this dummy uri because UDS does not use it. - if let Ok(channel) = Endpoint::try_from("http://[::]:50051")? + // Some servers will check the uri content so the uri needs to + // be in valid format even it's not used, the scheme part is used + // to specific what scheme to use, such as http or https + if let Ok(channel) = Endpoint::try_from("http://[::1]:50051")? .connect_with_connector(tower::service_fn(move |_: Uri| { tokio::net::UnixStream::connect(super::get_registration_socket()) })) diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 5cd600109..6a5ee0a54 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.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 82913c09e..68cf109ed 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = [""] edition = "2018" diff --git a/shared/src/uds/unix_stream.rs b/shared/src/uds/unix_stream.rs index 404f58dfc..ebfae6c6c 100644 --- a/shared/src/uds/unix_stream.rs +++ b/shared/src/uds/unix_stream.rs @@ -80,7 +80,10 @@ pub async fn try_connect(socket_path: &str) -> Result<(), anyhow::Error> { { let path = socket_path.to_string(); // We will ignore this dummy uri because UDS does not use it. - if let Ok(_v) = tonic::transport::Endpoint::try_from("http://[::]:50051") + // Some servers will check the uri content so the uri needs to + // be in valid format even it's not used, the scheme part is used + // to specific what scheme to use, such as http or https + if let Ok(_v) = tonic::transport::Endpoint::try_from("http://[::1]:50051") .map_err(|e| anyhow::format_err!("{}", e))? .connect_with_connector(tower::service_fn(move |_: tonic::transport::Uri| { tokio::net::UnixStream::connect(path.clone()) diff --git a/version.txt b/version.txt index 32ffda3c9..d0834a7f5 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.12.13 +0.12.14 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 11b3474c0..8eff39d18 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.12.13" +version = "0.12.14" license = "Apache-2.0" authors = ["DazWilkin "] edition = "2018"