github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Fixed kubemark to work when ETCD_X flags are set

Browse Source
This commit is contained in:
Shyam Jeedigunta 2016-12-14 17:30:24 +01:00
parent b1acd15046
commit 10b39d9dd7
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/kubemark/start-kubemark.sh
View File

@ -25,35 +25,28 @@ source "${KUBE_ROOT}/test/kubemark/common.sh"
function writeEnvironmentFile() {
cat > "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
# Generic variables.
INSTANCE_PREFIX=${INSTANCE_PREFIX}
SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE}
INSTANCE_PREFIX="${INSTANCE_PREFIX:-}"
SERVICE_CLUSTER_IP_RANGE="${SERVICE_CLUSTER_IP_RANGE:-}"
# Etcd related variables.
ETCD_IMAGE=2.2.1
ETCD_IMAGE="${ETCD_IMAGE:-}"
ETCD_VERSION="${ETCD_VERSION:-}"
# Controller-manager related variables.
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS}"
ALLOCATE_NODE_CIDRS=${ALLOCATE_NODE_CIDRS}
CLUSTER_IP_RANGE=${CLUSTER_IP_RANGE}
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD}
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_ARGS:-}"
ALLOCATE_NODE_CIDRS="${ALLOCATE_NODE_CIDRS:-}"
CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-}"
TERMINATED_POD_GC_THRESHOLD="${TERMINATED_POD_GC_THRESHOLD:-}"
# Scheduler related variables.
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS}"
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
# Apiserver related variables.
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS}"
STORAGE_BACKEND=${STORAGE_BACKEND}
NUM_NODES=${NUM_NODES}
APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}"
STORAGE_BACKEND="${STORAGE_BACKEND:-}"
NUM_NODES="${NUM_NODES:-}"
CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota}"
EOF
if [ -z "${CUSTOM_ADMISSION_PLUGINS:-}" ]; then
cat >> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
CUSTOM_ADMISSION_PLUGINS=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota
EOF
else
cat >> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <<EOF
CUSTOM_ADMISSION_PLUGINS=${CUSTOM_ADMISSION_PLUGINS}
EOF
fi
}
MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"

4
test/kubemark/stop-kubemark.sh
View File

@ -57,6 +57,4 @@ rm "${RESOURCE_DIRECTORY}/ca.crt" \
"${RESOURCE_DIRECTORY}/kubecfg.crt" \
"${RESOURCE_DIRECTORY}/kubecfg.key" \
"${RESOURCE_DIRECTORY}/hollow-node.json" \
"${RESOURCE_DIRECTORY}/apiserver_flags" \
"${RESOURCE_DIRECTORY}/controllers_flags" \
"${RESOURCE_DIRECTORY}/scheduler_flags" &> /dev/null || true
"${RESOURCE_DIRECTORY}/kubemark-master-env.sh" &> /dev/null || true