github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/6/head
Kubernetes Submit Queue 2016-12-07 23:59:33 -08:00 committed by GitHub
parent 910912ea3b dc0d1a1cbd
commit 1b30c411f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,8 @@ FLANNEL_OTHER_NET_CONFIG=${FLANNEL_OTHER_NET_CONFIG:-""}
export ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota export ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota
# Path to the config file or directory of files of kubelet # Path to the pod manifest file or directory of files of kubelet
export KUBELET_CONFIG=${KUBELET_CONFIG:-""} export KUBELET_POD_MANIFEST_PATH=${KUBELET_POD_MANIFEST_PATH:-""}
# A port range to reserve for services with NodePort visibility # A port range to reserve for services with NodePort visibility
SERVICE_NODE_PORT_RANGE=${SERVICE_NODE_PORT_RANGE:-"30000-32767"} SERVICE_NODE_PORT_RANGE=${SERVICE_NODE_PORT_RANGE:-"30000-32767"}

6
cluster/ubuntu/util.sh
View File

@ -296,7 +296,7 @@ KUBELET_OPTS="\
--logtostderr=true \ --logtostderr=true \
--cluster-dns=${3} \ --cluster-dns=${3} \
--cluster-domain=${4} \ --cluster-domain=${4} \
--config=${5} \ --pod-manifest-path=${5} \
--allow-privileged=${6} --allow-privileged=${6}
$cni_opts" $cni_opts"
EOF EOF
@ -558,7 +558,7 @@ function provision-node() {
'${MASTER_IP}' \ '${MASTER_IP}' \
'${DNS_SERVER_IP}' \ '${DNS_SERVER_IP}' \
'${DNS_DOMAIN}' \ '${DNS_DOMAIN}' \
'${KUBELET_CONFIG}' \ '${KUBELET_POD_MANIFEST_PATH}' \
'${ALLOW_PRIVILEGED}' \ '${ALLOW_PRIVILEGED}' \
'${CNI_PLUGIN_CONF}' '${CNI_PLUGIN_CONF}'
create-kube-proxy-opts \ create-kube-proxy-opts \
@ -660,7 +660,7 @@ function provision-masterandnode() {
'${MASTER_IP}' \ '${MASTER_IP}' \
'${DNS_SERVER_IP}' \ '${DNS_SERVER_IP}' \
'${DNS_DOMAIN}' \ '${DNS_DOMAIN}' \
'${KUBELET_CONFIG}' \ '${KUBELET_POD_MANIFEST_PATH}' \
'${ALLOW_PRIVILEGED}' \ '${ALLOW_PRIVILEGED}' \
'${CNI_PLUGIN_CONF}' '${CNI_PLUGIN_CONF}'
create-kube-proxy-opts \ create-kube-proxy-opts \