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: bump dependencies #1371

Merged
merged 1 commit into from
Mar 9, 2021

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Mar 9, 2021

Issue number:
Fixes #1038

Description of changes:

Author: Erikson Tung <etung@amazon.com>
Date:   Mon Mar 8 16:00:30 2021 -0800

    host-ctr: bump dependencies
    
    - Bumps host-ctr's dependencies.
    - Bumps containerd dependency from v1.3.7
    to v1.4.3 to match Bottlerocket's packaged containerd version.
    - Replaces `withAllDevicesAllowed` with upstream's
    `oci.WithAllDevicesAllowed`
    - go mod tidy
    - Drops patch 0001-Use-spec-s-mountLabel-when-mounting-the-rootfs.patch
    since it's in containerd v1.4.3

Testing done:

Build image and AMI successfully, launched instance.
Saw both admin and control host-containers come up fine.

I was able to repeat the testing done in #1037

No permission errors when trying to access the partitions.

[ec2-user@blah ~]$ sudo sheltie

bash-5.0# signpost status
OS disk: /dev/nvme0n1
Set A:   boot=/dev/nvme0n1p2 root=/dev/nvme0n1p3 hash=/dev/nvme0n1p4 priority=1 tries_left=0 successful=true
Set B:   boot=/dev/nvme0n1p6 root=/dev/nvme0n1p7 hash=/dev/nvme0n1p8 priority=0 tries_left=0 successful=false
Active:  Set A
Next:    Set A

bash-5.0# dd if=/dev/nvme0n1 of=/tmp/foo bs=4k count=8 
8+0 records in
8+0 records out
32768 bytes (33 kB, 32 KiB) copied, 9.1459e-05 s, 358 MB/s

bash-5.0# updog update -i 1.0.5 -r -n   
Starting update to 1.0.5
Cannot schedule shutdown without logind support, proceeding with immediate shutdown.
Update applied: aws-k8s-1.19 1.0.5
bash-5.0# Connection to blah.us-west-2.compute.amazonaws.com closed by remote host.
Connection to blah.us-west-2.compute.amazonaws.com closed.

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.

- Bumps host-ctr's dependencies.
- Bumps containerd dependency from v1.3.7
to v1.4.3 to match Bottlerocket's packaged containerd version.
- Replaces `withAllDevicesAllowed` with upstream's
`oci.WithAllDevicesAllowed`
- go mod tidy
- Drops patch 0001-Use-spec-s-mountLabel-when-mounting-the-rootfs.patch
since it's in containerd v1.4.3
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 etungsten merged commit dd5f0a1 into bottlerocket-os:develop Mar 9, 2021
@etungsten etungsten deleted the host-ctr-ctrd-v1.4.3 branch March 9, 2021 18:54
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.

host-ctr: use oci.WithAllDevicesAllowed when we move to containerd v1.4.0
5 participants