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

Host container update for v1.17.0 #3646

Merged
merged 5 commits into from
Dec 7, 2023

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented Dec 7, 2023

Description of changes:

Update the default admin and control container images to v0.11.2 and v0.7.6 respectively.

Testing done:

  • cargo make check-migrations
  • Verify upgrade/downgrade

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.

Release.toml Outdated Show resolved Hide resolved
@jpculp jpculp force-pushed the 1.17.0-host-containers branch 2 times, most recently from db7e313 to 2c81512 Compare December 7, 2023 20:14
Copy link
Contributor

@cbgbt cbgbt left a comment

Choose a reason for hiding this comment

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

This seems right to me, assuming testing goes well.

@etungsten
Copy link
Contributor

etungsten commented Dec 7, 2023

Tested migrations and host-containers source image URLS are updated correctly:

Upgrade:

[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "763f6d4c",
    "pretty_name": "Bottlerocket OS 1.16.1 (aws-k8s-1.28)",
    "variant_id": "aws-k8s-1.28",
    "version_id": "1.16.1"
  }
}
...                 
bash-5.1# updog whats
aws-k8s-1.28 1.17.0
bash-5.1# updog update -r -n
Starting update to 1.17.0
Reboot scheduled for Thu 2023-12-07 21:19:18 UTC, use 'shutdown -c' to cancel.
Update applied: aws-k8s-1.28 1.17.0
bash-5.1# reboot
...
[root@admin]# apiclient get os                                                                          
{
  "os": {
    "arch": "x86_64",
    "build_id": "0157a90a",
    "pretty_name": "Bottlerocket OS 1.17.0 (aws-k8s-1.28)",
    "variant_id": "aws-k8s-1.28",
    "version_id": "1.17.0"
  }
}
[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.2",
        "superpowered": true,
        "user-data": "..."
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.6",
        "superpowered": false
      }
    }
  }
}


Downgrade:

bash-5.1# signpost rollback-to-inactive
bash-5.1# reboot
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "x86_64",
    "build_id": "763f6d4c",
    "pretty_name": "Bottlerocket OS 1.16.1 (aws-k8s-1.28)",
    "variant_id": "aws-k8s-1.28",
    "version_id": "1.16.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.1",
        "superpowered": true,
        "user-data": "
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.5",
        "superpowered": false
      }
    }
  }
}

@etungsten etungsten requested a review from cbgbt December 7, 2023 21:23
@jpculp jpculp merged commit 1ebf2df into bottlerocket-os:develop Dec 7, 2023
46 checks passed
@jpculp jpculp deleted the 1.17.0-host-containers branch December 7, 2023 21:47
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