From 9d7c57ff2e22094807ca00a637eb4fb5d7775c9a Mon Sep 17 00:00:00 2001 From: bprashanth Date: Mon, 24 Oct 2016 14:59:36 -0700 Subject: [PATCH] Pass --experimental-runtime-integration-type in local-up-cluster --- hack/local-up-cluster.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index c005a19e803..6d71f15328e 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -23,7 +23,9 @@ DOCKERIZE_KUBELET=${DOCKERIZE_KUBELET:-""} ALLOW_PRIVILEGED=${ALLOW_PRIVILEGED:-""} ALLOW_SECURITY_CONTEXT=${ALLOW_SECURITY_CONTEXT:-""} RUNTIME_CONFIG=${RUNTIME_CONFIG:-""} +# Name of the network plugin, eg: "kubenet" NET_PLUGIN=${NET_PLUGIN:-""} +# Place the binaries required by NET_PLUGIN in this directory, eg: "/home/kubernetes/bin". NET_PLUGIN_DIR=${NET_PLUGIN_DIR:-""} KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-10.0.0.0/24} @@ -161,6 +163,8 @@ CLAIM_BINDER_SYNC_PERIOD=${CLAIM_BINDER_SYNC_PERIOD:-"15s"} # current k8s defaul ENABLE_CONTROLLER_ATTACH_DETACH=${ENABLE_CONTROLLER_ATTACH_DETACH:-"true"} # current default CERT_DIR=${CERT_DIR:-"/var/run/kubernetes"} ROOT_CA_FILE=$CERT_DIR/apiserver.crt +# How the kubelet interacts with the runtime, eg: "cri" +EXPERIMENTAL_RUNTIME_INTEGRATION_TYPE=${EXPERIMENTAL_RUNTIME_INTEGRATION_TYPE:-""} function test_apiserver_off { @@ -465,6 +469,7 @@ function start_kubelet { --v=${LOG_LEVEL} \ --chaos-chance="${CHAOS_CHANCE}" \ --container-runtime="${CONTAINER_RUNTIME}" \ + --experimental-runtime-integration-type="${EXPERIMENTAL_RUNTIME_INTEGRATION_TYPE}" \ --rkt-path="${RKT_PATH}" \ --rkt-stage1-image="${RKT_STAGE1_IMAGE}" \ --hostname-override="${HOSTNAME_OVERRIDE}" \