Commits on Sep 10, 2021

1. [release/0.8] Revert containerd dep to 1.4.9 …

   Due to some unfortunate deps in the root go.mod in containerd + some k8s staging
   directory behavior, containerd 1.5 errors out when trying to get vendored into
   kubernetes/kubernetes. Because we depend on ctrd 1.5, if hcsshim tries to
   get bumped it will ask that we also bump their dep of containerd to 1.5
   and things will fail also. This reverts our containerd dep for the release/0.8
   branch to 1.4 so we're able to circumvent this, at least temporarily.
   
   Issue tracking this problem that contains k8s proposed solution and statements on
   this: kubernetes/kubernetes#104827
   
   "Components that have a transitive dependency to anything in k8s.io/kubernetes,
   including the staging components, can not be added as a dependency. The
   detection and prevention of this in the dependency management scripts is
   intentional."
   
   While this work is temporary just to get k8s a new hcsshim release, longer
   term we will need to find a way to trim our containerd dep either here, or
   containerd will need to get rid of it's k8s.io/* dependencies in their root go.mod
   to remove this circular import issue.
   
   The tests ran to make sure nothing broke with this
   ---------------------------------------------------------------------
   -All of the tests that currently get ran on a K8s pull request which includes
   the AKS engine e2e containerd test suite.
   -Containerd integration tests
   -Our cri-containerd tests with a shim built from this commit
   
   Signed-off-by: Daniel Canter <dcanter@microsoft.com>

   

   dcantah committed Sep 10, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for 1d6647b
   • Browse repository at this point

   Copy the full SHA

   1d6647b View commit details

   Browse the repository at this point in the history