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.

Sign up for GitHub

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

Jump to bottom

Archive migrations before v1.12.0 #2606

Merged
merged 1 commit into from
Nov 27, 2022
Merged

Archive migrations before v1.12.0 #2606

merged 1 commit into from
Nov 27, 2022

Conversation

mjsterckx
Copy link
Contributor

@mjsterckx mjsterckx commented Nov 22, 2022 •
edited
Loading

Description of changes:

Archiving migrations improves build speed. Following the example of #2518.

Testing done:

Before this change, the contents of the migrations rpm shows:

ubuntu@ip-172-31-65-200:~/dev/bottlerocket/build/rpms$ rpm -qlp bottlerocket-x86_64-migrations-0.0-0.x86_64.rpm
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.10.1_container-runtime
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.10.1_container-runtime-metadata
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_aws-admin-container-v0-9-3
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_aws-config-settings
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_aws-control-container-v0-6-4
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_aws-creds
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_aws-creds-metadata
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_credential-providers
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_ecs-additional-configurations
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_kubelet-new-config-files
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_kubelet-tls-config
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_kubelet-tls-files
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_public-admin-container-v0-9-3
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations/migrate_v1.11.0_public-control-container-v0-6-4

After this change, the contents of the migrations rpm is now just the directory and nothing else:

ubuntu@ip-172-31-65-200:~/dev/bottlerocket/build/rpms$ rpm -qlp bottlerocket-x86_64-migrations-0.0-0.x86_64.rpm
/x86_64-bottlerocket-linux-gnu/sys-root/usr/share/migrations

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.

@mjsterckx mjsterckx marked this pull request as draft November 22, 2022 16:09
@mjsterckx mjsterckx marked this pull request as ready for review November 22, 2022 17:29
stmcginnis
stmcginnis approved these changes Nov 22, 2022
View reviewed changes
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.

Looks right and matches past archive migrations patches.

@etungsten
Copy link
Contributor

etungsten commented Nov 22, 2022 •
edited
Loading

We should merge #2605 first, then archive everything before 1.12.0.

Can you please also do some testing akin to what was done in #2357?

@mjsterckx mjsterckx marked this pull request as draft November 22, 2022 18:30
@mjsterckx
Copy link
Contributor Author

^ Removed 1.11.0 migrations as well

@mjsterckx mjsterckx marked this pull request as ready for review November 23, 2022 22:25
@etungsten etungsten changed the title Archive 1.10.1 migrations Archive migrations before v1.12.0 Nov 23, 2022
stmcginnis
stmcginnis approved these changes Nov 24, 2022
View reviewed changes
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.

Updates look good.

@mjsterckx mjsterckx merged commit 5ec3212 into bottlerocket-os:develop Nov 27, 2022
@mjsterckx mjsterckx deleted the archive-1.10.1-migrations branch November 27, 2022 16:07
@jpmcb jpmcb mentioned this pull request Feb 13, 2023
Closed
@bcressey bcressey mentioned this pull request May 31, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stmcginnis stmcginnis stmcginnis approved these changes

@webern webern webern approved these changes

@etungsten etungsten etungsten approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mjsterckx @etungsten @stmcginnis @webern