diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 087e4aad31b72..9ac48a7cfd7b5 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -153,8 +153,6 @@ 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}" diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index a288a9d90097c..c44163e58ec74 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -139,12 +139,5 @@ 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}