require-kubeconfig is depricated since k8s v1.8
This commit is contained in:
parent
9506c2e597
commit
a9bb72c6fd
1 changed files with 4 additions and 0 deletions
|
@ -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 %}
|
{% set kubelet_args_dns %}{{ kubelet_args_cluster_dns }} --cluster-domain={{ dns_domain }} --resolv-conf={{ kube_resolv_conf }}{% endset %}
|
||||||
|
|
||||||
{# Location of the apiserver #}
|
{# 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 %}
|
{% 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 %}
|
{% if standalone_kubelet|bool %}
|
||||||
{# We are on a master-only host. Make the master unschedulable in this case. #}
|
{# We are on a master-only host. Make the master unschedulable in this case. #}
|
||||||
|
|
Loading…
Reference in a new issue