Skip to content

Commit 0604aa6

Browse files
committed
s/upgrading_product_version/upgrade_target_product_version/g
1 parent a9809ba commit 0604aa6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

deploy/helm/hdfs-operator/crds/crds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,7 @@ spec:
18141814
During upgrades, this field contains the *old* version.
18151815
nullable: true
18161816
type: string
1817-
upgradingProductVersion:
1817+
upgradeTargetProductVersion:
18181818
description: The product version that is currently being upgraded to, otherwise null.
18191819
nullable: true
18201820
type: string

rust/crd/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ impl HdfsCluster {
812812
// If we're requesting a different version than what is deployed, assume that we're upgrading.
813813
// Could also be a downgrade to an older version, but we don't support downgrades after upgrade finalization.
814814
Some(UpgradeState::Upgrading)
815-
} else if requested_version != status.upgrading_product_version.as_deref()? {
815+
} else if requested_version != status.upgrade_target_product_version.as_deref()? {
816816
// If we're requesting the old version mid-upgrade, assume that we're downgrading.
817817
// We only support downgrading to the exact previous version.
818818
Some(UpgradeState::Downgrading)
@@ -1357,7 +1357,7 @@ pub struct HdfsClusterStatus {
13571357
pub deployed_product_version: Option<String>,
13581358

13591359
/// The product version that is currently being upgraded to, otherwise null.
1360-
pub upgrading_product_version: Option<String>,
1360+
pub upgrade_target_product_version: Option<String>,
13611361
}
13621362

13631363
impl HasStatusCondition for HdfsCluster {

rust/operator-binary/src/hdfs_controller.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ pub async fn reconcile_hdfs(hdfs: Arc<HdfsCluster>, ctx: Arc<Ctx>) -> HdfsOperat
502502
.unwrap_or(hdfs.spec.image.product_version())
503503
.to_string(),
504504
),
505-
upgrading_product_version: match upgrade_state {
505+
upgrade_target_product_version: match upgrade_state {
506506
// User is upgrading, whatever they're upgrading to is (by definition) the target
507507
Some(UpgradeState::Upgrading) => Some(hdfs.spec.image.product_version().to_string()),
508508
Some(UpgradeState::Downgrading) => {
@@ -514,7 +514,7 @@ pub async fn reconcile_hdfs(hdfs: Arc<HdfsCluster>, ctx: Arc<Ctx>) -> HdfsOperat
514514
// Downgrade is still in progress, preserve the current value
515515
hdfs.status
516516
.as_ref()
517-
.and_then(|status| status.upgrading_product_version.clone())
517+
.and_then(|status| status.upgrade_target_product_version.clone())
518518
}
519519
}
520520
// Upgrade is complete (if any), clear

0 commit comments

Comments
 (0)