Return okay if get 404 when trying to delete an Instance

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 

controller/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["<[email protected]>"]
 edition = "2018"
 

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.1
+version: 0.7.2
 
 # 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.1
+appVersion: 0.7.2

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

@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

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

@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

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

@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

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

@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-handlers/debug-echo/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-handlers/onvif/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-handlers/opcua/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-handlers/udev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

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

@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["<[email protected]>"]
 edition = "2018"
 

shared/src/k8s/mod.rs

@@ -533,30 +533,19 @@ pub async fn try_delete_instance(
                 break;
             }
             Err(e) => {
-                // Check if already was deleted else return error
-                match kube_interface
-                    .find_instance(instance_name, instance_namespace)
-                    .await
-                {
-                    Err(e) => {
-                        if let Some(kube::Error::Api(ae)) = e.downcast_ref::<kube::Error>() {
-                            if ae.code == ERROR_NOT_FOUND {
-                                log::trace!(
-                                    "try_delete_instance - discovered Instance {} already deleted",
-                                    instance_name
-                                );
-                                break;
-                            }
-                            log::error!("try_delete_instance - when looking up Instance {}, got kube API error: {:?}", instance_name, ae);
-                        }
-                    }
-                    Ok(_) => {
-                        log::error!(
-                            "try_delete_instance - tried to delete Instance {} but still exists. {} retries left.",
-                            instance_name, MAX_INSTANCE_UPDATE_TRIES - x - 1
+                if let Some(ae) = e.downcast_ref::<kube::error::ErrorResponse>() {
+                    if ae.code == ERROR_NOT_FOUND {
+                        log::trace!(
+                            "try_delete_instance - discovered Instance {} already deleted",
+                            instance_name
                         );
+                        break;
                     }
                 }
+                log::error!(
+                    "try_delete_instance - tried to delete Instance {} but still exists. {} retries left.",
+                    instance_name, MAX_INSTANCE_UPDATE_TRIES - x - 1
+                );
                 if x == MAX_INSTANCE_UPDATE_TRIES - 1 {
                     return Err(e);
                 }
@@ -571,6 +560,54 @@ pub async fn try_delete_instance(
 pub mod test_ownership {
     use super::*;
 
+    #[tokio::test]
+    async fn test_try_delete_instance() {
+        let mut mock_kube_interface = MockKubeInterface::new();
+        mock_kube_interface
+            .expect_delete_instance()
+            .times(1)
+            .returning(move |_, _| {
+                let error_response = kube::error::ErrorResponse {
+                    status: "random".to_string(),
+                    message: "blah".to_string(),
+                    reason: "NotFound".to_string(),
+                    code: 404,
+                };
+                Err(error_response.into())
+            });
+        try_delete_instance(&mock_kube_interface, "instance_name", "instance_namespace")
+            .await
+            .unwrap();
+    }
+
+    // Test that succeeds on second try
+    #[tokio::test]
+    async fn test_try_delete_instance_sequence() {
+        let mut seq = mockall::Sequence::new();
+        let mut mock_kube_interface = MockKubeInterface::new();
+        mock_kube_interface
+            .expect_delete_instance()
+            .times(1)
+            .returning(move |_, _| {
+                let error_response = kube::error::ErrorResponse {
+                    status: "random".to_string(),
+                    message: "blah".to_string(),
+                    reason: "SomeError".to_string(),
+                    code: 401,
+                };
+                Err(error_response.into())
+            })
+            .in_sequence(&mut seq);
+        mock_kube_interface
+            .expect_delete_instance()
+            .times(1)
+            .returning(move |_, _| Ok(()))
+            .in_sequence(&mut seq);
+        try_delete_instance(&mock_kube_interface, "instance_name", "instance_namespace")
+            .await
+            .unwrap();
+    }
+
     #[tokio::test]
     async fn test_ownership_from_config() {
         let name = "asdf";

version.txt

@@ -1 +1 @@
-0.7.1
+0.7.2

webhooks/validating/configuration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["DazWilkin <[email protected]>"]
 edition = "2018"