github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36356 from jszczepkowski/exp-flag

Browse Source 
Automatic merge from submit-queue

Removed EXPERIMENTAL from KUBE_REPLICATE_EXISTING_MASTER flag.
This commit is contained in:
Kubernetes Submit Queue
2016-11-07 12:45:31 -08:00
committed by GitHub
parent dbc4121e16 2ae5c701bd
commit 4ef95cd720
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/util.sh
View File

@@ -614,7 +614,7 @@ function kube-up() {
if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then
parse-master-env parse-master-env
create-nodes create-nodes
elif [[ ${KUBE_EXPERIMENTAL_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then elif [[ ${KUBE_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then
if [[ "${MASTER_OS_DISTRIBUTION}" != "gci" && "${MASTER_OS_DISTRIBUTION}" != "debian" ]]; then if [[ "${MASTER_OS_DISTRIBUTION}" != "gci" && "${MASTER_OS_DISTRIBUTION}" != "debian" ]]; then
echo "Master replication supported only for gci and debian" echo "Master replication supported only for gci and debian"
return 1 return 1

2
hack/e2e-internal/e2e-add-master.sh
View File

@@ -16,7 +16,7 @@
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
export KUBE_EXPERIMENTAL_REPLICATE_EXISTING_MASTER=true export KUBE_REPLICATE_EXISTING_MASTER=true
source "${KUBE_ROOT}/hack/e2e-internal/e2e-up.sh" source "${KUBE_ROOT}/hack/e2e-internal/e2e-up.sh"