github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 14:11:14 +00:00
Code Issues Projects Releases Wiki Activity

make --config for kubelet configurable

Browse Source
This commit is contained in:
He Simei
2015-12-10 11:11:21 +08:00
parent 073661514e
commit 86d5a23238
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/ubuntu/config-default.sh
View File

@@ -37,6 +37,10 @@ export FLANNEL_NET=${FLANNEL_NET:-172.16.0.0/16}
# Admission Controllers to invoke prior to persisting objects in cluster
export ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota,SecurityContextDeny
# Path to the config file or directory of files of kubelet
export KUBELET_CONFIG=${KUBELET_CONFIG:-""}
# A port range to reserve for services with NodePort visibility
SERVICE_NODE_PORT_RANGE=${SERVICE_NODE_PORT_RANGE:-"30000-32767"}
# Optional: Enable node logging.

8
cluster/ubuntu/util.sh
View File

@@ -236,9 +236,9 @@ KUBELET_OPTS="\
--hostname-override=${1} \
--api-servers=http://${2}:8080 \
--logtostderr=true \
--config=/etc/kubernetes/manifests \
--cluster-dns=${3} \
--cluster-domain=${4}"
--config=${5}"
EOF
}
@@ -428,7 +428,8 @@ function provision-node() {
'${1#*@}' \
'${MASTER_IP}' \
'${DNS_SERVER_IP}' \
'${DNS_DOMAIN}'
'${DNS_DOMAIN}' \
'${KUBELET_CONFIG}'
create-kube-proxy-opts \
'${1#*@}' \
'${MASTER_IP}'
@@ -495,7 +496,8 @@ function provision-masterandnode() {
'${MASTER_IP}' \
'${MASTER_IP}' \
'${DNS_SERVER_IP}' \
'${DNS_DOMAIN}'
'${DNS_DOMAIN}' \
'${KUBELET_CONFIG}'
create-kube-proxy-opts \
'${MASTER_IP}' \
'${MASTER_IP}'