Merge pull request #51250 from dixudx/bump_cni_v0.6.0

Automatic merge from submit-queue (batch tested with PRs 53106, 52193, 51250, 52449, 53861). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

bump CNI to v0.6.0

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49480

**Special notes for your reviewer**:
/assign @luxas @bboreham @feiskyer 

**Release note**:

```release-note
bump CNI to v0.6.0
```
This commit is contained in:
Kubernetes Submit Queue
2017-10-16 14:47:23 -07:00
committed by GitHub
15 changed files with 103 additions and 131 deletions

View File

@@ -27,10 +27,11 @@ import (
// utils.go contains functions used across test suites.
const (
cniRelease = "0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff"
cniDirectory = "cni" // The CNI tarball creates the "bin" directory under "cni".
cniVersion = "v0.6.0"
cniArch = "amd64"
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
cniConfDirectory = "cni/net.d"
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-" + cniRelease + ".tar.gz"
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-" + cniArch + "-" + cniVersion + ".tgz"
)
const cniConfig = `{