Skip to content

Commit

Permalink
fix(upgrade): remove etcd.initialClusterState from helm values
Browse files Browse the repository at this point in the history
Fixes openebs/mayastor#1735

This removes the helm value for the key etcd.initialClusterState for all
versions greater than or equal to 2.0.0-rc.0 and less than 2.7.3.

Signed-off-by: Niladri Halder <[email protected]>
  • Loading branch information
niladrih committed Jan 6, 2025
1 parent 776f7f0 commit 9a67f73
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 3 additions & 0 deletions k8s/upgrade/src/common/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ pub(crate) const TWO_DOT_SIX: &str = "2.6.0";

/// Version value for 2.7.2 release.
pub(crate) const TWO_DOT_SEVEN_DOT_TWO: &str = "2.7.2";

/// Version value for 2.7.3.
pub(crate) const TWO_DOT_SEVEN_DOT_THREE: &str = "2.7.3";
13 changes: 12 additions & 1 deletion k8s/upgrade/src/helm/values.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{
common::{
constants::{
KUBE_API_PAGE_SIZE, TWO_DOT_FIVE, TWO_DOT_FOUR, TWO_DOT_ONE, TWO_DOT_O_RC_ONE,
TWO_DOT_SEVEN_DOT_TWO, TWO_DOT_SIX, TWO_DOT_THREE,
TWO_DOT_SEVEN_DOT_THREE, TWO_DOT_SEVEN_DOT_TWO, TWO_DOT_SIX, TWO_DOT_THREE,
},
error::{
DeserializePromtailExtraConfig, ListCrds, Result, SemverParse,
Expand Down Expand Up @@ -383,6 +383,17 @@ where
)?;
}

// Special-case values for 2.7.3.
let two_dot_seven_dot_three = Version::parse(TWO_DOT_SEVEN_DOT_THREE).context(SemverParse {
version_string: TWO_DOT_SEVEN_DOT_THREE.to_string(),
})?;
if source_version.ge(&two_dot_o_rc_zero) && source_version.lt(&two_dot_seven_dot_three) {
yq.delete_object(
YamlKey::try_from(".etcd.initialClusterState")?,
upgrade_values_file.path(),
)?;
}

// Default options.
// Image tag is set because the high_priority file is the user's source options file.
// The target's image tag needs to be set for PRODUCT upgrade.
Expand Down

0 comments on commit 9a67f73

Please sign in to comment.