From 07d2f1aa368a7214bd6488eae930aaec7a911265 Mon Sep 17 00:00:00 2001 From: Rong Zhang Date: Mon, 26 Nov 2018 17:17:31 +0800 Subject: [PATCH] Add some warning information about deprecating non-kubeadm code (#3759) --- cluster.yml | 13 +++++++++++++ inventory/sample/group_vars/all/all.yml | 3 +++ scale.yml | 13 +++++++++++++ tests/files/gce_ubuntu-flannel-ha.yml | 1 + upgrade-cluster.yml | 13 +++++++++++++ 5 files changed, 43 insertions(+) diff --git a/cluster.yml b/cluster.yml index 900fce86c..da4a0b69a 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 49bf3077c..8a9a03250 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 74ac2873d..970897be6 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 03076e26a..600489bb8 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 d35b25812..88202768c 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: