Fix recovery upgrades #445
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidcassany
commented
Jul 23, 2021
|
|
||
| if [ -n "$UPGRADE_RECOVERY" ] && [ $UPGRADE_RECOVERY == true ] && [ -n "$RECOVERY_IMAGE" ]; then | ||
| UPGRADE_IMAGE=$RECOVERY_IMAGE | ||
| if [ -n "$UPGRADE_RECOVERY" ] && [ $UPGRADE_RECOVERY == true ] && [ -n "$RECOVERY_IMAGE" ]; then |
There was a problem hiding this comment.
UPGRADE_RECOVERY was not set here since it gets applied in from the command line parsing which used to happen after this method in former implementation. Hence the recovery image from /etc/cos-upgrade-image was never applied and it was defaulting to system/cos
davidcassany
force-pushed
the
fix_upgrades
branch
from
85d6136
to
45ad3ca
Compare
This commit fixes a bug related environment variables setting for cos-upgrade command. `cos-upgrade --recovery` was not using the recovery/cos image for upgrades since at the time the upgrade image was evaluated and decided the `RECOVERY_UPGRADE` variable was not set yet. Signed-off-by: David Cassany <[email protected]>
davidcassany
force-pushed
the
fix_upgrades
branch
from
45ad3ca
to
d361167
Compare
frelon
pushed a commit
to frelon/elemental-toolkit
that referenced
this pull request
May 12, 2023
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.3-0.20220401172941-5ff8fce1fcc6 to 1.6.18. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md) - [Commits](https://github.com/containerd/containerd/commits/v1.6.18) --- updated-dependencies: - dependency-name: github.com/containerd/containerd dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes a bug related environment variables setting for
cos-upgrade command.
cos-upgrade --recoverywas not usingthe recovery/cos image for upgrades since at the time the upgrade image
was evaluated and decided the
RECOVERY_UPGRADEvariable was not setyet.
Signed-off-by: David Cassany [email protected]