diff --git a/cluster/common.sh b/cluster/common.sh index 350e7e6025d..6fd3d4b661e 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -627,9 +627,6 @@ NETWORK_POLICY_PROVIDER: $(yaml-quote ${NETWORK_POLICY_PROVIDER:-}) PREPULL_E2E_IMAGES: $(yaml-quote ${PREPULL_E2E_IMAGES:-}) HAIRPIN_MODE: $(yaml-quote ${HAIRPIN_MODE:-}) SOFTLOCKUP_PANIC: $(yaml-quote ${SOFTLOCKUP_PANIC:-}) -OPENCONTRAIL_TAG: $(yaml-quote ${OPENCONTRAIL_TAG:-}) -OPENCONTRAIL_KUBERNETES_TAG: $(yaml-quote ${OPENCONTRAIL_KUBERNETES_TAG:-}) -OPENCONTRAIL_PUBLIC_SUBNET: $(yaml-quote ${OPENCONTRAIL_PUBLIC_SUBNET:-}) E2E_STORAGE_TEST_ENVIRONMENT: $(yaml-quote ${E2E_STORAGE_TEST_ENVIRONMENT:-}) KUBE_IMAGE_TAG: $(yaml-quote ${KUBE_IMAGE_TAG:-}) KUBE_DOCKER_REGISTRY: $(yaml-quote ${KUBE_DOCKER_REGISTRY:-}) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index f569d4863aa..12ffd3c60c3 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -314,10 +314,7 @@ KUBE_UP_AUTOMATIC_CLEANUP=${KUBE_UP_AUTOMATIC_CLEANUP:-false} STORAGE_BACKEND=${STORAGE_BACKEND:-} # Networking plugin specific settings. -NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # none, opencontrail, kubenet -OPENCONTRAIL_TAG="${OPENCONTRAIL_TAG:-R2.20}" -OPENCONTRAIL_KUBERNETES_TAG="${OPENCONTRAIL_KUBERNETES_TAG:-master}" -OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}" +NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # none, kubenet # Network Policy plugin specific settings. NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index af04e73a6c2..1dae93eadd6 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -346,11 +346,7 @@ STORAGE_BACKEND=${STORAGE_BACKEND:-} # Storage media type: application/json and application/vnd.kubernetes.protobuf are supported. STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-} -# OpenContrail networking plugin specific settings -NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # none, opencontrail, kubenet -OPENCONTRAIL_TAG="${OPENCONTRAIL_TAG:-R2.20}" -OPENCONTRAIL_KUBERNETES_TAG="${OPENCONTRAIL_KUBERNETES_TAG:-master}" -OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}" +NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # none, kubenet # Network Policy plugin specific settings. NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico