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

Cherry pick host container updates to develop #4117

Merged
merged 6 commits into from
Aug 1, 2024

Conversation

ytsssun
Copy link
Contributor

@ytsssun ytsssun commented Jul 30, 2024

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:

  • Instance was able to boot.
[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"
  }
}
  • Host container is using the latest versions (v0.11.9 for admin container and v0.7.13 for control container).
[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.

@ytsssun ytsssun mentioned this pull request Jul 30, 2024
3 tasks
@ytsssun ytsssun marked this pull request as ready for review July 30, 2024 17:32
@ytsssun ytsssun changed the title [WIP]Cherry pick host container updates to develop Cherry pick host container updates to develop Jul 30, 2024
@cbgbt cbgbt self-requested a review July 31, 2024 23:45
@ytsssun ytsssun merged commit 16a0166 into bottlerocket-os:develop Aug 1, 2024
29 checks passed
@vigh-m vigh-m mentioned this pull request Aug 1, 2024
16 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.

5 participants