chore: ensure containerd has image cache on VHDs #4249
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jackfrancis The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
jackfrancis
force-pushed
the
vhd-containerd
branch
2 times, most recently
from
f97eee9
to
d663bd9
Compare
Codecov Report
@@ Coverage Diff @@
## master #4249 +/- ##
=======================================
Coverage 72.07% 72.07%
=======================================
Files 141 141
Lines 21686 21686
=======================================
Hits 15630 15630
Misses 5106 5106
Partials 950 950
Continue to review full report at Codecov.
|
jackfrancis
force-pushed
the
vhd-containerd
branch
from
dc081ad
to
a90360b
Compare
| removeContainerd | ||
| retrycmd_no_stats 120 5 25 curl ${MS_APT_REPO}/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25 |
There was a problem hiding this comment.
moved this duplicated collection of statements (both installMoby and installContainerd have it) into installDeps; in other words, all suppported configurations are going to need these apt config updates, so we should do them in that common place
| local v | ||
| v=$(containerd -version | cut -d " " -f 3 | sed 's|v||') | ||
| if [[ $v != "${CONTAINERD_VERSION}" ]]; then | ||
| if [[ $v != "${CONTAINERD_VERSION}"* ]]; then |
There was a problem hiding this comment.
we need this glob expansion because the versions we get from azure now include a -azure suffix
| @@ -676,14 +672,18 @@ installSGXDrivers() { | |||
| {{end}} | |||
| {{- if HasVHDDistroNodes}} | |||
| cleanUpContainerImages() { | |||
| {{- if NeedsContainerd}} | |||
| docker rmi -f $(docker images -a -q) & | |||
There was a problem hiding this comment.
we remove all docker cache images if we're in a containerd context
| docker rmi registry:2.7.1 & | ||
| ctr -n=k8s.io image rm $(ctr -n=k8s.io images ls -q) & |
There was a problem hiding this comment.
we remove all containerd cache images if we're in a docker context
jackfrancis
force-pushed
the
vhd-containerd
branch
from
f28f92c
to
2c63812
Compare
jackfrancis
force-pushed
the
vhd-containerd
branch
from
2c63812
to
c0ddd04
Compare
Reason for Change:
This PR changes the way we pre-pull container images during VHD CI so that both docker (moby) and containerd runtime configurations can use them.
Issue Fixed:
Credit Where Due:
Does this change contain code from or inspired by another project?
If "Yes," did you notify that project's maintainers and provide attribution?
Requirements:
Notes: