diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index c83b0b72dcc..b3227f4228f 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -86,8 +86,8 @@ FLANNEL_OTHER_NET_CONFIG=${FLANNEL_OTHER_NET_CONFIG:-""} export ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota -# Path to the config file or directory of files of kubelet -export KUBELET_CONFIG=${KUBELET_CONFIG:-""} +# Path to the pod manifest file or directory of files of kubelet +export KUBELET_POD_MANIFEST_PATH=${KUBELET_POD_MANIFEST_PATH:-""} # A port range to reserve for services with NodePort visibility SERVICE_NODE_PORT_RANGE=${SERVICE_NODE_PORT_RANGE:-"30000-32767"} @@ -116,9 +116,7 @@ ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" # DNS_SERVER_IP must be a IP in SERVICE_CLUSTER_IP_RANGE DNS_SERVER_IP=${DNS_SERVER_IP:-"192.168.3.10"} DNS_DOMAIN=${DNS_DOMAIN:-"cluster.local"} - -# Optional: Enable DNS horizontal autoscaler -ENABLE_DNS_HORIZONTAL_AUTOSCALER="${KUBE_ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false}" +DNS_REPLICAS=${DNS_REPLICAS:-1} # Optional: Install Kubernetes UI ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index 773d242e5e5..997201609f2 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -296,7 +296,7 @@ KUBELET_OPTS="\ --logtostderr=true \ --cluster-dns=${3} \ --cluster-domain=${4} \ - --config=${5} \ + --pod-manifest-path=${5} \ --allow-privileged=${6} $cni_opts" EOF @@ -558,7 +558,7 @@ function provision-node() { '${MASTER_IP}' \ '${DNS_SERVER_IP}' \ '${DNS_DOMAIN}' \ - '${KUBELET_CONFIG}' \ + '${KUBELET_POD_MANIFEST_PATH}' \ '${ALLOW_PRIVILEGED}' \ '${CNI_PLUGIN_CONF}' create-kube-proxy-opts \ @@ -660,7 +660,7 @@ function provision-masterandnode() { '${MASTER_IP}' \ '${DNS_SERVER_IP}' \ '${DNS_DOMAIN}' \ - '${KUBELET_CONFIG}' \ + '${KUBELET_POD_MANIFEST_PATH}' \ '${ALLOW_PRIVILEGED}' \ '${CNI_PLUGIN_CONF}' create-kube-proxy-opts \