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 containers for 1.25.0 release #4241

Merged

Conversation

ginglis13
Copy link
Contributor

@ginglis13 ginglis13 commented Oct 9, 2024

Issue number:

N/A

Description of changes:

(this PR is draft as we await a public release of the admin and control containers. I built host containers from respective tips of develop and pushed to my public ECR repo to get ahead on testing)

Update the admin host container to v0.11.13 and control host container to v0.7.17.

Also, add migrations to move to these versions on upgrade.

Testing done:

  • Test migration from v1.24.1 to v1.25.0
    Pre-migration:
bash-5.1# apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "a8d358b5-dirty",
    "pretty_name": "Bottlerocket OS 1.24.1 (aws-k8s-1.30)",
    "variant_id": "aws-k8s-1.30",
    "version_id": "1.24.1"
  }
}
bash-5.1# apiclient get settings.host-containers
{
  "settings": {
    "host-containers": {
      "admin": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.11.12"",
        "superpowered": true,
        "user-data": "<redacted>"
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.16",
        "superpowered": false
      }
    }
  }
}

Migrate:

bash-5.1# updog update -i 1.25.0 -r -n
Starting update to 1.25.0

Post-migration:

[ssm-user@control]$ amazon-ssm-agent --version
SSM Agent version: 3.3.987.0
[ssm-user@control]$ enter-admin-container
[root@admin]# sudo sheltie
bash-5.1# apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "11e06ee4",
    "pretty_name": "Bottlerocket OS 1.25.0 (aws-k8s-1.30)",
    "variant_id": "aws-k8s-1.30",
    "version_id": "1.25.0"
  }
}

bash-5.1# apiclient get settings.host-containers
{
  "settings": {
    "host-containers": {
      "admin": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.11.13",
        "superpowered": true,
        "user-data": "<redacted>"
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.17",
        "superpowered": false
      }
    }
  }
}
  • Test rollback from v1.25.0 to v1.24.1
bash-5.1# signpost rollback-to-inactive
bash-5.1# reboot
[ssm-user@control]$ apiclient get os
{
  "os": {
    "arch": "aarch64",
    "build_id": "a8d358b5-dirty",
    "pretty_name": "Bottlerocket OS 1.24.1 (aws-k8s-1.30)",
    "variant_id": "aws-k8s-1.30",
    "version_id": "1.24.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.12",
        "superpowered": true,
        "user-data": "<redacted>"
      },
      "control": {
        "enabled": true,
        "source": "328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.16",
        "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.

@ginglis13 ginglis13 mentioned this pull request Oct 9, 2024
6 tasks
@ginglis13 ginglis13 force-pushed the host-containers-10-10-2024 branch 3 times, most recently from 3f06c19 to 6ffc742 Compare October 10, 2024 17:09
@ginglis13
Copy link
Contributor Author

^ 2 recent force pushes to switch to publicly released host containers and rebase off latest merges to develop

@ginglis13 ginglis13 marked this pull request as ready for review October 10, 2024 17:28
@ginglis13 ginglis13 changed the title [WIP] Update host containers for 1.25.0 release Update host containers for 1.25.0 release Oct 10, 2024
@ginglis13 ginglis13 merged commit 5d5d044 into bottlerocket-os:develop Oct 10, 2024
2 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.

4 participants