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

Third party package updates release 1 14 #2991

Conversation

vyaghras
Copy link
Contributor

@vyaghras vyaghras commented Apr 7, 2023

Issue number:

Closes: #2994

Description of changes:

packages:update containerd to 1.6.20
packages: update coreutils to 9.3
packages:update docker-proxy to f7cdd0e7adbf0818e384178093aa67e38ffdb112
packages: update ecr-credential-provider to 1.27.0
packages: update ecs-agent to 1.70.2
packages: update grep to 3.9
packages: update iproute2 to 6.2.0
packages: update libelf to 0.189
packages: update libglib to 2.76.0
packages: update libnftnl to 1.2.5
packages: update liblzma to 5.4.2
packages: update libcap to 2.68
packages:update libzstd to 1.5.5
packages:update libnvidia-container to 1.13.1
packages: update makedumpfile to 1.7.3
packages:update nvidia-k8s-device-plugin to 0.14.0
packages: update nvidia-container-toolkit to 1.13.0
packages: update open-vm-tools to 12.2.0
packages: update tcpdump to 4.99.4
packages: update strace to 6.2

Patch in coreutils have been deleted, as the change is available in upstream package.

Updates all third party packages except for the following:

Testing done:

  • aws-k8s-1.24 x86_64 joins cluster.
  • aws-k8s-1.26 x86_64 joins cluster.
  • aws-k8s-1.24-nvidia aarch64 pass the quick tests.
NAME                                TYPE      STATE            PASSED         SKIPPED         FAILED    
 aarch64-aws-k8s-124-nvidia         Resource  completed                          
 aarch64-aws-k8s-124-nvidia-quick   Test      pass              1             6972             0      
  • aws-ecs-1 x86-64 pass the quick tests.
NAME                              TYPE           STATE      PASSED	SKIPPED    FAILED	 
x86-64-aws-ecs-1                  Resource       completed                        
x86-64-aws-ecs-1-instances-rtfq   Resource       completed                        
x86-64-aws-ecs-1-quick            Test           pass          1         0          0      
  • aws-ecs-1-nvidia x86-64 pass the quick tests.
NAME                                      TYPE          STATE         PASSED	SKIPPED    FAILED	  
x86-64-aws-ecs-1-nvidia                   Resource      completed                        
x86-64-aws-ecs-1-nvidia-instances-xafw    Resource      completed                         
x86-64-aws-ecs-1-nvidia-quick             Test          pass            1         0          0      
  • vmware-k8s-1.24, created cluster with eks-a with OVA built from changes and can run workloads fine
$ kubectl --kubeconfig br-eksa-124-eks-a-cluster.kubeconfig get nodes -o wide
NAME            STATUS   ROLES           AGE     VERSION                INTERNAL-IP     EXTERNAL-IP     OS-IMAGE                                   KERNEL-VERSION   CONTAINER-RUNTIME
198.19.132.87   Ready    <none>          62s     v1.24.10-eks-08ad9cc   198.19.132.87   198.19.132.87   Bottlerocket OS 1.13.0 (vmware-k8s-1.24)   5.15.90          containerd://1.6.19+bottlerocket
198.19.132.88   Ready    <none>          60s     v1.24.10-eks-08ad9cc   198.19.132.88   198.19.132.88   Bottlerocket OS 1.13.0 (vmware-k8s-1.24)   5.15.90          containerd://1.6.19+bottlerocket
198.19.33.21    Ready    control-plane   2m23s   v1.24.10-eks-08ad9cc   198.19.33.21    198.19.33.21    Bottlerocket OS 1.13.0 (vmware-k8s-1.24)   5.15.90          containerd://1.6.19+bottlerocket
198.19.66.43    Ready    control-plane   68s     v1.24.10-eks-08ad9cc   198.19.66.43    198.19.66.43    Bottlerocket OS 1.13.0 (vmware-k8s-1.24)   5.15.90          containerd://1.6.19+bottlerocket
  • vmware-k8s-1.26, created cluster with eks-a with OVA built from changes and all the sonobuoy tests passes.
15:35:38             e2e          global   complete            Passed:360, Failed:  0
  • metal-k8s, created cluster with eks-a with image built from changes and can run workloads fine
kubectl --kubeconfig br-125-3pup-eks-a-cluster.kubeconfig get nodes -o wide
NAME          STATUS   ROLES           AGE     VERSION               INTERNAL-IP   EXTERNAL-IP   OS-IMAGE                                  KERNEL-VERSION   CONTAINER-RUNTIME
10.80.50.22   Ready    <none>          2m40s   v1.25.6-eks-232056e   10.80.50.22   <none>        Bottlerocket OS 1.13.0 (metal-k8s-1.25)   5.15.90          containerd://1.6.19+bottlerocket
10.80.50.24   Ready    control-plane   9m43s   v1.25.6-eks-232056e   10.80.50.24   <none>        Bottlerocket OS 1.13.0 (metal-k8s-1.25)   5.15.90          containerd://1.6.19+bottlerocket
10.80.50.27   Ready    <none>          3m6s    v1.25.6-eks-232056e   10.80.50.27   <none>        Bottlerocket OS 1.13.0 (metal-k8s-1.25)   5.15.90          containerd://1.6.19+bottlerocket

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.

@stmcginnis
Copy link
Contributor

Looks like strace needs to be added to the lookaside cache? I think it's only pulled in to the *-dev variants, so those are the only ones where it will fail to find it.

@gazal-k
Copy link

gazal-k commented Apr 20, 2023

Updates all third party packages except for the following:

Can we please update containerd to 1.6.20?

That would bump up go-restful to v3 and avoid the need for changes in #2813

@vyaghras
Copy link
Contributor Author

Updates all third party packages except for the following:

Can we please update containerd to 1.6.20?

That would bump up go-restful to v3 and avoid the need for changes in #2813

Thanks for bringing it up @gazal-k . We will check and get back on this.

@vyaghras vyaghras force-pushed the third-party-package-updates-release-1_14 branch from c070e89 to 798682a Compare April 25, 2023 21:08
@jpmcb
Copy link
Contributor

jpmcb commented Apr 25, 2023

That would bump up go-restful to v3 and avoid the need for changes

I think upgrading to v1.16.20 of containerd is a good stopgap until we can make the leap to v1.7.0 but upgrading the 3rd party package won't affect the code dependencies in the host-ctr go module. That will require a separate PR to host-ctr to upgrade there (and remove the replace for go-restful)

@vyaghras vyaghras force-pushed the third-party-package-updates-release-1_14 branch 3 times, most recently from a42fe32 to 2dc3863 Compare April 26, 2023 21:39
@vyaghras vyaghras force-pushed the third-party-package-updates-release-1_14 branch from 0d9cb99 to 147cc27 Compare April 27, 2023 17:22
@vyaghras vyaghras force-pushed the third-party-package-updates-release-1_14 branch from fc7b16a to ea2370d Compare April 27, 2023 21:00
@vyaghras
Copy link
Contributor Author

Updates all third party packages except for the following:

Can we please update containerd to 1.6.20?
@gazal-k We have updated containerd to 1.7.0 in this change.

Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Looks good to me - thanks @vyaghras!

@vyaghras vyaghras merged commit 4274d8b into bottlerocket-os:develop May 2, 2023
37 checks passed
Comment on lines 4 to +6
# Use the libnetwork commit listed in this file for the docker version we ship:
# https://github.com/moby/moby/blob/DOCKER-VERSION-HERE/vendor.conf
%global commit 0dde5c895075df6e3630e76f750a447cf63f4789
%global commit f7cdd0e7adbf0818e384178093aa67e38ffdb112
Copy link
Contributor

Choose a reason for hiding this comment

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

Per the comment above this commit line, this needs to align with the Docker version, currently 20.10.21:
https://github.com/moby/moby/blob/v20.10.21/vendor.conf

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.

v1.14.0 update third party packages
6 participants