mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2025-12-14 13:54:37 +03:00
Drop compatibility for etcd_kubeadm_enabled
This has been deprecated for a long time, time to pull the plug. We leave an assert for one release to have a straightforward failure if some users were still using the variable.
This commit is contained in:
@@ -231,25 +231,14 @@
|
|||||||
- not disable_host_nameservers
|
- not disable_host_nameservers
|
||||||
- dns_mode in ['coredns', 'coredns_dual']
|
- dns_mode in ['coredns', 'coredns_dual']
|
||||||
|
|
||||||
# TODO: Clean this task up when we drop backward compatibility support for `etcd_kubeadm_enabled`
|
# TODO: Clean this task up after 2.28 is released
|
||||||
- name: Stop if etcd deployment type is not host or kubeadm when container_manager != docker and etcd_kubeadm_enabled is not defined
|
- name: Stop if etcd_kubeadm_enabled is defined
|
||||||
run_once: true
|
run_once: true
|
||||||
when: etcd_kubeadm_enabled is defined
|
assert:
|
||||||
block:
|
that: etcd_kubeadm_enabled is not defined
|
||||||
- name: Warn the user if they are still using `etcd_kubeadm_enabled`
|
msg: |
|
||||||
debug:
|
`etcd_kubeadm_enabled` is removed.
|
||||||
msg: >
|
You can set `etcd_deployment_type` to `kubeadm` instead of setting `etcd_kubeadm_enabled` to `true`."
|
||||||
"WARNING! => `etcd_kubeadm_enabled` is deprecated and will be removed in a future release.
|
|
||||||
You can set `etcd_deployment_type` to `kubeadm` instead of setting `etcd_kubeadm_enabled` to `true`."
|
|
||||||
changed_when: true
|
|
||||||
|
|
||||||
- name: Stop if `etcd_kubeadm_enabled` is defined and `etcd_deployment_type` is not `kubeadm` or `host`
|
|
||||||
assert:
|
|
||||||
that: etcd_deployment_type == 'kubeadm'
|
|
||||||
msg: >
|
|
||||||
It is not possible to use `etcd_kubeadm_enabled` when `etcd_deployment_type` is set to {{ etcd_deployment_type }}.
|
|
||||||
Unset the `etcd_kubeadm_enabled` variable and set `etcd_deployment_type` to desired deployment type (`host`, `kubeadm`, `docker`) instead."
|
|
||||||
when: etcd_kubeadm_enabled
|
|
||||||
|
|
||||||
- name: Stop if download_localhost is enabled but download_run_once is not
|
- name: Stop if download_localhost is enabled but download_run_once is not
|
||||||
assert:
|
assert:
|
||||||
|
|||||||
@@ -23,12 +23,3 @@
|
|||||||
when:
|
when:
|
||||||
- http_proxy is defined or https_proxy is defined
|
- http_proxy is defined or https_proxy is defined
|
||||||
- no_proxy is not defined
|
- no_proxy is not defined
|
||||||
|
|
||||||
# TODO: Clean this task up when we drop backward compatibility support for `etcd_kubeadm_enabled`
|
|
||||||
- name: Set `etcd_deployment_type` to "kubeadm" if `etcd_kubeadm_enabled` is true
|
|
||||||
set_fact:
|
|
||||||
etcd_deployment_type: kubeadm
|
|
||||||
when:
|
|
||||||
- etcd_kubeadm_enabled is defined and etcd_kubeadm_enabled
|
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
|
|||||||
Reference in New Issue
Block a user