Revert "[garbage collector] add e2e test"

This commit is contained in:
Wojciech Tyczynski
2016-07-15 10:10:02 +02:00
committed by GitHub
parent 87d3c74715
commit f71244975d
10 changed files with 12 additions and 223 deletions

View File

@@ -585,7 +585,6 @@ function start-kube-apiserver {
params+=" --tls-cert-file=/etc/srv/kubernetes/server.cert"
params+=" --tls-private-key-file=/etc/srv/kubernetes/server.key"
params+=" --token-auth-file=/etc/srv/kubernetes/known_tokens.csv"
params+=" --enable-garbage-collector=${ENABLE_GARBAGE_COLLECTOR}"
if [[ -n "${SERVICE_CLUSTER_IP_RANGE:-}" ]]; then
params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"
fi
@@ -664,7 +663,6 @@ function start-kube-controller-manager {
params+=" --master=127.0.0.1:8080"
params+=" --root-ca-file=/etc/srv/kubernetes/ca.crt"
params+=" --service-account-private-key-file=/etc/srv/kubernetes/server.key"
params+=" --enable-garbage-collector=${ENABLE_GARBAGE_COLLECTOR}"
if [[ -n "${INSTANCE_PREFIX:-}" ]]; then
params+=" --cluster-name=${INSTANCE_PREFIX}"
fi

View File

@@ -59,6 +59,7 @@ function create-node-instance-template {
# It requires a whole slew of assumed variables, partially due to to
# the call to write-master-env. Listing them would be rather
# futile. Instead, we list the required calls to ensure any additional
#
# variables are set:
# ensure-temp-dir
# detect-project