github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Make Node.yaml use KUBELET_PORT instead of hardcoded 10250

Browse Source
This commit is contained in:
gmarek 2015-10-14 15:56:19 +02:00
parent 6d6cd8e46a
commit 60404a55fc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/trusty/helper.sh
View File

@ -30,7 +30,9 @@ source "${KUBE_ROOT}/cluster/gce/debian/helper.sh"
# $1: template name (required) # $1: template name (required)
function create-node-instance-template { function create-node-instance-template {
local template_name="$1" local template_name="$1"
sed "s/##KUBELET_PORT##/${KUBELET_PORT}/g" ${KUBE_ROOT}/cluster/gce/trusty/node_template.yaml > ${KUBE_ROOT}/cluster/gce/trusty/node.yaml
create-node-template "$template_name" "${scope_flags[*]}" \ create-node-template "$template_name" "${scope_flags[*]}" \
"kube-env=${KUBE_TEMP}/node-kube-env.yaml" \ "kube-env=${KUBE_TEMP}/node-kube-env.yaml" \
"user-data=${KUBE_ROOT}/cluster/gce/trusty/node.yaml" "user-data=${KUBE_ROOT}/cluster/gce/trusty/node.yaml"
rm ${KUBE_ROOT}/cluster/gce/trusty/node.yaml
} }

2
cluster/gce/trusty/node.yaml → cluster/gce/trusty/node_template.yaml
View File

@ -403,7 +403,7 @@ script
echo "Docker daemon failed!" echo "Docker daemon failed!"
pkill docker pkill docker
fi fi
if ! curl --insecure -m ${max_seconds} -f -s https://127.0.0.1:10250/healthz > /dev/null; then if ! curl --insecure -m ${max_seconds} -f -s https://127.0.0.1:##KUBELET_PORT##/healthz > /dev/null; then
echo "Kubelet is unhealthy!" echo "Kubelet is unhealthy!"
pkill kubelet pkill kubelet
fi fi