Closed ytsssun closed 1 month ago
Issue number:
Closes #
Description of changes: This PR cherry picks:
Resolve the merge conflict locally due to file path changes especially for the migrations. Moved the 1.20.5 migrations to the archived folder.
Testing done:
[root@admin]# apiclient get os { "os": { "arch": "x86_64", "build_id": "34f8a2e8", "pretty_name": "Bottlerocket OS 1.21.0 (aws-k8s-1.29)", "variant_id": "aws-k8s-1.29", "version_id": "1.21.0" } }
v0.11.9
v0.7.13
[root@admin]# apiclient get settings.host-containers { "settings": { "host-containers": { "admin": { "enabled": true, "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.11.9", "superpowered": true, "user-data": "eyJzc2giOnsiYXV0aG9yaXplZC1rZXlzIjpbInNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRREN3dWVnVFhTa29KZmpDZm9leDdRLytLTGJWNllVaXdiczFrbVJwc3grdDFEbGFsdS9ZM0VBZDN5TmdKRkdQZ29FZWptejdSaTRZcTZWUDQvWFJoaVl1Z09HNXpmaWtuZ1orMW9lbkppVVRpdDhpeXFYcXAxYTg0T3lWUVllcm5GZkNDWXJtdVFmcmp1d3RiY2VYK3RtS0xqbGtIcjNPVXFjdUxCeXBMSzhaRlVybjVTNUQ1b1EvV2VWeEhiM2NWdW5tVDlOblN0ZU5lZXJtZjVZNXBkMFNQWlNLL3lIVnNqYSttUGVmNFloNVM5YnJqM3hlZWg0THplNXJqQS9OaGpTU2lLVm5oVko2SktkUGhNQ0grM2h6d21Gd3dHK1FiL0VFcFZJSkU4ckl4R0czRWZRQ1I4a2M0OFZqc2tabjlVdzJpOUo2SDdNcHgxbThzdEpuYWVYIHl1dG9uZ3MtMjAyMyJdfX0=" }, "control": { "enabled": true, "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.13", "superpowered": false } } } }
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.
Issue number:
Closes #
Description of changes: This PR cherry picks:
Resolve the merge conflict locally due to file path changes especially for the migrations. Moved the 1.20.5 migrations to the archived folder.
Testing done:
v0.11.9
for admin container andv0.7.13
for control container).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.