Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

chore: use azure containerd packages #2649

Merged
merged 5 commits into from
Feb 20, 2020

Conversation

cpuguy83
Copy link
Member

Reason for Change:

Issue Fixed:

Fixes #2370

Requirements:

Notes:

This is a POC.
Looking for feedback on the implementation.
Also need tests to run, currently having issues deploying things.

@acs-bot acs-bot added the size/M label Jan 30, 2020
@codecov
Copy link

codecov bot commented Jan 30, 2020

Codecov Report

Merging #2649 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #2649   +/-   ##
=======================================
  Coverage   72.35%   72.35%           
=======================================
  Files         137      137           
  Lines       25341    25341           
=======================================
  Hits        18335    18335           
  Misses       5949     5949           
  Partials     1057     1057

tar -xzf "$CONTAINERD_DOWNLOADS_DIR/$CONTAINERD_TGZ_TMP" -C /
sed -i '/\[Service\]/a ExecStartPost=\/sbin\/iptables -P FORWARD ACCEPT -w' /etc/systemd/system/containerd.service
echo "Successfully installed cri-containerd..."
removeContainerd
Copy link
Member

Choose a reason for hiding this comment

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

Shall I infer that this is a "best practice, just-in-case" type operation? In other words, the most deterministic way to install a particular version of the moby-containerd is to ensure no pre-existing moby-containerd and moby-runc packages aren't present on the OS already?

Also, is moby-runc installed as a dependency of moby-containerd? Or is it just a conflicting package and so we need to ensure it's removed before we install moby-containerd?

Copy link
Member Author

Choose a reason for hiding this comment

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

I copied this pattern from installMoby is all.

moby-runc is a dependency for moby-containerd and is automatically installed with moby-containerd.

Copy link
Member

Choose a reason for hiding this comment

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

Got it.

Should we invoke removeMoby at the beginning of the containerd installation process to ensure we don't ship both packages?

Likewise we should probably invoke removeContainerd during moby installation.

@jackfrancis
Copy link
Member

@cpuguy83 Are the moby-engine and moby-cli installed packages able to co-exist with moby-containerd? If so, might we consider pre-installing moby-containerd on the VHD so we don't have to fetch all the apt artifacts during bootstrap runtime?

@cpuguy83
Copy link
Member Author

Are the moby-engine and moby-cli installed packages able to co-exist with moby-containerd

moby-cli yes, moby-engine, not yet...
moby-containerd explicitly lists moby-engine as a conflict right now.

@mboersma mboersma added the needs-rebase Changes in the target branch require a `git rebase` and `git push -f` label Feb 12, 2020
@jackfrancis jackfrancis force-pushed the azure_containerd branch 2 times, most recently from 4a69ac4 to 61a70e6 Compare February 20, 2020 18:15
@acs-bot acs-bot added size/L and removed size/M labels Feb 20, 2020
@jackfrancis jackfrancis removed the needs-rebase Changes in the target branch require a `git rebase` and `git push -f` label Feb 20, 2020
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@acs-bot
Copy link

acs-bot commented Feb 20, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpuguy83, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jackfrancis jackfrancis merged commit cbc2ca4 into Azure:master Feb 20, 2020
@cpuguy83 cpuguy83 deleted the azure_containerd branch February 20, 2020 20:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

containerd integration using deprecated "cri" binary
4 participants