Skip to content

pass embedded cluster artifacts in upstream upgrade #4549

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.

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

Merged
merged 9 commits into from
Apr 16, 2024

Conversation

cbodonnell
Copy link
Contributor

@cbodonnell cbodonnell commented Apr 15, 2024

What this PR does / why we need it:

This PR modifies code paths associated with the upstream upgrade CLI command to to ensure that embedded cluster artifacts from the airgap metadata are persisted in the installation file. This helps enable airgap upgrades from the CLI in embedded clusters.

Enables automated airgap upgrade testing of: https://app.shortcut.com/replicated/story/101432/trigger-airgap-upgrade-from-kots

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Steps to reproduce

Does this PR introduce a user-facing change?


Does this PR require documentation?

@cbodonnell cbodonnell marked this pull request as ready for review April 15, 2024 13:36
@cbodonnell cbodonnell force-pushed the cbo/sc-101432/upstream-upgrade-embedded-artifacts branch from b9a3b7a to c4efeb3 Compare April 15, 2024 14:50
@cbodonnell cbodonnell force-pushed the cbo/sc-101432/upstream-upgrade-embedded-artifacts branch from 3c98dc6 to 0c9cefb Compare April 15, 2024 19:51
@cbodonnell cbodonnell requested a review from sgalsaleh April 15, 2024 20:32
Comment on lines -119 to -126

if err := image.UpdateInstallationEmbeddedClusterArtifacts(image.UpdateInstallationEmbeddedClusterArtifactsOptions{
Artifacts: copyResult.EmbeddedClusterArtifacts,
KotsKinds: opts.KotsKinds,
UpstreamDir: opts.UpstreamDir,
}); err != nil {
return nil, errors.Wrap(err, "failed to update installation airgap artifacts")
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to write back to the installation.yaml anymore with push results since we're just using what is in the airgap metadata.

@cbodonnell cbodonnell merged commit 3c24246 into main Apr 16, 2024
105 checks passed
@cbodonnell cbodonnell deleted the cbo/sc-101432/upstream-upgrade-embedded-artifacts branch April 16, 2024 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants