diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index 16b6c65bad5..8d215cacd0a 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -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. diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index 808969e99c3..4512adb1a37 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -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}'