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 host container for 1.21.1 Release #4153

Merged
merged 4 commits into from
Aug 19, 2024

Conversation

ytsssun
Copy link
Contributor

@ytsssun ytsssun commented Aug 19, 2024

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

Testing done:

  • cargo make check-migrations
    Seeing error like
Found 4 problem(s) with data store migrations:
    - Migration 'aws-admin-container-v0-11-10' does not exist
    - Migration 'public-admin-container-v0-11-10' does not exist
    - Migration 'aws-control-container-v0-7-14' does not exist
    - Migration 'public-control-container-v0-7-14' does not exist

This is because we moved to a new root path for the migration. And this task definition needs an update. Created an issue to track in Twoliter - bottlerocket-os/twoliter#349.

  • Test migration from v1.20.5 to v1.21.1
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "9899697b",
    "pretty_name": "Bottlerocket OS 1.21.1 (aws-k8s-1.29)",
    "variant_id": "aws-k8s-1.29",
    "version_id": "1.21.1"
  }
}

[ssm-user@control]$ apiclient get settings.host-containers
{
  "settings": {
    "host-containers": {
      "admin": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.11.10",
        "superpowered": true,
        "user-data": "eyJzc2giOnsiYXV0aG9yaXplZC1rZXlzIjpbInNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQkFRREN3dWVnVFhTa29KZmpDZm9leDdRLytLTGJWNllVaXdiczFrbVJwc3grdDFEbGFsdS9ZM0VBZDN5TmdKRkdQZ29FZWptejdSaTRZcTZWUDQvWFJoaVl1Z09HNXpmaWtuZ1orMW9lbkppVVRpdDhpeXFYcXAxYTg0T3lWUVllcm5GZkNDWXJtdVFmcmp1d3RiY2VYK3RtS0xqbGtIcjNPVXFjdUxCeXBMSzhaRlVybjVTNUQ1b1EvV2VWeEhiM2NWdW5tVDlOblN0ZU5lZXJtZjVZNXBkMFNQWlNLL3lIVnNqYSttUGVmNFloNVM5YnJqM3hlZWg0THplNXJqQS9OaGpTU2lLVm5oVko2SktkUGhNQ0grM2h6d21Gd3dHK1FiL0VFcFZJSkU4ckl4R0czRWZRQ1I4a2M0OFZqc2tabjlVdzJpOUo2SDdNcHgxbThzdEpuYWVYIHl1dG9uZ3MtMjAyMyJdfX0="
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.14",
        "superpowered": false
      }
    }
  }
}
  • Test rollback to v1.20.5 from v1.21.1
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "a3e8bda1",
    "pretty_name": "Bottlerocket OS 1.20.5 (aws-k8s-1.29)",
    "variant_id": "aws-k8s-1.29",
    "version_id": "1.20.5"
  }
}

[ssm-user@control]$ 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.

Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if testing checks out.

Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM Assuming testing passes.

@ytsssun ytsssun merged commit 8a7ab70 into bottlerocket-os:develop Aug 19, 2024
29 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