github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trusty: Fix node kubelet pod-cidr flag

pull/6/head
Andy Zheng 2016-03-14 21:09:21 -07:00
parent 34094635ba
commit ab20a9adbe
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/trusty/configure.sh
View File

@ -254,12 +254,13 @@ assemble_kubelet_flags() {
if [ -n "${KUBELET_TEST_ARGS:-}" ]; then if [ -n "${KUBELET_TEST_ARGS:-}" ]; then
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} ${KUBELET_TEST_ARGS}" KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} ${KUBELET_TEST_ARGS}"
fi fi
if [ ! -z "${KUBELET_APISERVER:-}" ] && [ ! -z "${KUBELET_CERT:-}" ] && [ ! -z "${KUBELET_KEY:-}" ]; then if [ "${KUBERNETES_MASTER:-}" = "true" ] && \
[ ! -z "${KUBELET_APISERVER:-}" ] && \
[ ! -z "${KUBELET_CERT:-}" ] && \
[ ! -z "${KUBELET_KEY:-}" ]; then
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER}" KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER}"
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --register-schedulable=false --reconcile-cidr=false" KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --register-schedulable=false --reconcile-cidr=false"
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=10.123.45.0/30" KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=10.123.45.0/30"
else
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=${MASTER_IP_RANGE}"
fi fi
if [ "${ENABLE_MANIFEST_URL:-}" = "true" ]; then if [ "${ENABLE_MANIFEST_URL:-}" = "true" ]; then
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --manifest-url=${MANIFEST_URL} --manifest-url-header=${MANIFEST_URL_HEADER}" KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --manifest-url=${MANIFEST_URL} --manifest-url-header=${MANIFEST_URL_HEADER}"

1
cluster/gce/trusty/master.yaml
View File

@ -144,6 +144,7 @@ script
--system-cgroups=/system \ --system-cgroups=/system \
--runtime-cgroups=/docker-daemon \ --runtime-cgroups=/docker-daemon \
--kubelet-cgroups=/kubelet \ --kubelet-cgroups=/kubelet \
--babysit-daemons=true \
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1 ${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
end script end script

1
cluster/gce/trusty/node.yaml
View File

@ -143,6 +143,7 @@ script
--system-cgroups=/system \ --system-cgroups=/system \
--runtime-cgroups=/docker-daemon \ --runtime-cgroups=/docker-daemon \
--kubelet-cgroups=/kubelet \ --kubelet-cgroups=/kubelet \
--babysit-daemons=true \
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1 ${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
end script end script