Use deployedProductVersion to decide upgrade mode (but do not automatically advance it)

Author: nightkr

rust/crd/src/lib.rs

@@ -130,9 +130,6 @@ pub struct HdfsClusterSpec {
     // no doc string - See ProductImage struct
     pub image: ProductImage,
 
-    #[serde(default)]
-    pub upgrading: bool,
-
     // no doc string - See ClusterOperation struct
     #[serde(default)]
     pub cluster_operation: ClusterOperation,
@@ -808,14 +805,12 @@ impl HdfsCluster {
     }
 
     pub fn is_upgrading(&self) -> bool {
-        // *Ideally* we'd detect this from the version mismatch, but we need manual intervention to confirm that the upgrade is done
-        self.spec.upgrading
-        // self.status
-        //     .as_ref()
-        //     .and_then(|status| status.deployed_product_version.as_deref())
-        //     .map_or(false, |deployed_version| {
-        //         deployed_version != self.spec.image.product_version()
-        //     })
+        self.status
+            .as_ref()
+            .and_then(|status| status.deployed_product_version.as_deref())
+            .map_or(false, |deployed_version| {
+                deployed_version != self.spec.image.product_version()
+            })
     }
 
     pub fn authentication_config(&self) -> Option<&AuthenticationConfig> {

rust/operator-binary/src/hdfs_controller.rs

@@ -492,13 +492,21 @@ pub async fn reconcile_hdfs(hdfs: Arc<HdfsCluster>, ctx: Arc<Ctx>) -> HdfsOperat
             hdfs.as_ref(),
             &[&ss_cond_builder, &cluster_operation_cond_builder],
         ),
-        deployed_product_version: if deploy_done {
-            Some(hdfs.spec.image.product_version().to_string())
-        } else {
+        // FIXME: We can't currently leave upgrade mode automatically, since we don't know when an upgrade is finalized
+        deployed_product_version: Some(
             hdfs.status
                 .as_ref()
-                .and_then(|status| status.deployed_product_version.clone())
-        },
+                .and_then(|status| status.deployed_product_version.as_deref())
+                .unwrap_or(hdfs.spec.image.product_version())
+                .to_string(),
+        ),
+        // deployed_product_version: if deploy_done {
+        //     Some(hdfs.spec.image.product_version().to_string())
+        // } else {
+        //     hdfs.status
+        //         .as_ref()
+        //         .and_then(|status| status.deployed_product_version.clone())
+        // },
     };
 
     // During upgrades we do partial deployments, we don't want to garbage collect after those