From 11c8830deceb0fe2740e1a19cc169e9e209bbfbe Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 7 Sep 2016 15:41:38 -0700 Subject: [PATCH] AWS: Docker is flapping because of cbr0 bringup, flip to kubenet This is a mitigation. There's a kubelet bug that prevents NETWORK_PROVIDER=none from working right now. --- cluster/aws/config-default.sh | 3 ++- cluster/aws/config-test.sh | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 3b24158a4c8..087e4aad31b 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -153,8 +153,9 @@ COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" RKT_VERSION="${KUBE_RKT_VERSION:-1.14.0}" +NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # kubenet, opencontrail, flannel + # OpenContrail networking plugin specific settings -NETWORK_PROVIDER="${NETWORK_PROVIDER:-none}" # opencontrail OPENCONTRAIL_TAG="${OPENCONTRAIL_TAG:-R2.20}" OPENCONTRAIL_KUBERNETES_TAG="${OPENCONTRAIL_KUBERNETES_TAG:-master}" OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index c44163e58ec..a288a9d9009 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -139,5 +139,12 @@ COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" RKT_VERSION="${KUBE_RKT_VERSION:-1.14.0}" +NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # kubenet, opencontrail, flannel + +# OpenContrail networking plugin specific settings +OPENCONTRAIL_TAG="${OPENCONTRAIL_TAG:-R2.20}" +OPENCONTRAIL_KUBERNETES_TAG="${OPENCONTRAIL_KUBERNETES_TAG:-master}" +OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}" + # Optional: if set to true, kube-up will configure the cluster to run e2e tests. E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}