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-ctr: upgrades dependencies for v1.13.0 #2826

Merged
merged 1 commit into from
Mar 3, 2023

Conversation

jpmcb
Copy link
Contributor

@jpmcb jpmcb commented Feb 23, 2023

Issue number:

Related to #2761

Description of changes:

host-ctr: upgrades Go dependencies

- Upgrades containerd code dependencies to v1.6.19
- Upgrades opencontainers/runtime-spec to one used by containerd v1.6.19
- Upgrades golang.org/x/net and golang.org/x/crypto dependencies
  (which are not directly used) out of band of them being updated in
  aws-sdk-go. See the following for more info:
  https://github.com/aws/aws-sdk-go/issues/4738

Testing done:

Testing incoming!

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.

@jpmcb
Copy link
Contributor Author

jpmcb commented Feb 23, 2023

Host containers look 👍🏼

bash-5.1# systemctl status host-containers@admin
● host-containers@admin.service - Host container: admin
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/host-containers@.service; enabled; vendor preset: enabled)
     Active: active (running) since Thu 2023-02-23 22:51:50 UTC; 3min 43s ago
   Main PID: 2199 (host-ctr)
      Tasks: 9 (limit: 9162)
     Memory: 16.2M
     CGroup: /system.slice/system-host\x2dcontainers.slice/host-containers@admin.service
             └─ 2199 /usr/bin/host-ctr run --container-id=admin --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.9.4 --superpowered=true --registry-config=/etc/host-containers/host-ctr.toml

Feb 23 22:51:51 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: time="2023-02-23T22:51:51Z" level=info msg="pulled image successfully" img="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.9.4"
Feb 23 22:51:51 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: time="2023-02-23T22:51:51Z" level=info msg="unpacking image..." img="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.9.4"
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: time="2023-02-23T22:51:53Z" level=info msg="tagging image" img="328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.9.4"
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: time="2023-02-23T22:51:53Z" level=info msg="Container does not exist, proceeding to create it" ctr-id=admin
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: time="2023-02-23T22:51:53Z" level=info msg="container task does not exist, proceeding to create it" container-id=admin
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: time="2023-02-23T22:51:53Z" level=info msg="successfully started container task"
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: Created symlink /root/.config/systemd/user/admin.target.wants/getty@tty0.service, pointing to /etc/systemd/user/getty@.service.
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: Created symlink /root/.config/systemd/user/admin.target.wants/serial-getty@ttyS0.service, pointing to /etc/systemd/user/serial-getty@.service.
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: Created symlink /root/.config/systemd/user/admin.target.wants/sshd.service, pointing to /etc/systemd/user/sshd.service.
Feb 23 22:51:53 ip-172-31-56-110.us-west-2.compute.internal host-ctr[2199]: Startup finished in 20ms.

bash-5.1# systemctl status host-containers@control
● host-containers@control.service - Host container: control
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/host-containers@.service; enabled; vendor preset: enabled)
     Active: active (running) since Thu 2023-02-23 22:50:18 UTC; 5min ago
   Main PID: 1749 (host-ctr)
      Tasks: 9 (limit: 9162)
     Memory: 55.7M
     CGroup: /system.slice/system-host\x2dcontainers.slice/host-containers@control.service
             └─ 1749 /usr/bin/host-ctr run --container-id=control --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.0 --superpowered=false --registry-config=/etc/host-containers/host-ctr.toml

Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO [amazon-ssm-agent] registrar detected. Attempting registration
Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO [Registrar] Starting registrar module
Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO [EC2Identity] no registration info found for ec2 instance, attempting registration
Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO [CredentialRefresher] credentialRefresher has started
Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO [CredentialRefresher] Starting credentials refresher loop
Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO EC2RoleProvider Successfully connected with instance profile role credentials
Feb 23 22:50:24 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:24 INFO [CredentialRefresher] Next credential rotation will be in 30.599988057866668 minutes
Feb 23 22:50:25 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:25 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] [WorkerProvider] Worker ssm-agent-worker is not running, starting worker process
Feb 23 22:50:25 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:25 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] [WorkerProvider] Worker ssm-agent-worker (pid:19) started
Feb 23 22:50:25 ip-172-31-56-110.us-west-2.compute.internal host-ctr[1749]: 2023-02-23 22:50:25 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] Monitor long running worker health every 60 seconds

@jpmcb jpmcb force-pushed the host-ctr-deps-v1.13.0 branch from 3df787e to 59e8417 Compare February 24, 2023 00:53
@jpmcb
Copy link
Contributor Author

jpmcb commented Feb 24, 2023

Force pushed to fix grammar in commit message ✍🏼

@@ -3,16 +3,16 @@ module host-ctr
go 1.19

require (
github.com/aws/aws-sdk-go v1.44.176
github.com/aws/aws-sdk-go v1.44.208
github.com/awslabs/amazon-ecr-containerd-resolver v0.0.0-20221221205310-1903c4ed45d1
github.com/containerd/containerd v1.6.15
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should rebase this PR after #2825 gets merged so we can move to containerd 1.6.18 along with the other dep updates in one go.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a good call - yes; if we're upgrading to containerd 1.6.18, we can wait for that to get in and rebase on that to upgrade those dependencies too

@jpmcb
Copy link
Contributor Author

jpmcb commented Mar 1, 2023

Force pushed to:

- Upgrades containerd code dependencies to v1.6.19
- Upgrades opencontainers/runtime-spec to one used by containerd v1.6.19
- Upgrades golang.org/x/net and golang.org/x/crypto dependencies
  (which are not directly used) out of band of them being updated in
  aws-sdk-go. See the following for more info:
  aws/aws-sdk-go#4738

Signed-off-by: John McBride <jpmmcb@amazon.com>
@jpmcb jpmcb force-pushed the host-ctr-deps-v1.13.0 branch from 584fee5 to 7580d3d Compare March 1, 2023 16:02
@jpmcb
Copy link
Contributor Author

jpmcb commented Mar 1, 2023

Force pushed to upgrade to using the newly cut containerd v1.6.19

@jpmcb jpmcb marked this pull request as ready for review March 2, 2023 16:23
@jpmcb
Copy link
Contributor Author

jpmcb commented Mar 2, 2023

Re-built and re-ran tests. Everything's looking good. Will merge today unless someone objects:

bash-5.1# systemctl status host-containers@admin
● host-containers@admin.service - Host container: admin
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/host-containers@.service; enabled; vendor preset: enabled)
     Active: active (running) since Thu 2023-03-02 17:26:29 UTC; 20s ago
   Main PID: 2242 (host-ctr)
      Tasks: 10 (limit: 9162)
     Memory: 19.9M
     CGroup: /system.slice/system-host\x2dcontainers.slice/host-containers@admin.service
             └─ 2242 /usr/bin/host-ctr run --container-id=admin --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.9.4 --superpowered=true --registry-config=/etc/host-containers/host-ctr.toml

Mar 02 17:26:30 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: time="2023-03-02T17:26:30Z" level=info msg="pulled image successfully" img="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.9.4"
Mar 02 17:26:30 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: time="2023-03-02T17:26:30Z" level=info msg="unpacking image..." img="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.9.4"
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: time="2023-03-02T17:26:32Z" level=info msg="tagging image" img="328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.9.4"
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: time="2023-03-02T17:26:32Z" level=info msg="Container does not exist, proceeding to create it" ctr-id=admin
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: time="2023-03-02T17:26:32Z" level=info msg="container task does not exist, proceeding to create it" container-id=admin
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: time="2023-03-02T17:26:32Z" level=info msg="successfully started container task"
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: Created symlink /root/.config/systemd/user/admin.target.wants/getty@tty0.service, pointing to /etc/systemd/user/getty@.service.
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: Created symlink /root/.config/systemd/user/admin.target.wants/serial-getty@ttyS0.service, pointing to /etc/systemd/user/serial-getty@.service.
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: Created symlink /root/.config/systemd/user/admin.target.wants/sshd.service, pointing to /etc/systemd/user/sshd.service.
Mar 02 17:26:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[2242]: Startup finished in 19ms.
bash-5.1# systemctl status host-containers@control
● host-containers@control.service - Host container: control
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/host-containers@.service; enabled; vendor preset: enabled)
     Active: active (running) since Thu 2023-03-02 16:49:10 UTC; 37min ago
   Main PID: 1745 (host-ctr)
      Tasks: 10 (limit: 9162)
     Memory: 55.2M
     CGroup: /system.slice/system-host\x2dcontainers.slice/host-containers@control.service
             └─ 1745 /usr/bin/host-ctr run --container-id=control --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:v0.7.0 --superpowered=false --registry-config=/etc/host-containers/host-ctr.toml

Mar 02 16:49:17 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:15 INFO [EC2Identity] no registration info found for ec2 instance, attempting registration
Mar 02 16:49:31 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:31 INFO [CredentialRefresher] credentialRefresher has started
Mar 02 16:49:31 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:31 INFO [CredentialRefresher] Starting credentials refresher loop
Mar 02 16:49:31 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:31 INFO EC2RoleProvider Successfully connected with instance profile role credentials
Mar 02 16:49:31 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:31 INFO [CredentialRefresher] Next credential rotation will be in 31.8583300854 minutes
Mar 02 16:49:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:32 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] [WorkerProvider] Worker ssm-agent-worker is not running, starting worker process
Mar 02 16:49:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:32 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] [WorkerProvider] Worker ssm-agent-worker (pid:17) started
Mar 02 16:49:32 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 16:49:32 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] Monitor long running worker health every 60 seconds
Mar 02 17:21:23 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 17:21:23 INFO EC2RoleProvider Successfully connected with instance profile role credentials
Mar 02 17:21:23 ip-172-31-58-189.us-west-2.compute.internal host-ctr[1745]: 2023-03-02 17:21:23 INFO [CredentialRefresher] Next credential rotation will be in 31.3083306597 minutes
bash-5.1#

@jpmcb jpmcb merged commit 642f4d4 into bottlerocket-os:develop Mar 3, 2023
@jpmcb jpmcb deleted the host-ctr-deps-v1.13.0 branch March 3, 2023 03:13
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