further uninstall adjustments

Author: xeniape

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

@@ -224,8 +224,9 @@ impl DemoSpec {
             .into_params(stack.parameters.clone())
             .context(ParseParametersSnafu)?;
 
-        // We add the STACK parameter, so that stacks can use that to render e.g. the stack label
+        // We add the STACK and DEMO parameter, so that stacks can use that to render e.g. the stack label
         stack_parameters.insert("STACK".to_owned(), self.stack.clone());
+        stack_parameters.insert("DEMO".to_owned(), uninstall_parameters.demo_name.clone());
 
         Self::uninstall_helm_manifests(
             &stack.manifests,

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

@@ -25,6 +25,10 @@ pub struct StackInstallParameters {
 pub struct StackUninstallParameters {
     pub stack_name: String,
 
+    /// Optional name of the demo, which is only present in case this stack is uninstalled as part of
+    /// a demo. This is unset in case a stack is uninstalled directly.
+    pub demo_name: Option<String>,
+
     pub operator_namespace: String,
     pub stack_namespace: String,
 

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

@@ -220,8 +220,11 @@ impl StackSpec {
             .into_params(self.parameters.clone())
             .context(ParseParametersSnafu)?;
 
-        // We add the STACK parameter, so that stacks can use that to render e.g. the stack label
+        // We add the STACK and optionally DEMO parameter, so that stacks can use that to render e.g. the stack label
         parameters.insert("STACK".to_owned(), uninstall_parameters.stack_name.clone());
+        if let Some(demo_name) = uninstall_parameters.demo_name {
+            parameters.insert("DEMO".to_owned(), demo_name);
+        }
 
         Self::uninstall_helm_manifests(
             &self.manifests,

rust/stackablectl/src/cmds/stack.rs

@@ -497,6 +497,8 @@ async fn uninstall_cmd(
                     release_list,
                     StackUninstallParameters {
                         stack_name: args.stack_name.clone(),
+                        // There is no demo when uninstalling only a stack
+                        demo_name: None,
                         operator_namespace: args.namespaces.operator_namespace.clone(),
                         stack_namespace: args.namespaces.namespace.clone(),
                         skip_operators: args.skip_operators_and_crds,