error handling and include/exclude operators in/from upgrading

Author: xeniape

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

@@ -35,6 +35,9 @@ pub enum Error {
     #[snafu(display("failed to deploy manifests using the kube client"))]
     DeployManifest { source: k8s::Error },
 
+    #[snafu(display("failed to construct a valid request"))]
+    ConstructRequest { source: reqwest::Error },
+
     #[snafu(display("failed to access the CRDs from source"))]
     AccessCRDs { source: reqwest::Error },
 
@@ -129,7 +132,7 @@ impl ReleaseSpec {
         namespace: &str,
         k8s_client: &Client,
     ) -> Result<()> {
-        debug!("Upgrading CRDs for release");
+        info!("Upgrading CRDs for release");
 
         include_products.iter().for_each(|product| {
             Span::current().record("product.included", product);
@@ -139,36 +142,31 @@ impl ReleaseSpec {
         });
 
         let client = reqwest::Client::new();
-
         let operators = self.filter_products(include_products, exclude_products);
 
-        Span::current().pb_set_style(
-            &ProgressStyle::with_template("Upgrading CRDs {wide_bar} {pos}/{len}").unwrap(),
-        );
-        Span::current().pb_set_length(operators.len() as u64);
-
         for (product_name, product) in operators {
-            Span::current().record("product_name", &product_name);
-            debug!("Upgrading CRDs for {product_name}-operator");
+            info!("Upgrading CRDs for {product_name}-operator");
 
-            let release = match product.version.pre.as_str() {
+            let release_branch = match product.version.pre.as_str() {
                 "dev" => "main".to_string(),
                 _ => {
                     format!("{}", product.version)
                 }
             };
 
             let request_url = format!(
-                "https://raw.githubusercontent.com/stackabletech/{product_name}-operator/{release}/deploy/helm/{product_name}-operator/crds/crds.yaml"
+                "https://raw.githubusercontent.com/stackabletech/{product_name}-operator/{release_branch}/deploy/helm/{product_name}-operator/crds/crds.yaml"
             );
 
-            // Get CRD manifests
-            // TODO bei nicht 200 Status, Fehler werfen
+            // Get CRD manifests from request_url
             let response = client
                 .get(request_url)
                 .send()
                 .await
+                .context(ConstructRequestSnafu)?
+                .error_for_status()
                 .context(AccessCRDsSnafu)?;
+
             let crd_manifests = response.text().await.context(ReadManifestsSnafu)?;
 
             // Upgrade CRDs
@@ -177,18 +175,29 @@ impl ReleaseSpec {
                 .await
                 .context(DeployManifestSnafu)?;
 
-            debug!("Upgraded {product_name}-operator CRDs");
-            Span::current().pb_inc(1);
+            info!("Upgraded {product_name}-operator CRDs");
         }
 
         Ok(())
     }
 
     #[instrument(skip_all)]
-    pub fn uninstall(&self, namespace: &str) -> Result<()> {
+    pub fn uninstall(&self,
+        include_products: &[String],
+        exclude_products: &[String],
+        namespace: &str) -> Result<()> {
         info!("Uninstalling release");
 
-        for (product_name, product_spec) in &self.products {
+        include_products.iter().for_each(|product| {
+            Span::current().record("product.included", product);
+        });
+        exclude_products.iter().for_each(|product| {
+            Span::current().record("product.excluded", product);
+        });
+
+        let operators = self.filter_products(include_products, exclude_products);
+
+        for (product_name, product_spec) in operators {
             info!("Uninstalling {product_name}-operator");
 
             // Create operator spec

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

@@ -37,6 +37,9 @@ pub enum Error {
     #[snafu(display("failed to patch/create Kubernetes object"))]
     KubeClientPatch { source: kube::error::Error },
 
+    #[snafu(display("failed to replace Kubernetes object"))]
+    KubeClientReplace { source: kube::error::Error },
+
     #[snafu(display("failed to deserialize YAML data"))]
     DeserializeYaml { source: serde_yaml::Error },
 
@@ -65,9 +68,6 @@ pub enum Error {
     #[snafu(display("failed to retrieve cluster information"))]
     ClusterInformation { source: cluster::Error },
 
-    #[snafu(display("failed to retrieve previous resource version information"))]
-    ResourceVersion { source: kube::error::Error },
-
     #[snafu(display("invalid or empty secret data in '{secret_name}'"))]
     InvalidSecretData { secret_name: String },
 
@@ -151,6 +151,9 @@ impl Client {
         Ok(())
     }
 
+    /// Replaces CRDs defined the in raw `crds` YAML string. This
+    /// method will fail if it is unable to parse the CRDs, unable to
+    /// resolve GVKs or unable to replace/create the dynamic objects.
     pub async fn replace_crds(&self, crds: &str) -> Result<()> {
         for crd in serde_yaml::Deserializer::from_str(crds) {
             let mut object = DynamicObject::deserialize(crd).context(DeserializeYamlSnafu)?;
@@ -179,12 +182,12 @@ impl Client {
                 object.metadata.resource_version = resource.resource_version();
                 api.replace(&object.name_any(), &PostParams::default(), &object)
                     .await
-                    .context(KubeClientPatchSnafu)?;
+                    .context(KubeClientReplaceSnafu)?;
             } else {
                 // Create CRD if a previous version wasn't found
                 api.create(&PostParams::default(), &object)
                     .await
-                    .context(KubeClientCreateSnafu)?;
+                    .context(KubeClientPatchSnafu)?;
             }
         }
 

rust/stackablectl/src/cmds/release.rs

@@ -346,8 +346,7 @@ async fn upgrade_cmd(
     cli: &Cli,
     release_list: release::ReleaseList,
 ) -> Result<String, CmdError> {
-    debug!(release = %args.release, "Upgrading release");
-    Span::current().pb_set_style(&ProgressStyle::with_template("").unwrap());
+    info!(release = %args.release, "Upgrading release");
 
     match release_list.get(&args.release) {
         Some(release) => {
@@ -356,7 +355,10 @@ async fn upgrade_cmd(
 
             // Uninstall the old operator release first
             release
-                .uninstall(&args.operator_namespace)
+                .uninstall(
+                    &args.included_products,
+                    &args.excluded_products,
+                    &args.operator_namespace)
                 .context(ReleaseUninstallSnafu)?;
 
             // Upgrade the CRDs for all the operators to be upgraded
@@ -403,7 +405,10 @@ async fn uninstall_cmd(
     match release_list.get(&args.release) {
         Some(release) => {
             release
-                .uninstall(&args.operator_namespace)
+                .uninstall(
+                    &Vec::new(),
+                    &Vec::new(),
+                    &args.operator_namespace)
                 .context(ReleaseUninstallSnafu)?;
 
             let mut result = cli.result();