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
```

cluster/gce/container-linux/configure.sh

@@ -110,13 +110,13 @@ function install-kube-binary-config {
 
   if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \
      [[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then
-    #TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
-    local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
-    local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
+    local -r cni_version="v0.6.0"
+    local -r cni_tar="cni-plugins-amd64-${cni_version}.tgz"
+    local -r cni_sha1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
     download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
     local -r cni_dir="${KUBE_HOME}/cni"
-    mkdir -p "${cni_dir}"
-    tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite
+    mkdir -p "${cni_dir}/bin"
+    tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}/bin" --overwrite
     mv "${cni_dir}/bin"/* "${kube_bin}"
     rmdir "${cni_dir}/bin"
     rm -f "${KUBE_HOME}/${cni_tar}"

cluster/gce/gci/configure.sh

@@ -170,9 +170,9 @@ function install-node-problem-detector {
 }
 
 function install-cni-binaries {
-  #TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
-  local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
-  local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
+  local -r cni_version="v0.6.0"
+  local -r cni_tar="cni-plugins-amd64-${cni_version}.tgz"
+  local -r cni_sha1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
   if is-preloaded "${cni_tar}" "${cni_sha1}"; then
     echo "${cni_tar} is preloaded."
     return
@@ -181,8 +181,8 @@ function install-cni-binaries {
   echo "Downloading cni binaries"
   download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
   local -r cni_dir="${KUBE_HOME}/cni"
-  mkdir -p "${cni_dir}"
-  tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite
+  mkdir -p "${cni_dir}/bin"
+  tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}/bin" --overwrite
   mv "${cni_dir}/bin"/* "${KUBE_BIN}"
   rmdir "${cni_dir}/bin"
   rm -f "${KUBE_HOME}/${cni_tar}"

cluster/saltbase/salt/cni/init.sls

@@ -17,11 +17,11 @@ cni-tar:
   archive:
     - extracted
     - user: root
-    - name: /home/kubernetes
+    - name: /home/kubernetes/bin
     - makedirs: True
-    - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
+    - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz
     - tar_options: v
-    - source_hash: md5=afbb526e7d976f98353ac96f73043031
+    - source_hash: md5=9534876FAE7DBE813CDAB404DC1F9219
     - archive_format: tar
     - if_missing: /home/kubernetes/bin