Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Support shared pid #603

Merged
merged 4 commits into from
Feb 8, 2018
Merged

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Feb 8, 2018

Fixes #597.

All cri-containerd e2e/node-e2e tests are failing because of the breaking CRI change.

Let's get this in sooner.

/cc @yujuhong @mikebrow @verb

g.RemoveLinuxNamespace(string(runtimespec.PIDNamespace)) // nolint: errcheck
// Do not share pid namespace if namespace mode is CONTAINER.
if namespaces.GetPid() != runtime.NamespaceMode_CONTAINER {
g.AddOrReplaceLinuxNamespace(string(runtimespec.PIDNamespace), getPIDNamespace(sandboxPid)) // nolint: errcheck
Copy link
Member

Choose a reason for hiding this comment

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

What happened to the host pid mode?

Copy link
Member Author

Choose a reason for hiding this comment

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

Also share with sandbox.

Copy link
Member

Choose a reason for hiding this comment

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

I see. Ack.

HostNetwork: true,
HostPid: false,
HostIpc: true,
Network: runtime.NamespaceMode_POD,
Copy link
Member

Choose a reason for hiding this comment

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

Why changing the host network setting in the test?

Copy link
Member Author

@Random-Liu Random-Liu Feb 8, 2018

Choose a reason for hiding this comment

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

The test is to test the convert function toCRISandboxStatus. It's just simply conversion. I just want to make sure all modes are covered. :)

I can keep network NODE.

Copy link
Member

Choose a reason for hiding this comment

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

Ack.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@yujuhong
Copy link
Member

yujuhong commented Feb 8, 2018

/lgtm

@Random-Liu
Copy link
Member Author

@yujuhong Thanks for reviewing! Will merge after test passes to unblock the presubmit test.

Currently all e2e/node e2e tests are failing.

@Random-Liu
Copy link
Member Author

This depends on kubernetes-sigs/cri-tools#238.

@Random-Liu Random-Liu mentioned this pull request Feb 8, 2018
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

/LGTM

Cool and a new api to implement (log rotation).

@@ -7,7 +7,7 @@
[![Build Status](https://api.travis-ci.org/containerd/cri-containerd.svg?style=flat-square)](https://travis-ci.org/containerd/cri-containerd)
[![Go Report Card](https://goreportcard.com/badge/github.com/containerd/cri-containerd?style=flat-square)](https://goreportcard.com/report/github.com/containerd/cri-containerd)

`cri-containerd` is a [containerd](https://containerd.io/) based implementation of Kubernetes [container runtime interface (CRI)](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto).
`cri-containerd` is a [containerd](https://containerd.io/) based implementation of Kubernetes [container runtime interface (CRI)](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto).
Copy link
Member

Choose a reason for hiding this comment

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

Ok.. I realize you have no choice here.. but what was the point of them moving the version to the suffix of runtime instead of the prefix. It just feels wrong.

@Random-Liu Random-Liu merged commit 5e7347d into containerd:master Feb 8, 2018
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.

4 participants