Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick PR 571 to release/2.7 branch #572

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Cherry-pick PR 571 to release/2.7 branch #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ dependencies:
repository: https://nats-io.github.io/k8s/helm/charts/
condition: eventing.enabled
- name: localpv-provisioner
version: 4.1.1
version: 4.1.2
repository: https://openebs.github.io/dynamic-localpv-provisioner
condition: localpv-provisioner.enabled
2 changes: 1 addition & 1 deletion chart/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ This removes all the Kubernetes components associated with the chart and deletes
| https://grafana.github.io/helm-charts | loki-stack | 2.9.11 |
| https://jaegertracing.github.io/helm-charts | jaeger-operator | 2.50.1 |
| https://nats-io.github.io/k8s/helm/charts/ | nats | 0.19.14 |
| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.1.1 |
| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.1.2 |

## Values

Expand Down
3 changes: 3 additions & 0 deletions k8s/upgrade/src/bin/upgrade-job/common/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ pub(crate) const TWO_DOT_FIVE: &str = "2.5.0";

/// Version value for the earliest possible 2.6 release.
pub(crate) const TWO_DOT_SIX: &str = "2.6.0";

/// Version value for 2.7.2 release.
pub(crate) const TWO_DOT_SEVENT_DOT_TWO: &str = "2.7.2";
13 changes: 12 additions & 1 deletion k8s/upgrade/src/bin/upgrade-job/helm/values.rs
View file
Open in desktop
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_SIX, TWO_DOT_THREE,
TWO_DOT_SEVENT_DOT_TWO, TWO_DOT_SIX, TWO_DOT_THREE,
},
error::{
DeserializePromtailExtraConfig, ListCrds, Result, SemverParse,
Expand Down Expand Up @@ -372,6 +372,17 @@ where
)?;
}

// Special-case values for 2.7.2.
let two_dot_seven_dot_two = Version::parse(TWO_DOT_SEVENT_DOT_TWO).context(SemverParse {
version_string: TWO_DOT_SEVENT_DOT_TWO.to_string(),
})?;
if source_version.ge(&two_dot_o_rc_zero) && source_version.lt(&two_dot_seven_dot_two) {
yq.delete_object(
YamlKey::try_from(".localpv-provisioner.release")?,
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