From 4f0b7cd377ecfa8609484f2ba3cca6fee3122447 Mon Sep 17 00:00:00 2001 From: chentao1596 Date: Fri, 11 Nov 2016 10:43:05 +0800 Subject: [PATCH 1/3] config attr has beean changed, new attr shoule be used --- cluster/ubuntu/config-default.sh | 8 +++----- cluster/ubuntu/util.sh | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) 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 \ From 3f188f793eaea80070e00e89b217b5460d5806df Mon Sep 17 00:00:00 2001 From: chentao1596 Date: Fri, 11 Nov 2016 11:01:56 +0800 Subject: [PATCH 2/3] commit the attr has been delete not by myself --- cluster/ubuntu/config-default.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index b3227f4228f..83b487e7b79 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -118,6 +118,9 @@ DNS_SERVER_IP=${DNS_SERVER_IP:-"192.168.3.10"} DNS_DOMAIN=${DNS_DOMAIN:-"cluster.local"} DNS_REPLICAS=${DNS_REPLICAS:-1} +# Optional: Enable DNS horizontal autoscaler +ENABLE_DNS_HORIZONTAL_AUTOSCALER="${KUBE_ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false}" + # Optional: Install Kubernetes UI ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" From dc0d1a1cbd84ef44563781f6710a4cc3d6c9f8af Mon Sep 17 00:00:00 2001 From: chentao1596 Date: Fri, 11 Nov 2016 11:09:04 +0800 Subject: [PATCH 3/3] rebase some master infos --- cluster/ubuntu/config-default.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index 83b487e7b79..aef361bf86b 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -116,7 +116,6 @@ 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"} -DNS_REPLICAS=${DNS_REPLICAS:-1} # Optional: Enable DNS horizontal autoscaler ENABLE_DNS_HORIZONTAL_AUTOSCALER="${KUBE_ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false}"