Merge pull request kubernetes#15477 from gmarek/fix-kubemark

Fix HollowNode template
penland365 · Oct 12, 2015 · 139f5cd · 139f5cd
2 parents 41a7f57 + ea7f914
commit 139f5cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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"