Merge pull request #15477 from gmarek/fix-kubemark

Fix HollowNode template
This commit is contained in:
Marek Grabowski 2015-10-12 15:51:25 +02:00
commit 139f5cd9ee
2 changed files with 1 additions and 10 deletions

View File

@ -35,18 +35,10 @@
{"containerPort": 10250}, {"containerPort": 10250},
{"containerPort": 10255} {"containerPort": 10255}
], ],
"env": [
{
"name": "MASTER_IP",
"value": ##masterip##
}
],
"command": [ "command": [
"./kubemark.sh" "./kubemark.sh"
], ],
"args": [ "args": [
"--server=$(MASTER_IP)",
"--api-server-port=8080",
"--v=3" "--v=3"
], ],
"volumeMounts": [ "volumeMounts": [

View File

@ -174,8 +174,7 @@ contexts:
current-context: kubemark-context current-context: kubemark-context
EOF EOF
sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${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/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json
sed -i'' -e "s/##project##/${PROJECT}/g" ${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 ${KUBE_ROOT}/test/kubemark/kubemark-ns.json
kubectl create -f ${KUBECONFIG_SECRET} --namespace="kubemark" kubectl create -f ${KUBECONFIG_SECRET} --namespace="kubemark"