diff --git a/cluster.yml b/cluster.yml index 900fce86c997572cfc1f97dbee28f0720aeb38a7..da4a0b69ab933f7cd848644615c1e7b9ce8b4131 100644 --- a/cluster.yml +++ b/cluster.yml @@ -13,6 +13,19 @@ vars: ansible_connection: local +- hosts: localhost + tasks: + - name: deploy warning for non kubeadm + debug: + msg: "DEPRECATION: non-kubeadm deployment is deprecated from v2.9. Will be removed in next release." + when: not kubeadm_enabled and not skip_non_kubeadm_warning + + - name: deploy cluster for non kubeadm + pause: + prompt: "Are you sure you want to deploy cluster using the deprecated non-kubeadm mode." + echo: no + when: not kubeadm_enabled and not skip_non_kubeadm_warning + - hosts: bastion[0] gather_facts: False roles: diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml index 49bf3077cffb35b73d162a49fb869f90b7e1745d..8a9a032507f9cf72e42fd95f1989d73948e4f7a7 100644 --- a/inventory/sample/group_vars/all/all.yml +++ b/inventory/sample/group_vars/all/all.yml @@ -48,6 +48,9 @@ bin_dir: /usr/local/bin ## kubeadm deployment mode kubeadm_enabled: true +# Skip alert information +skip_non_kubeadm_warning: false + ## Set these proxy values in order to update package manager and docker daemon to use proxies #http_proxy: "" #https_proxy: "" diff --git a/scale.yml b/scale.yml index 74ac2873db7f3786ad99791b5a8875f43e2c0a30..970897be6c0eea92b7316adfb47b7791bc4a67c3 100644 --- a/scale.yml +++ b/scale.yml @@ -13,6 +13,19 @@ vars: ansible_connection: local +- hosts: localhost + tasks: + - name: deploy warning for non kubeadm + debug: + msg: "DEPRECATION: non-kubeadm deployment is deprecated from v2.9. Will be removed in next release." + when: not kubeadm_enabled and not skip_non_kubeadm_warning + + - name: deploy cluster for non kubeadm + pause: + prompt: "Are you sure you want to deploy cluster using the deprecated non-kubeadm mode." + echo: no + when: not kubeadm_enabled and not skip_non_kubeadm_warning + - hosts: bastion[0] gather_facts: False roles: diff --git a/tests/files/gce_ubuntu-flannel-ha.yml b/tests/files/gce_ubuntu-flannel-ha.yml index 03076e26a978792cff03cca269a4ae54668b172b..600489bb82add497e83b0009d7788a1092eb581e 100644 --- a/tests/files/gce_ubuntu-flannel-ha.yml +++ b/tests/files/gce_ubuntu-flannel-ha.yml @@ -7,6 +7,7 @@ mode: ha # Deployment settings kube_network_plugin: flannel kubeadm_enabled: false +skip_non_kubeadm_warning: true deploy_netchecker: true dns_min_replicas: 1 cloud_provider: gce diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml index d35b25812d4b06863b0cdf9686aa024f3487db0a..88202768c6bfbc092d477eea27c6fed3a8497d93 100644 --- a/upgrade-cluster.yml +++ b/upgrade-cluster.yml @@ -13,6 +13,19 @@ vars: ansible_connection: local +- hosts: localhost + tasks: + - name: deploy warning for non kubeadm + debug: + msg: "DEPRECATION: non-kubeadm deployment is deprecated from v2.9. Will be removed in next release." + when: not kubeadm_enabled and not skip_non_kubeadm_warning + + - name: deploy cluster for non kubeadm + pause: + prompt: "Are you sure you want to deploy cluster using the deprecated non-kubeadm mode." + echo: no + when: not kubeadm_enabled and not skip_non_kubeadm_warning + - hosts: bastion[0] gather_facts: False roles: