Merge branch 'main' into mockall

project-akri · Jan 20, 2021 · 9c1eef7 · 9c1eef7
2 parents 1b82dcb + 648e6a2
commit 9c1eef7
Show file tree

Hide file tree

Showing 9 changed files with 854 additions and 693 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 # Patch to allow invalid authority headers provided by grpc-go / kubelet
 # Issue to track: https://github.com/grpc/grpc-go/issues/2628
 [patch.crates-io]
-h2 = { git = "https://github.com/kate-goldenring/h2", branch = "master"}
+h2 = { git = "https://github.com/kate-goldenring/h2", branch = "master" }
 
 [workspace]
 members = [

diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.1.10"
+version = "0.1.11"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 
@@ -18,7 +18,8 @@ futures = { version = "0.3.1", package = "futures" }
 futures-core = "0.3"
 futures-util = "0.3"
 futures-old = { version = "0.1", package = "futures" }
-hyper = "0.11"
+hyper = "0.12.34"
+h2 = "=0.2.6"
 kube = { version = "0.23.0", features = ["openapi"] }
 k8s-openapi = { version = "0.6.0", features = ["v1_16"] }
 lazy_static = "1.4"

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.1.10"
+version = "0.1.11"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git 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.1.10
+version: 0.1.11
 
 # 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.1.10
+appVersion: 0.1.11
diff --git 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.1.10"
+version = "0.1.11"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.1.10"
+version = "0.1.11"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 
@@ -15,8 +15,7 @@ futures = "0.3.1"
 futures-old = { version = "0.1", package = "futures" }
 futures-util = "0.3"
 env_logger = "0.6.1"
-hyper = "0.11"
-hyper-async = { version = "0.13.5", package = "hyper" }
+hyper = { version = "0.13.5", package = "hyper" }
 kube = { version = "0.23.0", features = ["openapi"] }
 k8s-openapi = { version = "0.6.0", features = ["v1_16"] }
 log = "0.4"

diff --git a/shared/src/onvif/mod.rs b/shared/src/onvif/mod.rs
@@ -1,7 +1,7 @@
 pub mod device_info {
     use async_trait::async_trait;
     use futures_util::stream::TryStreamExt;
-    use hyper_async::Request;
+    use hyper::Request;
     use log::trace;
     use mockall::{automock, predicate::*};
     use std::io::{Error, ErrorKind};
@@ -139,7 +139,7 @@ pub mod device_info {
                 .header("CONTENT-TYPE", full_mime)
                 .body(msg.to_string().into())
                 .expect("infallible");
-            let response = hyper_async::Client::new().request(request).await.unwrap();
+            let response = hyper::Client::new().request(request).await.unwrap();
             if response.status() != 200 {
                 return Err(anyhow::format_err!("failure"));
             }

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.1.10
+0.1.11