Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

fix(upgrade): handle removed values #4341

Merged
merged 1 commit into from
Nov 5, 2021
Merged

fix(upgrade): handle removed values #4341

merged 1 commit into from
Nov 5, 2021

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Nov 4, 2021

Description:
Currently, upgrading OSM with osm mesh upgrade fails when the newer
chart version removes or renames values from the installed chart because
values.schema.json defines "additionalProperties": false on each
object and osm mesh upgrade uses all the values from the installed
chart.

Now, the osm mesh upgrade command will not use any values from the old
release. Users can specify them with the new --set flag.

Fixes #4330

Testing done: Manually ran affected tests and other upgrade scenarios based on the existing e2e test.

Affected area:

Functional Area
New Functionality [ ]
CI System [X]
CLI Tool [X]
Certificate Management [ ]
Control Plane [ ]
Demo [ ]
Documentation [ ]
Egress [ ]
Ingress [ ]
Install [ ]
Networking [ ]
Observability [ ]
Performance [ ]
SMI Policy [ ]
Security [ ]
Sidecar Injection [ ]
Tests [ ]
Upgrade [X]
Other [ ]

Please answer the following questions with yes/no.

  1. Does this change contain code from or inspired by another project? No

    • Did you notify the maintainers and provide attribution?
  2. Is this a breaking change? Yes, release notes have been updated.

@shashankram
Copy link
Member

Looks like the e2e_upgrade_test passes with this change. Should we enable that test in the CI?

• [SLOW TEST:256.758 seconds]
[Tier 2][Bucket 10][] Upgrade from latest
/home/runner/work/osm/osm/tests/framework/common.go:91
  Tests upgrading the control plane
  /home/runner/work/osm/osm/tests/e2e/e2e_upgrade_test.go:27

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 4, 2021

Yes, those changes are included here.

Currently, upgrading OSM with `osm mesh upgrade` fails when the newer
chart version removes or renames values from the installed chart because
values.schema.json defines `"additionalProperties": false` on each
object and `osm mesh upgrade` uses all the values from the installed
chart.

Now, the `osm mesh upgrade` command will not use any values from the old
release. Users can specify them with the new `--set` flag.

Fixes #4330

Signed-off-by: Jon Huhn <johuhn@microsoft.com>
@nojnhuh nojnhuh marked this pull request as ready for review November 4, 2021 21:46
@snehachhabria snehachhabria merged commit 5c7931b into openservicemesh:main Nov 5, 2021
@nojnhuh nojnhuh deleted the upgrade branch November 5, 2021 15:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade should correctly handle fields removed from charts in the new version
3 participants