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

Update the host containers for 1.19.3 #3837

Merged
merged 4 commits into from
Mar 21, 2024
Merged

Conversation

ytsssun
Copy link
Contributor

@ytsssun ytsssun commented Mar 20, 2024

Description of changes:
Update the admin and control host containers to bottlerocket-admin-container v0.11.6 and bottlerocket-control-container v0.7.10. Also add migrations move to these versions on upgrade.

Testing done:

  • cargo make check-migrations
  • Build Bottlerocket AMI and check the version via API Client
apiclient get settings.host-containers
{
  "settings": {
    "host-containers": {
      "admin": {
        "enabled": false,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.11.6",
        "superpowered": true,
        "user-data": "xxxxxxxxxxxx"},
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.10",
        "superpowered": false
      }
    }
  }
}
  • Test migration from v1.19.2 to v1.19.3, host container versions are correctly picked up. (Same output as above)
  • Test rollback to v1.19.2 from v1.19.3, host container were correctly pointing to the older version:
[ec2-user@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.4",
        "superpowered": true,
        "user-data": "eyJzc2giOnsiYXV0aG9yaXplZC1rZXlzIjpbInNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRREN3dWVnVFhTa29KZmpDZm9leDdRLytLTGJWNllVaXdiczFrbVJwc3grdDFEbGFsdS9ZM0VBZDN5TmdKRkdQZ29FZWptejdSaTRZcTZWUDQvWFJoaVl1Z09HNXpmaWtuZ1orMW9lbkppVVRpdDhpeXFYcXAxYTg0T3lWUVllcm5GZkNDWXJtdVFmcmp1d3RiY2VYK3RtS0xqbGtIcjNPVXFjdUxCeXBMSzhaRlVybjVTNUQ1b1EvV2VWeEhiM2NWdW5tVDlOblN0ZU5lZXJtZjVZNXBkMFNQWlNLL3lIVnNqYSttUGVmNFloNVM5YnJqM3hlZWg0THplNXJqQS9OaGpTU2lLVm5oVko2SktkUGhNQ0grM2h6d21Gd3dHK1FiL0VFcFZJSkU4ckl4R0czRWZRQ1I4a2M0OFZqc2tabjlVdzJpOUo2SDdNcHgxbThzdEpuYWVYIHl1dG9uZ3MtMjAyMyJdfX0="
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.8",
        "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.

Signed-off-by: Yutong Sun <yutongsu@amazon.com>
Signed-off-by: Yutong Sun <yutongsu@amazon.com>
@ytsssun ytsssun marked this pull request as ready for review March 21, 2024 06:44
@bcressey
Copy link
Contributor

Can you fold the cargo fmt changes into the corresponding commits that added the migrations?

Signed-off-by: Yutong Sun <yutongsu@amazon.com>
Signed-off-by: Yutong Sun <yutongsu@amazon.com>
@ytsssun
Copy link
Contributor Author

ytsssun commented Mar 21, 2024

Can you fold the cargo fmt changes into the corresponding commits that added the migrations?

Yes, done.

@gthao313 gthao313 self-requested a review March 21, 2024 19:47
@ytsssun ytsssun merged commit df201af into bottlerocket-os:develop Mar 21, 2024
50 checks passed
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