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

[1.14.x] Update host containers for v1.14.3 #3313

Conversation

markusboehme
Copy link
Member

Issue number: n/a

Description of changes: Cherry-pick of #3307. A minor context change was needed in 71c6739 to remove the unnecessary migration change from 1.14.3 to 1.15.0.

Testing done:

  • cargo make check-migrations: all good (i.e. no obvious mistakes)
  • cargo make: worked (i.e. TOML isn't broken, migrations do compile)
  • An instance booting using a v1.14.3 AMI has the new host container images configured by default.
  • A v1.14.2 AMI can be upgraded to v1.14.3 and then uses the new host container images.
  • An updated v1.14.3 can be rolled back to v1.14.2 and then uses the old host container images.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Signed-off-by: Markus Boehme <[email protected]>
(cherry picked from commit 125c379)
Signed-off-by: Markus Boehme <[email protected]>
(cherry picked from commit eb8f3ad)
Signed-off-by: Markus Boehme <[email protected]>
(cherry picked from commit 8b7e86a)

Fixed context by dropping empty migration chain for 1.14.3 --> 1.15.0.

Signed-off-by: Markus Boehme <[email protected]>
Signed-off-by: Markus Boehme <[email protected]>
(cherry picked from commit d9a03fe)
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Testing coverage looks good, and looks like everything is covered.

@stmcginnis stmcginnis merged commit 6d352dc into bottlerocket-os:1.14.x Aug 3, 2023
43 checks passed
@stmcginnis stmcginnis mentioned this pull request Aug 4, 2023
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants