Merge pull request #816 from Mirantis/ivan4th/k8s-1.12

Add support for k8s 1.12

.circleci/config.yml

@@ -165,10 +165,8 @@ e2e: &e2e
         elif [[ ${CIRCLE_JOB} = e2e_multi_cni ]]; then
           export MULTI_CNI=1
           echo >&2 "*** Using multiple CNIs (flannel + calico)"
-        elif [[ ${CIRCLE_JOB} = e2e_1_9 ]]; then
-          export KUBE_VERSION=1.9
-        elif [[ ${CIRCLE_JOB} = e2e_1_10 ]]; then
-          export KUBE_VERSION=1.10
+        elif [[ ${CIRCLE_JOB} = e2e_1_11 ]]; then
+          export KUBE_VERSION=1.11
         fi
         # APISERVER_PORT is set explicitly to avoid dynamic allocation
         # of the port by kdc
@@ -387,10 +385,7 @@ jobs:
   e2e_multi_cni:
     <<: *e2e
 
-  # e2e_1_9:
-  #   <<: *e2e
-
-  e2e_1_10:
+  e2e_1_11:
     <<: *e2e
 
   push_branch:
@@ -493,14 +488,7 @@ workflows:
           tags:
             only:
               - /^v[0-9].*/
-    # - e2e_1_9:
-    #     requires:
-    #     - build
-    #     filters:
-    #       tags:
-    #         only:
-    #           - /^v[0-9].*/
-    - e2e_1_10:
+    - e2e_1_11:
         requires:
         - build
         filters:
@@ -522,8 +510,7 @@ workflows:
         - e2e_flannel
         - e2e_weave
         - e2e_multi_cni
-        # - e2e_1_9
-        - e2e_1_10
+        - e2e_1_11
         - integration
         filters:
           branches:

README.md

@@ -69,7 +69,7 @@ The demo script will check for KVM support on the host and will make Virtlet use
 
 The demo is based on [kubeadm-dind-cluster](https://github.com/kubernetes-sigs/kubeadm-dind-cluster) project. **Docker btrfs storage driver is currently unsupported.** Please refer to `kubeadm-dind-cluster` documentation for more info.
 
-You can remove the test cluster with `./dind-cluster-v1.11.sh clean` when you no longer need it.
+You can remove the test cluster with `./dind-cluster-v1.12.sh clean` when you no longer need it.
 
 ## External projects using Virtlet
 There are some external projects using Virtlet already.

build/cmd.sh

@@ -4,7 +4,7 @@ set -o nounset
 set -o pipefail
 set -o errtrace
 
-CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://github.com/Mirantis/criproxy/releases/download/v0.12.0/criproxy-nodeps_0.12.0_amd64.deb}"
+CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://github.com/Mirantis/criproxy/releases/download/v0.14.0/criproxy-nodeps_0.14.0_amd64.deb}"
 VIRTLET_IMAGE="${VIRTLET_IMAGE:-mirantis/virtlet}"
 VIRTLET_SKIP_RSYNC="${VIRTLET_SKIP_RSYNC:-}"
 VIRTLET_RSYNC_PORT="${VIRTLET_RSYNC_PORT:-18730}"

deploy/README.md

@@ -33,7 +33,7 @@ The steps described here are performed automatically by
    ```
 1. Install CRI proxy on the node:
    ```bash
-   CRIPROXY_DEB_URL="https://github.com/Mirantis/criproxy/releases/download/v0.11.1/criproxy-nodeps_0.11.1_amd64.deb"
+   CRIPROXY_DEB_URL="https://github.com/Mirantis/criproxy/releases/download/v0.14.0/criproxy-nodeps_0.14.0_amd64.deb"
    docker exec kube-node-1 /bin/bash -c "curl -sSL '${CRIPROXY_DEB_URL}' >/criproxy.deb && dpkg -i /criproxy.deb && rm /criproxy.deb"
    ```
 1. Download `virtletctl` binary for `virtlet` release you need (replace `N.N.N` in the command below accordingly):

deploy/demo.sh

@@ -5,8 +5,8 @@ set -o nounset
 set -o pipefail
 set -o errtrace
 
-KUBE_VERSION="${KUBE_VERSION:-1.11}"
-CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://github.com/Mirantis/criproxy/releases/download/v0.13.0/criproxy-nodeps_0.13.0_amd64.deb}"
+KUBE_VERSION="${KUBE_VERSION:-1.12}"
+CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://github.com/Mirantis/criproxy/releases/download/v0.14.0/criproxy-nodeps_0.14.0_amd64.deb}"
 NONINTERACTIVE="${NONINTERACTIVE:-}"
 NO_VM_CONSOLE="${NO_VM_CONSOLE:-}"
 INJECT_LOCAL_IMAGE="${INJECT_LOCAL_IMAGE:-}"

docs/design-proposals/pv.md

@@ -374,7 +374,7 @@ docker exec kube-node-1 /bin/bash -c 'sed -i "s/MountPropagation/BlockVolume/" /
 
 Install CRI Proxy so we can grab the logs:
 ```bash
-CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://github.com/Mirantis/criproxy/releases/download/v0.11.1/criproxy-nodeps_0.11.1_amd64.deb}"
+CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://github.com/Mirantis/criproxy/releases/download/v0.14.0/criproxy-nodeps_0.14.0_amd64.deb}"
 docker exec kube-node-1 /bin/bash -c "curl -sSL '${CRIPROXY_DEB_URL}' >/criproxy.deb && dpkg -i /criproxy.deb && rm /criproxy.deb"
 ```
 

examples/README.md

@@ -87,7 +87,7 @@ for testing, you can use this command to start the cluster with
 FEATURE_GATES="BlockVolume=true" \
     KUBELET_FEATURE_GATES="BlockVolume=true" \
     ENABLE_CEPH=1 \
-    ./dind-cluster-v1.11.sh up
+    ./dind-cluster-v1.12.sh up
 ```
 
 [ubuntu-vm-local-block-pv.yaml](ubuntu-vm-local-block-pv.yaml)