From ea7f9143943545fd8a80e0853bd9bd0d5d4f350d Mon Sep 17 00:00:00 2001 From: gmarek Date: Mon, 12 Oct 2015 15:37:08 +0200 Subject: [PATCH] Fix HollowNode template --- test/kubemark/hollow-kubelet_template.json | 8 -------- test/kubemark/start-kubemark.sh | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/test/kubemark/hollow-kubelet_template.json b/test/kubemark/hollow-kubelet_template.json index d9e5a8e9fe9..404203cd8db 100644 --- a/test/kubemark/hollow-kubelet_template.json +++ b/test/kubemark/hollow-kubelet_template.json @@ -35,18 +35,10 @@ {"containerPort": 10250}, {"containerPort": 10255} ], - "env": [ - { - "name": "MASTER_IP", - "value": ##masterip## - } - ], "command": [ "./kubemark.sh" ], "args": [ - "--server=$(MASTER_IP)", - "--api-server-port=8080", "--v=3" ], "volumeMounts": [ diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 57b6ee7ad20..64d824bfccf 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -174,8 +174,7 @@ contexts: current-context: kubemark-context EOF -sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json -sed -i'' -e "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json +sed "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json sed -i'' -e "s/##project##/${PROJECT}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json kubectl create -f ${KUBE_ROOT}/test/kubemark/kubemark-ns.json kubectl create -f ${KUBECONFIG_SECRET} --namespace="kubemark"