Fix end-to-end tests

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

controller/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

controller/src/util/instance_action.rs

@@ -93,11 +93,11 @@ async fn internal_do_instance_watch(
         // Currently, this does not handle None except to break the
         // while.
         while let Some(event) = instances.next().await {
-            // Aquire lock to ensure cleanup_instance_and_configuration_svcs and the
+            // Acquire lock to ensure cleanup_instance_and_configuration_svcs and the
             // inner loop handle_instance call in internal_do_instance_watch
             // cannot execute at the same time.
             let _lock = synchronization.lock().await;
-            trace!("internal_do_instance_watch - aquired sync lock");
+            trace!("internal_do_instance_watch - acquired sync lock");
             handle_instance(event?, kube_interface).await?;
         }
     }
@@ -108,37 +108,43 @@ async fn internal_do_instance_watch(
 async fn handle_instance(
     event: WatchEvent<KubeAkriInstance>,
     kube_interface: &impl KubeInterface,
-) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
+) -> Result<(), anyhow::Error> {
     trace!("handle_instance - enter");
     match event {
         WatchEvent::Added(instance) => {
             info!(
                 "handle_instance - added Akri Instance {}: {:?}",
                 instance.metadata.name, instance.spec
             );
-            handle_instance_change(&instance, &InstanceAction::Add, kube_interface).await?;
+            handle_instance_change(&instance, &InstanceAction::Add, kube_interface)
+                .await
+                .map_err(|e| anyhow::format_err!("{}", e))?;
             Ok(())
         }
         WatchEvent::Deleted(instance) => {
             info!(
                 "handle_instance - deleted Akri Instance {}: {:?}",
                 instance.metadata.name, instance.spec
             );
-            handle_instance_change(&instance, &InstanceAction::Remove, kube_interface).await?;
+            handle_instance_change(&instance, &InstanceAction::Remove, kube_interface)
+                .await
+                .map_err(|e| anyhow::format_err!("{}", e))?;
             Ok(())
         }
         WatchEvent::Modified(instance) => {
             info!(
                 "handle_instance - modified Akri Instance {}: {:?}",
                 instance.metadata.name, instance.spec
             );
-            handle_instance_change(&instance, &InstanceAction::Update, kube_interface).await?;
-            Ok(())
-        }
-        WatchEvent::Error(ref e) => {
-            trace!("handle_instance - error for Akri Instance: {}", e);
+            handle_instance_change(&instance, &InstanceAction::Update, kube_interface)
+                .await
+                .map_err(|e| anyhow::format_err!("{}", e))?;
             Ok(())
         }
+        WatchEvent::Error(ref e) => Err(anyhow::format_err!(
+            "handle_instance - error for Akri Instance: {}",
+            e
+        )),
     }
 }
 

controller/src/util/node_watcher.rs

@@ -106,6 +106,11 @@ impl NodeWatcher {
             }
             WatchEvent::Modified(node) => {
                 trace!("handle_node - Modified: {:?}", &node.metadata.name);
+                trace!(
+                    "handle_node - Modified with Node Status {:?} and NodeSpec: {:?}",
+                    &node.status,
+                    &node.spec
+                );
                 if self.is_node_ready(&node) {
                     self.known_nodes
                         .insert(node.metadata.name.clone(), NodeState::Running);
@@ -166,6 +171,7 @@ impl NodeWatcher {
 
     /// This determines if a node is in the Ready state.
     fn is_node_ready(&self, k8s_node: &NodeObject) -> bool {
+        trace!("is_node_ready - for node {:?}", k8s_node.metadata.name);
         k8s_node
             .status
             .as_ref()

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.5.0
+version: 0.5.1
 
 # 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.5.0
+appVersion: 0.5.1

discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handler-modules/onvif-discovery-handler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handler-modules/opcua-discovery-handler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handler-modules/udev-discovery-handler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handlers/debug-echo/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handlers/onvif/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handlers/opcua/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-handlers/udev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

discovery-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

samples/brokers/udev-video-broker/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

version.txt

@@ -1 +1 @@
-0.5.0
+0.5.1

webhooks/validating/configuration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["DazWilkin <daz.wilkin@gmail.com>"]
 edition = "2018"