github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15477 from gmarek/fix-kubemark

Browse Source 
Fix HollowNode template
This commit is contained in:
Marek Grabowski
2015-10-12 15:51:25 +02:00
parent 41a7f579ea ea7f914394
commit 139f5cd9ee
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/kubemark/hollow-kubelet_template.json
View File

@@ -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": [

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

@@ -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"