Update CNI plugin to newest version; support ConfigLists #42202

squeed · 2017-02-28T00:07:06Z

What this PR does / why we need it: Updates the CNI network plugin to use the newest version of CNI. This brings with it plugin chaining and support for multiple versions.

Special notes for your reviewer: This libcni change is backwards-compatible - older plugins will work without any changes needed.

Release note:

This adds support for CNI ConfigLists, which permit plugin chaining.

k8s-ci-robot · 2017-02-28T00:07:07Z

Hi @squeed. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

squeed · 2017-02-28T00:07:13Z

@freehan

feiskyer · 2017-02-28T15:05:37Z

@squeed Cool. When will CNI v0.5.0 be released?

squeed · 2017-02-28T16:03:38Z

We were hoping to cut a -rc release today or tomorrow, and a full release a few days after that.

k8s-reviewable · 2017-03-01T23:46:05Z

This change is

freehan

Look good overall. Waiting for CNI release. Will take a final look later

freehan · 2017-03-02T18:17:45Z

pkg/kubelet/network/kubenet/kubenet_linux.go

 	if err != nil {
 		return err
 	}
+	// Coerce the CNI result version
+	res, err := cnitypes020.GetResult(resT)


I assume this is backward compatible, right?

Correct - this converts the result in to the 0.2.0 format, which is what kubenet already expects.

freehan · 2017-03-02T18:19:59Z

pkg/kubelet/network/cni/cni.go

+			"host_ip":        p.HostIP,
+		})
+	}
+	// TODO(cdc) CNI #373 needs to be merged first


I assume there will be follow up on this

Yup :-). It was merged a few hours ago.

freehan · 2017-03-02T18:23:14Z

pkg/kubelet/network/cni/cni.go

+				glog.Warningf("Error converting CNI config file %s to list: %v", confFile, err)
+				continue
+			}
+


nit: remove this empty line

freehan · 2017-03-02T18:24:13Z

pkg/kubelet/network/cni/cni.go

+				continue
+			}
+		} else {
+


nit: remove this empty line

freehan · 2017-03-02T18:28:04Z

@k8s-bot ok to test

freehan · 2017-03-02T18:30:11Z

Need to run hack/update-bazel.sh

squeed · 2017-03-02T18:32:54Z

0.5.0-rc1 was just released. Going to update the PR with that.

squeed · 2017-03-06T16:20:18Z

Ok, all checks are passing. All that's left now is to wait for 0.5.0 to be released - should be sometime this week.

squeed · 2017-03-09T14:19:48Z

CNI v0.5.0 has been updated. This can be considered for merge.

k8s-ci-robot · 2017-03-09T14:21:48Z

@squeed: The following test(s) failed:

Test name	Commit	Details	Rerun command
Jenkins GCI GKE smoke e2e	23ed9422f31a649fe9b8d3bbbfa69c5410b21d8d	link	`@k8s-bot gci gke e2e test this`
Jenkins GKE smoke e2e	23ed9422f31a649fe9b8d3bbbfa69c5410b21d8d	link	`@k8s-bot cvm gke e2e test this`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

squeed · 2017-04-12T11:15:41Z

@freehan updated & rebased, thanks

freehan · 2017-04-12T17:16:42Z

/lgtm
/approve

Thanks!

freehan · 2017-04-12T17:19:15Z

Could you approve this? It needs owners at root. @thockin

…rameters ** reason for this change ** CNI has recently introduced a new configuration list feature. This allows for plugin chaining. It also supports varied plugin versions.

squeed · 2017-04-18T13:31:53Z

Had to rebase. @freehan @thockin is there any chance of getting this reviewed and merged quickly?

feiskyer · 2017-04-18T14:56:30Z

pkg/kubelet/network/cni/cni.go

 		// Search for vendor-specific plugins as well as default plugins in the CNI codebase.
-		vendorDir := vendorCNIDir(vendorCNIDirPrefix, conf.Network.Type)
+		vendorDir := vendorCNIDir(vendorCNIDirPrefix, confType)


Should we search vendor CNI dir for all plugin types, e.g. networks may have different type in confList.Plugins

Maybe, but that is changing behavior. The aim of this PR is only to enable config lists.

There is a lot of cleaning up that can be done with how k8s uses CNI but this PR is not the place for it, IMHO. Just trying to get the version bump out now.

freehan · 2017-04-20T20:37:00Z

/lgtm

freehan · 2017-04-20T20:37:32Z

@thockin for approve

freehan · 2017-04-20T20:37:47Z

fyi @dnardo

squeed · 2017-04-21T09:21:33Z

Fingers crossed that this wins the rebase race.

dcbw · 2017-04-21T17:20:33Z

/lgtm

thockin · 2017-04-21T17:29:35Z

/approve

k8s-github-robot · 2017-04-21T17:29:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: freehan, squeed, thockin

Needs approval from an approver in each of these OWNERS Files:

~~OWNERS~~ [thockin]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

k8s-github-robot · 2017-04-21T18:52:01Z

Automatic merge from submit-queue (batch tested with PRs 42202, 40784, 44642, 44623, 44761)

redbaron · 2017-04-21T21:27:34Z

are there any plans to have it in 1.6 branch?

bboreham · 2017-11-15T10:33:21Z

Can I request that the top description of this PR be extended to mention the portmap capability that it adds?

Really I would like it in the 1.7.0 release notes too, but I'm not sure if those can be changed retrospectively.

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 28, 2017

k8s-github-robot assigned jbeda Feb 28, 2017

k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Feb 28, 2017

freehan assigned freehan and unassigned jbeda Feb 28, 2017

squeed mentioned this pull request Feb 28, 2017

Update cni in vendor and refactor cniNetworkPlugin for hypervisor runtime #41745

Closed

freehan reviewed Mar 2, 2017

View reviewed changes

squeed force-pushed the update-cni branch 5 times, most recently from c471c5e to 23ed942 Compare March 3, 2017 13:49

k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 4, 2017

squeed force-pushed the update-cni branch from 23ed942 to 798c179 Compare March 6, 2017 10:51

k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 6, 2017

squeed force-pushed the update-cni branch 2 times, most recently from c373e33 to 3003bc6 Compare March 6, 2017 15:03

squeed force-pushed the update-cni branch from 3003bc6 to 9fc0e65 Compare March 9, 2017 13:57

squeed force-pushed the update-cni branch from c3bc3f8 to 6465791 Compare April 12, 2017 11:15

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 12, 2017

Casey Callendrello added 2 commits April 18, 2017 14:04

deps: update containernetworking/cni to v0.5.2

8963dd1

kubelet/networking: add support for cni ConfigLists, pass hostport pa…

e4eaad3

…rameters ** reason for this change ** CNI has recently introduced a new configuration list feature. This allows for plugin chaining. It also supports varied plugin versions.

squeed force-pushed the update-cni branch from 6465791 to e4eaad3 Compare April 18, 2017 12:24

k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2017

feiskyer reviewed Apr 18, 2017

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2017

k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2017

k8s-github-robot merged commit 0acb721 into kubernetes:master Apr 21, 2017

This was referenced Apr 24, 2017

Support port mapping kubernetes-retired/frakti#122

Closed

upgrade cni in vendor to support pass interface info back to runtime #41552

Closed

chrislovecnm mentioned this pull request Jun 12, 2017

Kubernetes 1.7 support in kops kubernetes/kops#2715

Closed

bboreham mentioned this pull request Sep 20, 2017

Move HostPort port-opening from kubenet to kubelet/cni #31307

Closed

hswong3i mentioned this pull request Feb 18, 2018

Registry Addon Fixup kubernetes-sigs/kubespray#2332

Merged

squeed mentioned this pull request Feb 13, 2019

REQUEST: New membership for squeed kubernetes/org#479

Closed

6 tasks

Update CNI plugin to newest version; support ConfigLists #42202

Update CNI plugin to newest version; support ConfigLists #42202

Conversation

squeed commented Feb 28, 2017 • edited Loading

k8s-ci-robot commented Feb 28, 2017

squeed commented Feb 28, 2017

feiskyer commented Feb 28, 2017

squeed commented Feb 28, 2017

k8s-reviewable commented Mar 1, 2017

freehan left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

freehan commented Mar 2, 2017

freehan commented Mar 2, 2017

squeed commented Mar 2, 2017

squeed commented Mar 6, 2017

squeed commented Mar 9, 2017

k8s-ci-robot commented Mar 9, 2017 • edited Loading

squeed commented Apr 12, 2017

freehan commented Apr 12, 2017

freehan commented Apr 12, 2017

squeed commented Apr 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

freehan commented Apr 20, 2017

freehan commented Apr 20, 2017

freehan commented Apr 20, 2017

squeed commented Apr 21, 2017

dcbw commented Apr 21, 2017 • edited Loading

thockin commented Apr 21, 2017

k8s-github-robot commented Apr 21, 2017

k8s-github-robot commented Apr 21, 2017

redbaron commented Apr 21, 2017

bboreham commented Nov 15, 2017

squeed commented Feb 28, 2017 •

edited

Loading

freehan left a comment •

edited

Loading

k8s-ci-robot commented Mar 9, 2017 •

edited

Loading

dcbw commented Apr 21, 2017 •

edited

Loading