k8s CRI Support added to bucketbench #31

kunalkushwaha · 2017-10-27T04:38:34Z

This PR is for adding support of CRI interface of k8s to bucketbench.

There are few not-so-clear approach in this PR and would like to have review for that too.
- Binary field of DriverConfig is used for passing the GRPC socket.
- Pod is created in Create() method rather than Run()

//cc @estesp @runcom @Random-Liu

PS: Sorry for this creating this big PR, didn't found any other way to break into smaller one.

runcom · 2017-10-29T16:39:23Z

Looks fine overall, ping @estesp

AkihiroSuda · 2017-10-29T16:48:58Z

contrib/container_config.json

@@ -0,0 +1,54 @@
+{
+	"metadata": {
+		"name": "powertest",


s/powertest/bucketbench/ ?

estesp · 2017-10-30T03:57:27Z

Thanks @kunalkushwaha ; will do a complete review over the next day or so. Looks good in general and will answer specific approach questions in review.

estesp

All comments are fairly minor. Thanks, it looks good overall @kunalkushwaha!

I'm thinking maybe binary entry in YAML should change to clientpath? That way overloading it for binary paths and UNIX socket paths doesn't seem to crazy as both fit the description of "client path", whether a direct binary for drivers that use it, or socket path for gRPC-based drivers. What do you think?

estesp · 2017-10-31T17:21:22Z

contrib/sandbox_config.json

+		"security.alpha.kubernetes.io/seccomp/pod": "unconfined"
+	},
+	"linux": {
+		"cgroup_parent": "/Burstable/pod_123-456",


is this /Burstable/pod_123-456 useful/necessary, or just copied from somewhere else? Maybe it doesn't matter, but would be nice for this to be as "default"/vanilla as can be.

I copied it from CRI-O 's contrib files. Will try to make it more generic.

estesp · 2017-10-31T17:21:22Z

driver/containerd.go

@@ -101,6 +101,11 @@ func (c *ContainerdContainer) Detached() bool {
 	return true
 }

+//GetPodID return pod-id assosicated with container.


typo: s/assosicated/associated/

Maybe for all the drivers which will not implement GetPodID add a second sentence to the comment "only used by CRI-based drivers"

estesp · 2017-10-31T17:21:22Z

driver/containerd_ctr.go

@@ -90,6 +90,11 @@ func (c *CtrContainer) Detached() bool {
 	return true
 }

+//GetPodID return pod-id assosicated with container.


same typo as the containerd driver :) Also, same comment about noting this is stubbed out only for use with CRI drivers

estesp · 2017-10-31T17:21:22Z

driver/cri.go

+)
+
+const (
+	defaultPodImage        = "docker.io/ibmcom/pause:3.0"


Update to the gcr.io pause image reference per @runcom's comment?

estesp · 2017-10-31T17:21:22Z

driver/cri.go

+const (
+	defaultPodImage        = "docker.io/ibmcom/pause:3.0"
+	defaultPodNamePrefix   = "pod"
+	defaultSanboxConfig    = "contrib/sandbox_config.json"


typo: s/defaultSanboxConfig/defaultSandboxConfig

estesp · 2017-10-31T17:21:22Z

driver/cri.go

+	runtimeClient := pb.NewRuntimeServiceClient(conn)
+	imageClient := pb.NewImageServiceClient(conn)
+
+	pconfig, err := loadPodSandboxConfig(defaultSanboxConfig)


s/defaultSanboxConfig/defaultSandboxConfig

estesp · 2017-10-31T17:21:22Z

driver/docker.go

@@ -82,6 +82,11 @@ func (c *DockerContainer) Command() string {
 	return c.cmdOverride
 }

+//GetPodID return pod-id assosicated with container.


same typo as other drivers; and same comment about unused outside of CRI implementation

estesp · 2017-10-31T17:21:22Z

driver/driver.go

@@ -19,6 +19,8 @@ const (
 	// Null driver represents an empty driver for use by benchmarks that
 	// require no driver
 	Null
+	//CRI driver represents k8s Container Runtime Interface
+	CRI


can you add this above Null so that Null is the last driver in the list? Not a big deal, but.. :)

estesp · 2017-10-31T17:21:22Z

driver/driver.go

@@ -95,6 +100,8 @@ func New(dtype Type, path string) (Driver, error) {
 		return NewCtrDriver(path)
 	case Null:
 		return nil, nil
+	case CRI:


same comment as above re: Null being the last entry

estesp · 2017-10-31T17:21:22Z

driver/runc.go

@@ -91,6 +91,11 @@ func (c *RuncContainer) State() string {
 	return c.state
 }

+//GetPodID return pod-id assosicated with container.


same as other drivers: typo and comment about unused :)

- Support for CRI driver type added to helper functions of Driver Interface Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>

- config file added for CRI - Examples yaml file added for CRI Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>

kunalkushwaha · 2017-11-06T05:24:35Z

clientpath will be perfect :).

Have incorporated all suggestion with this update. Please check once more.

estesp · 2017-11-06T20:18:20Z

LGTM

Merging as the tip gofmt is not a requirement; going to switch travis to only test 1.9.x with a separate PR

AkihiroSuda reviewed Oct 29, 2017

View changes

contrib/container_config.json Outdated

@@ -0,0 +1,54 @@

{

"metadata": {

"name": "powertest",

This comment has been minimized.

Sign in to view

AkihiroSuda Oct 29, 2017

s/powertest/bucketbench/ ?

estesp requested changes Oct 31, 2017

View changes

kunalkushwaha added 3 commits Oct 27, 2017

- GetPodID method added to Container Interface.

9b5d360

- Support for CRI driver type added to helper functions of Driver Interface Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>

- k8s CRI driver added.

909d318

- config file added for CRI - Examples yaml file added for CRI Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>

Vendor package updated for CRI and containerd latest GC support

Loading status checks…

fb63573

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>

kunalkushwaha force-pushed the kunalkushwaha:cri branch from 760c22a to fb63573 Nov 6, 2017

estesp approved these changes Nov 6, 2017

View changes

estesp merged commit 24ab741 into estesp:master Nov 6, 2017
1 check failed

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

estesp / bucketbench

k8s CRI Support added to bucketbench #31

k8s CRI Support added to bucketbench #31

kunalkushwaha commented Oct 27, 2017

runcom commented Oct 29, 2017

This comment has been minimized.

estesp commented Oct 30, 2017

estesp left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

kunalkushwaha commented Nov 6, 2017

estesp commented Nov 6, 2017

estesp / bucketbench

k8s CRI Support added to bucketbench #31

k8s CRI Support added to bucketbench #31

Conversation

kunalkushwaha commented Oct 27, 2017

runcom commented Oct 29, 2017

This comment has been minimized.

AkihiroSuda Oct 29, 2017

estesp commented Oct 30, 2017

estesp left a comment

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

kunalkushwaha Nov 6, 2017 Author Contributor

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

This comment has been minimized.

estesp Oct 31, 2017 Owner

kunalkushwaha commented Nov 6, 2017

estesp commented Nov 6, 2017

estesp Oct 31, 2017
Owner

kunalkushwaha Nov 6, 2017
Author Contributor

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner

estesp Oct 31, 2017
Owner