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.

Sign up for GitHub

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

Jump to bottom

host-ctr: update dependencies #2016

Merged
merged 1 commit into from
Mar 25, 2022
Merged

host-ctr: update dependencies #2016

merged 1 commit into from
Mar 25, 2022

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Mar 22, 2022 •
edited
Loading

Issue number:
Partially resolves #1966

Description of changes:
Regenerated go.mod and ran go mod tidy
Locks containerd dependency version to v1.5.10 so it matches bottlerocket's packaged containerd version.

Testing done:

bash-5.0# systemctl status host-containers@admin
● [email protected] - Host container: admin
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/[email protected]; enabled; vendor preset: enabled)
     Active: active (running) since Tue 2022-03-22 22:11:58 UTC; 1min 32s ago
   Main PID: 1607 (host-ctr)
      Tasks: 9 (limit: 9269)
     Memory: 29.3M
     CGroup: /system.slice/system-host\x2dcontainers.slice/[email protected]
             └─1607 /usr/bin/host-ctr run --container-id=admin --source=328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.7.4 --superpowered=true --registry-config=/etc/host-containers/host-ctr.toml

Mar 22 22:12:00 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:00Z" level=info msg="pulling with Amazon ECR Resolver" ref="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.7.4"
Mar 22 22:12:03 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:03Z" level=info msg="pulled image successfully" img="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.7.4"
Mar 22 22:12:03 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:03Z" level=info msg="unpacking image..." img="ecr.aws/arn:aws:ecr:us-west-2:328549459982:repository/bottlerocket-admin:v0.7.4"
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:13Z" level=info msg="tagging image" img="328549459982.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-admin:v0.7.4"
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:13Z" level=info msg="Container does not exist, proceeding to create it" ctr-id=admin
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:13Z" level=info msg="container task does not exist, proceeding to create it" container-id=admin
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: time="2022-03-22T22:12:13Z" level=info msg="successfully started container task"
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: Server listening on 0.0.0.0 port 22.
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: Server listening on :: port 22.
Mar 22 22:13:06 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1607]: Accepted publickey for ec2-user from 66.215.207.13 port 54166 ssh2: RSA SHA256:+qAlN881Y/8Rza0+mOmjviCFvfvNWhvHX5q/F+myiSE
bash-5.0# systemctl status host-containers@control
● [email protected] - Host container: control
     Loaded: loaded (/x86_64-bottlerocket-linux-gnu/sys-root/usr/lib/systemd/system/[email protected]; enabled; vendor preset: enabled)
     Active: active (running) since Tue 2022-03-22 22:11:58 UTC; 1min 34s ago
   Main PID: 1608 (host-ctr)
      Tasks: 9 (limit: 9269)
     Memory: 29.7M
     CGroup: /system.slice/system-host\x2dcontainers.slice/[email protected]
             └─1608 /usr/bin/host-ctr run --container-id=control --source=663461391984.dkr.ecr.us-west-2.amazonaws.com/bottlerocket-control:script-and-screen --superpowered=false --registry-config=/etc/host-containers/host-ctr.toml

Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO Agent will take identity from EC2
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO [amazon-ssm-agent] using named pipe channel for IPC
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO [amazon-ssm-agent] using named pipe channel for IPC
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO [amazon-ssm-agent] using named pipe channel for IPC
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO [amazon-ssm-agent] amazon-ssm-agent - v3.1.821.0
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO [amazon-ssm-agent] OS: linux, Arch: amd64
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:12 INFO [CredentialRefresher] Identity does not require credential refresher
Mar 22 22:12:13 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:13 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] [WorkerProvider] Worker ssm-agent-worker is not running, starting worker process
Mar 22 22:12:14 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:13 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] [WorkerProvider] Worker ssm-agent-worker (pid:13) started
Mar 22 22:12:14 ip-192-168-20-98.us-west-2.compute.internal host-ctr[1608]: 2022-03-22 22:12:13 INFO [amazon-ssm-agent] [LongRunningWorkerContainer] Monitor long running worker health every 60 seconds

Disabled and re-enabled host-containers and they still work fine.

I noticed an issue with disabling the control host-container via Bottlerocket settings and I opened an issue here: #2017
This is not related to this change and I do not consider this a blocking issue for this PR.

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.

@etungsten etungsten requested a review from cbgbt March 22, 2022 22:17
zmrow
zmrow approved these changes Mar 23, 2022
View reviewed changes
Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

😂

@etungsten
host-ctr: update dependencies
0c916b9 
This updates the containerd client library dependency to v1.5.11 along
with some other dependency bumps.
@etungsten
Copy link
Contributor Author

Push above bumps the containerd dependency to v1.5.11 to match our containerd package update that ingests the CVE fixes.

@etungsten etungsten merged commit 319bd8f into bottlerocket-os:develop Mar 25, 2022
@etungsten etungsten deleted the gogogogo branch March 25, 2022 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@webern webern webern approved these changes

@jpculp jpculp jpculp approved these changes

@zmrow zmrow zmrow approved these changes

@cbgbt cbgbt cbgbt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update golang dependencies for 1.7.0
5 participants
@etungsten @cbgbt @zmrow @jpculp @webern