[tmp] switch to k8s 1.11

Mirantis · Jul 31, 2018 · a24e6c2 · a24e6c2
1 parent 4b5e222
commit a24e6c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build/cmd.sh b/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.11.1/criproxy-nodeps_0.11.1_amd64.deb}"
+CRIPROXY_DEB_URL="${CRIPROXY_DEB_URL:-https://434-109821784-gh.circle-artifacts.com/0/criproxy/criproxy-nodeps_0.11.1-2_amd64.deb}"
 VIRTLET_IMAGE="${VIRTLET_IMAGE:-mirantis/virtlet}"
 VIRTLET_SKIP_RSYNC="${VIRTLET_SKIP_RSYNC:-}"
 VIRTLET_RSYNC_PORT="${VIRTLET_RSYNC_PORT:-18730}"
@@ -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
@@ -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:-https://434-109821784-gh.circle-artifacts.com/0/criproxy/criproxy-nodeps_0.11.1-2_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