Remove host container migration #4324
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
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
f3531f7 to
b77efc3
Compare
|
☝️ Changed the Version in Twoliter.toml |
bcressey
reviewed
Dec 19, 2024
sources/settings-migrations/v1.29.0/change-public-control-container-to-set-gen/src/main.rs
Outdated
Show resolved
Hide resolved
sources/settings-migrations/v1.29.0/change-public-control-container-to-set-gen/src/main.rs
Outdated
Show resolved
Hide resolved
sources/api/migration/migration-helpers/src/common_migrations.rs
Outdated
Show resolved
Hide resolved
sources/api/migration/migration-helpers/src/common_migrations.rs
Outdated
Show resolved
Hide resolved
7 tasks
cbgbt
reviewed
Jan 16, 2025
sources/api/migration/migration-helpers/src/common_migrations.rs
Outdated
Show resolved
Hide resolved
sources/api/migration/migration-helpers/src/common_migrations.rs
Outdated
Show resolved
Hide resolved
vyaghras
force-pushed
the
remove_host_container_migration
branch
10 times, most recently
from
e9f7de6 to
d1a7c76
Compare
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
d1a7c76 to
afdc836
Compare
bcressey
reviewed
Jan 28, 2025
sources/settings-migrations/v1.33.0/reset-metadata-migration/src/main.rs
Outdated
Show resolved
Hide resolved
sources/api/migration/migration-helpers/src/common_migrations.rs
Outdated
Show resolved
Hide resolved
sources/settings-migrations/v1.33.0/public-remove-source-control/src/main.rs
Outdated
Show resolved
Hide resolved
sources/settings-migrations/v1.33.0/public-remove-source-admin/src/main.rs
Outdated
Show resolved
Hide resolved
sources/api/migration/migration-helpers/src/common_migrations.rs
Outdated
Show resolved
Hide resolved
cbgbt
reviewed
Jan 28, 2025
There was a problem hiding this comment.
nit: I'd spend a moment to clean up the commit messages if possible -- misspelling of metadata in a few commit messages titles, and the line wrapping is inconsistent in the GitHub UI for some of the commit message details (though this is sometimes just the GitHub UI being strange.).
sources/settings-migrations/v1.33.0/aws-remove-schnauzer-control/src/main.rs
Outdated
Show resolved
Hide resolved
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
afdc836 to
573de3a
Compare
vyaghras
force-pushed
the
remove_host_container_migration
branch
5 times, most recently
from
9a5a389 to
cbe0f74
Compare
cbgbt
reviewed
Feb 3, 2025
sources/settings-migrations/v1.33.0/aws-remove-schnauzer-admin/src/main.rs
Outdated
Show resolved
Hide resolved
sources/settings-migrations/v1.33.0/aws-remove-schnauzer-control/src/main.rs
Outdated
Show resolved
Hide resolved
sources/settings-migrations/v1.33.0/reset-metadata-migration/src/main.rs
Outdated
Show resolved
Hide resolved
…o table
Update the source from string like:
schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template
'{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.14'
To setting generator as object, that contains:
- command
- strength
- skip-if-populated
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
cbe0f74 to
6b7301e
Compare
bcressey
approved these changes
Feb 6, 2025
There was a problem hiding this comment.
Looks good. Please double-check the commit message for this one as it refers to an earlier version of the changes:
common_migrations: add new migrations to handle settings-generator as struct
If we don't strictly need them, consider backing out the changes to ReplaceSchnauzerMigration, or else splitting them into a separate commit that explains why.
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
6b7301e to
0d0b88c
Compare
|
☝️ Reverted the changes in ReplaceSchnauzerMigration and updated the commit. |
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
0d0b88c to
0344c32
Compare
cbgbt
approved these changes
Feb 7, 2025
We need to add these to match changes in Bottlerocket-core-kit Refer commit: bottlerocket-os/bottlerocket-core-kit@a72f6bd PR: bottlerocket-os/bottlerocket-core-kit#294
Updated the `commit_transaction` function to enable committing metadata from pending transactions. In commit transaction we will first commit metadata and then pending keys to correctly perform the check to identify if key exists or not. The strength handling among pending and committed transaction is as: If pending metadata is strong and committed metadata is weak, commit the pending setting. If pending metadata is weak, committed metadata is strong and the setting is already available, do not downgrade from strong to weak. Otherwise add the strength file with value as weak. If pending and committed metadata are the same, no action is performed. Additionally, made minor changes to metadata functions for improved access and flexibility: - Introduced a `committed` field to dynamically access metadata in pending transactions. - Replaced the hardcoded use of live committed metadata with this committed variable ans pass Committed::Live from previous usages. Refer commit: bottlerocket-os/bottlerocket-core-kit@20a435e Refer PR: bottlerocket-os/bottlerocket-core-kit#294
… struct - RemoveMetadataAndWeakSettingsMigration: When we downgrade multiple version to a version where migrator is not aware of deleting the setting-generator as struct or the strength file. This migration will help us to delete the weak settings and all metadata. - RemoveSchnauzerMigration: This will remove metadata(always) and data if the value matches with the value in existing datastore. - RemoveMatchingString: This will remove the data when value is same as the old value for public host containers.
Add a setting-generator that will populate the host-containers source and add strength=weak metadata if the setting is not populated.
In this migration we will remove the data and metadata if it matches with existing ones in datastore.We will rely on storewolf and sundog to populate correct metadata and data.
In this migration we will remove setting-generator metadata and source data if it matches with existing ones in datastore. We will rely on storewolf and sundog to populate correct metadata and data.
In this migration we will remove the data if it matches with existing ones in datastore. We will rely on storewolf and sundog to populate correct data from defaults.
In this migration we will remove the data if it matches with existing ones in datastore. We will rely on Storewolf and Sundog to populate correct data.
On downgrade we will remove all the weak metadata and settings, so that it can be populated from defaults.
vyaghras
force-pushed
the
remove_host_container_migration
branch
from
0344c32 to
77f8444
Compare
cbgbt
approved these changes
Feb 7, 2025
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.
Issue number:
Closes #
Description of changes:
Testing done:
Refer to testing in bottlerocket-os/bottlerocket-core-kit#294
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.