From 29630de13b1b6d6b56105ff628465097825eb66c Mon Sep 17 00:00:00 2001 From: Ivan Shvedunov Date: Fri, 20 Jul 2018 02:53:44 +0300 Subject: [PATCH] [tmp] switch to k8s 1.11 --- build/cmd.sh | 2 +- deploy/demo.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/cmd.sh b/build/cmd.sh index 4ff44f40e..9fcf24e75 100755 --- a/build/cmd.sh +++ b/build/cmd.sh @@ -328,7 +328,7 @@ function start_virtlet { opts+=(--compat) fi docker exec virtlet-build "${remote_project_dir}/_output/virtletctl" gen "${opts[@]}" | - kubectl apply -f - + kubectl apply --validate=false -f - } function virtlet_subdir { diff --git a/deploy/demo.sh b/deploy/demo.sh index 58d652532..6eddc19bf 100755 --- a/deploy/demo.sh +++ b/deploy/demo.sh @@ -5,11 +5,11 @@ set -o nounset set -o pipefail set -o errtrace -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:-CRIPROXY_DEB_URL=https://429-109821784-gh.circle-artifacts.com/0/criproxy/criproxy-nodeps_0.11.1-1_amd64.deb}" NONINTERACTIVE="${NONINTERACTIVE:-}" NO_VM_CONSOLE="${NO_VM_CONSOLE:-}" INJECT_LOCAL_IMAGE="${INJECT_LOCAL_IMAGE:-}" -dind_script="dind-cluster-v1.10.sh" +dind_script="dind-cluster-v1.11.sh" kubectl="${HOME}/.kubeadm-dind-cluster/kubectl" BASE_LOCATION="${BASE_LOCATION:-https://raw.githubusercontent.com/Mirantis/virtlet/master/}" RELEASE_LOCATION="${RELEASE_LOCATION:-https://github.com/Mirantis/virtlet/releases/download/}" @@ -130,7 +130,7 @@ function demo::start-dind-cluster { if [[ ! ${NONINTERACTIVE} ]]; then echo "Cirros ssh connection will be open after Virtlet setup is complete, press Ctrl-D to disconnect." >&2 fi - echo "To clean up the cluster, use './dind-cluster-v1.9.sh clean'" >&2 + echo "To clean up the cluster, use './dind-cluster-v1.11.sh clean'" >&2 demo::ask-before-continuing "./${dind_script}" clean "./${dind_script}" up @@ -362,7 +362,7 @@ function demo::start-virtlet { demo::step "Deploying Virtlet DaemonSet with docker tag ${virtlet_docker_tag}" docker run --rm "mirantis/virtlet:${virtlet_docker_tag}" virtletctl gen --tag "${virtlet_docker_tag}" | - "${kubectl}" apply -f - + "${kubectl}" apply --validate=false -f - demo::wait-for "Virtlet DaemonSet" demo::pods-ready runtime=virtlet } @@ -390,7 +390,7 @@ can be used to disconnect from it. Use 'curl http://nginx.default.svc.cluster.local' from VM console to test cluster networking. -To clean up the cluster, use './dind-cluster-v1.9.sh clean' +To clean up the cluster, use './dind-cluster-v1.11.sh clean' [1] https://github.com/Mirantis/virtlet [2] https://github.com/kubernetes-sigs/kubeadm-dind-cluster EOF