Browse Source
Merge pull request #2146 from abelgana/master
Manage deprecated kubelet option
pull/2148/head
Spencer Smith
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
0 deletions
-
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
-
roles/kubernetes/node/templates/kubelet.standard.env.j2
|
|
@ -17,7 +17,9 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" |
|
|
|
{# start kubeadm specific settings #} |
|
|
|
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \ |
|
|
|
--kubeconfig={{ kube_config_dir }}/kubelet.conf \ |
|
|
|
{% if kube_version | version_compare('v1.8', '<') %} |
|
|
|
--require-kubeconfig \ |
|
|
|
{% endif %} |
|
|
|
--authorization-mode=Webhook \ |
|
|
|
--client-ca-file={{ kube_cert_dir }}/ca.crt \ |
|
|
|
--pod-manifest-path={{ kube_manifest_dir }} \ |
|
|
|
|
|
@ -45,7 +45,11 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" |
|
|
|
{% set kubelet_args_dns %}{{ kubelet_args_cluster_dns }} --cluster-domain={{ dns_domain }} --resolv-conf={{ kube_resolv_conf }}{% endset %} |
|
|
|
|
|
|
|
{# Location of the apiserver #} |
|
|
|
{% if kube_version | version_compare('v1.8', '<') %} |
|
|
|
{% set kubelet_args_kubeconfig %}--kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --require-kubeconfig{% endset %} |
|
|
|
{% else %} |
|
|
|
{% set kubelet_args_kubeconfig %}--kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml{% endset %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
{% if standalone_kubelet|bool %} |
|
|
|
{# We are on a master-only host. Make the master unschedulable in this case. #} |
|
|
|