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.

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

cli: fix misleading error while applying kubernetes-only upgrade #1630

Merged
merged 13 commits into from
Apr 13, 2023

Conversation

derpsteb
Copy link
Member

@derpsteb derpsteb commented Apr 12, 2023

Proposed change(s)

  • Currently upgrade apply will show a misleading error message when the config specifies an invalid image upgrade and a valid Kubernetes upgrade. In that case the upgrade is applied as expected. However, the CLI prints an error like this: Error: upgrading NodeVersion: expected NodeVersion to contain <new image reference>, got <current image reference>. This patch fixes the check.
  • Add unittest to check the errors are actually triggered if apply responds with an unexpected message
  • Do not verify measurements during e2e test. If we are upgrading to release images we can't verify the release signatures with the dev pub key in the CLI.

Additional info

  • Test run: GCP, 1+1, 2.6 --> main 🟢. Executes only kubernetes upgrade 1.25.7 -> 1.26.3.
  • A backport would be nice, but is not urgent imo. As far as I see it, apply triggers any upgrades as expected.

Checklist

  • Add labels (e.g., for changelog category)
  • Link to Milestone

The check would previously fail if e.g. `apply` did not upgrade the
image, but a new image was specified in the config. This could
happen if the specified image was too new, but a valid Kuberentes
upgrade was specified.
@derpsteb derpsteb added bug fix Fixing a bug needs backport This PR needs to be backported to a previous release labels Apr 12, 2023
@derpsteb derpsteb added this to the v2.8.0 milestone Apr 12, 2023
@netlify
Copy link

netlify bot commented Apr 12, 2023

Deploy Preview for constellation-docs canceled.

Name Link
🔨 Latest commit 8106813
🔍 Latest deploy log https://app.netlify.com/sites/constellation-docs/deploys/6437f97ec27c1a0008e22026

e2e/internal/upgrade/image.go Outdated Show resolved Hide resolved
Copy link
Member

@3u13r 3u13r left a comment

Choose a reason for hiding this comment

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

LGTM

@derpsteb derpsteb merged commit d2967ff into main Apr 13, 2023
@derpsteb derpsteb deleted the fix/cli/upgrade-apply branch April 13, 2023 13:58
katexochen pushed a commit that referenced this pull request Apr 13, 2023
* The check would previously fail if e.g. `apply` did not upgrade the
image, but a new image was specified in the config. This could
happen if the specified image was too new, but a valid Kuberentes
upgrade was specified.
* ci: fix variable expansion in e2e-upgrade call
* e2e: do not verify measurement signature
katexochen added a commit that referenced this pull request Apr 13, 2023
* The check would previously fail if e.g. `apply` did not upgrade the
image, but a new image was specified in the config. This could
happen if the specified image was too new, but a valid Kuberentes
upgrade was specified.
* ci: fix variable expansion in e2e-upgrade call
* e2e: do not verify measurement signature

Co-authored-by: Otto Bittner <[email protected]>
msanft pushed a commit that referenced this pull request Apr 17, 2023
* The check would previously fail if e.g. `apply` did not upgrade the
image, but a new image was specified in the config. This could
happen if the specified image was too new, but a valid Kuberentes
upgrade was specified.
* ci: fix variable expansion in e2e-upgrade call
* e2e: do not verify measurement signature
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix Fixing a bug needs backport This PR needs to be backported to a previous release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants