Changes from Code Review

(cherry picked from commit 990a0b7)

src/audit.rs

@@ -3,9 +3,8 @@ use crate::events::init_event_watcher;
 use crate::manager::Manager;
 use crate::policy::{load_policies_from_file, PolicyInfo, PolicyStore, PolicyStoreRef};
 use crate::util::error::{kube_err, load_err, BridgekeeperError, Result};
-use crate::util::k8s_client::{list_with_retry, patch_status_with_retry};
+use crate::util::k8s::{list_with_retry, patch_status_with_retry, namespaces, find_k8s_resource_matches, gen_target_identifier};
 use crate::util::defaults::api_group_or_default;
-use crate::util::k8s_util::{namespaces, find_k8s_resource_matches, gen_target_identifier};
 use argh::FromArgs;
 use k8s_openapi::chrono::{DateTime, Utc};
 use kube::{

src/evaluator.rs

@@ -1,7 +1,7 @@
 use crate::{
     crd::{Policy, PolicySpec},
     events::{EventSender, PolicyEvent, PolicyEventData},
-    policy::{PolicyInfo, PolicyStoreRef}, util::k8s_util::find_k8s_resource_matches,
+    policy::{PolicyInfo, PolicyStoreRef}, util::k8s::find_k8s_resource_matches,
 };
 use kube::{core::{
     admission::{self, Operation},

src/util/k8s_util.rs → src/util/k8s.rs

@@ -1,9 +1,68 @@
-use crate::util::error::{kube_err, Result};
-use k8s_openapi::{api::core::v1::Namespace, apimachinery::pkg::apis::meta::v1::{APIGroup, APIResource}};
+use exponential_backoff::Backoff;
 use kube::{
+    api::{Api, ListParams, Patch, PatchParams},
+    core::ObjectList,
+    Resource, Client,
     core::{ApiResource as KubeApiResource, DynamicObject, GroupVersionKind},
-    Client, api::ListParams, Api, Resource
 };
+use lazy_static::lazy_static;
+use serde::{de::DeserializeOwned, Serialize};
+use std::time::Duration;
+
+use crate::util::error::{kube_err, Result};
+use k8s_openapi::{api::core::v1::Namespace, apimachinery::pkg::apis::meta::v1::{APIGroup, APIResource}};
+
+lazy_static! {
+    static ref BACKOFF: Backoff =
+        Backoff::new(4, Duration::from_millis(100), Duration::from_secs(2));
+}
+
+pub async fn list_with_retry<T>(api: &Api<T>, params: ListParams) -> kube::Result<ObjectList<T>>
+where
+    T: DeserializeOwned + Clone + std::fmt::Debug,
+{
+    for duration in BACKOFF.iter() {
+        match api.list(&params).await {
+            Ok(result) => return Ok(result),
+            Err(_err) => tokio::time::sleep(duration).await,
+        }
+    }
+    api.list(&params).await
+}
+
+pub async fn patch_status_with_retry<
+    T: DeserializeOwned + Clone + std::fmt::Debug,
+    P: serde::Serialize + std::fmt::Debug,
+>(
+    api: &Api<T>,
+    name: &str,
+    pp: &PatchParams,
+    patch: &Patch<P>,
+) -> kube::Result<T> {
+    for duration in BACKOFF.iter() {
+        match api.patch_status(name, pp, patch).await {
+            Ok(result) => return Ok(result),
+            Err(_err) => tokio::time::sleep(duration).await,
+        }
+    }
+    api.patch_status(name, pp, patch).await
+}
+
+pub async fn apply<T: Resource>(api: &Api<T>, name: &str, mut object: T) -> kube::Result<T>
+where
+    <T as Resource>::DynamicType: Default,
+    T: Clone,
+    T: Serialize,
+    T: DeserializeOwned,
+    T: std::fmt::Debug,
+{
+    if let Ok(res) = api.get(name).await {
+        object.meta_mut().resource_version = res.meta().resource_version.clone();
+        api.replace(name, &Default::default(), &object).await
+    } else {
+        api.create(&Default::default(), &object).await
+    }
+}
 
 pub async fn find_k8s_resource_matches(
     api_group: &str,
@@ -130,4 +189,4 @@ pub async fn namespaces(k8s_client: Client) -> Result<Vec<String>> {
         }
     }
     Ok(namespaces)
-}
+}

src/util/mod.rs

@@ -1,6 +1,5 @@
 pub mod cert;
 pub mod error;
-pub mod k8s_client;
-pub mod k8s_util;
+pub mod k8s;
 pub mod webhook;
 pub mod defaults;

src/util/webhook.rs

@@ -1,5 +1,5 @@
 use crate::util::error::{kube_err, Result};
-use crate::{constants::*, util::cert::CertKeyPair, util::k8s_client::apply};
+use crate::{constants::*, util::cert::CertKeyPair, util::k8s::apply};
 use k8s_openapi::api::admissionregistration::v1::{
     MutatingWebhookConfiguration, ValidatingWebhookConfiguration,
 };