delete namespace function

Author: xeniape

rust/stackable-cockpit/src/platform/demo/spec.rs

@@ -1,6 +1,5 @@
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_operator::kube::api::{ApiResource, GroupVersionKind};
 use tracing::{Span, debug, info, instrument, warn};
 use tracing_indicatif::span_ext::IndicatifSpanExt as _;
 #[cfg(feature = "openapi")]
@@ -239,15 +238,7 @@ impl DemoSpec {
 
         // Delete demo namespace
         client
-            .delete_object(
-                &uninstall_parameters.demo_namespace,
-                &ApiResource::from_gvk(&GroupVersionKind {
-                    group: "".to_owned(),
-                    version: "v1".to_owned(),
-                    kind: "Namespace".to_owned(),
-                }),
-                None,
-            )
+            .delete_namespace(uninstall_parameters.demo_namespace)
             .await
             .context(DeleteObjectSnafu)?;
 
@@ -269,15 +260,7 @@ impl DemoSpec {
                 .context(UninstallReleaseSnafu)?;
 
             client
-                .delete_object(
-                    &uninstall_parameters.operator_namespace,
-                    &ApiResource::from_gvk(&GroupVersionKind {
-                        group: "".to_owned(),
-                        version: "v1".to_owned(),
-                        kind: "Namespace".to_owned(),
-                    }),
-                    None,
-                )
+                .delete_namespace(uninstall_parameters.operator_namespace)
                 .await
                 .context(DeleteObjectSnafu)?;
         }

rust/stackable-cockpit/src/platform/stack/spec.rs

@@ -1,7 +1,6 @@
 use serde::{Deserialize, Serialize};
 use serde_yaml::Mapping;
 use snafu::{OptionExt, ResultExt, Snafu};
-use stackable_operator::kube::api::{ApiResource, GroupVersionKind};
 use tracing::{Span, debug, info, instrument, log::warn};
 use tracing_indicatif::span_ext::IndicatifSpanExt as _;
 #[cfg(feature = "openapi")]
@@ -237,15 +236,7 @@ impl StackSpec {
 
         // Delete stack namespace
         client
-            .delete_object(
-                &uninstall_parameters.stack_namespace,
-                &ApiResource::from_gvk(&GroupVersionKind {
-                    group: "".to_owned(),
-                    version: "v1".to_owned(),
-                    kind: "Namespace".to_owned(),
-                }),
-                None,
-            )
+            .delete_namespace(uninstall_parameters.stack_namespace)
             .await
             .context(DeleteObjectSnafu)?;
 
@@ -265,15 +256,7 @@ impl StackSpec {
                 .await?;
 
             client
-                .delete_object(
-                    &uninstall_parameters.operator_namespace,
-                    &ApiResource::from_gvk(&GroupVersionKind {
-                        group: "".to_owned(),
-                        version: "v1".to_owned(),
-                        kind: "Namespace".to_owned(),
-                    }),
-                    None,
-                )
+                .delete_namespace(uninstall_parameters.operator_namespace)
                 .await
                 .context(DeleteObjectSnafu)?;
         }

rust/stackable-cockpit/src/utils/k8s/client.rs

@@ -601,6 +601,20 @@ impl Client {
         Ok(())
     }
 
+    /// Deletes a [`Namespace`] with `name` in the cluster.
+    pub async fn delete_namespace(&self, name: String) -> Result<()> {
+        self.delete_object(
+            &name,
+            &ApiResource::from_gvk(&GroupVersionKind {
+                group: "".to_owned(),
+                version: "v1".to_owned(),
+                kind: "Namespace".to_owned(),
+            }),
+            None,
+        )
+        .await
+    }
+
     /// Creates a [`Namespace`] only if not already present in the current cluster.
     pub async fn create_namespace_if_needed(&self, name: String) -> Result<()> {
         if self.get_namespace(&name).await?.is_none() {