Merge pull request #36626 from chentao1596/ubuntu-install-change-attr

Automatic merge from submit-queue kubelet-run-parameter: change config to pod-manifest-path What this PR does / why we need it: "--config" will be removed in a future version of kubelet, in order to prevent failure in the new version, use "pod-manifest-path" instead of it

Merge pull request #36626 from chentao1596/ubuntu-install-change-attr
1b30c411 · Kubernetes Submit Queue · GitHub · 910912ea · dc0d1a1c · 1b30c411
Commit 1b30c411 authored Dec 07, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

config-default.sh cluster/ubuntu/config-default.sh +2 -2

util.sh cluster/ubuntu/util.sh +3 -3

No files found.
--- 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"}

--- 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 \