From 4b8daa22f6660ddd676ea2a9029d78163502a7a0 Mon Sep 17 00:00:00 2001 From: dvazar Date: Sat, 19 May 2018 00:57:09 +0700 Subject: [PATCH 1/2] Fixes #2800 --- roles/kubernetes/preinstall/tasks/verify-settings.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/preinstall/tasks/verify-settings.yml b/roles/kubernetes/preinstall/tasks/verify-settings.yml index 8f0a2e854..d91719da9 100644 --- a/roles/kubernetes/preinstall/tasks/verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/verify-settings.yml @@ -17,13 +17,13 @@ - name: Stop if unknown network plugin assert: - that: network_plugin in ['calico', 'canal', 'flannel', 'weave', 'cloud'] - when: network_plugin is defined + that: kube_network_plugin in ['calico', 'canal', 'flannel', 'weave', 'cloud'] + when: kube_network_plugin is defined ignore_errors: "{{ ignore_assert_errors }}" - name: Stop if incompatible network plugin and cloudprovider assert: - that: network_plugin != 'calico' + that: kube_network_plugin != 'calico' msg: "Azure and Calico are not compatible. See https://github.com/projectcalico/calicoctl/issues/949 for details." when: cloud_provider is defined and cloud_provider == 'azure' ignore_errors: "{{ ignore_assert_errors }}" From b3f9cae820e44f136ccf06f7f9f1dc4efa5bd563 Mon Sep 17 00:00:00 2001 From: dvazar Date: Tue, 22 May 2018 16:43:19 +0700 Subject: [PATCH 2/2] fixed a check unknown networks (cilium & contiv) --- roles/kubernetes/preinstall/tasks/verify-settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/preinstall/tasks/verify-settings.yml b/roles/kubernetes/preinstall/tasks/verify-settings.yml index d91719da9..43a8bd8e1 100644 --- a/roles/kubernetes/preinstall/tasks/verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/verify-settings.yml @@ -17,7 +17,7 @@ - name: Stop if unknown network plugin assert: - that: kube_network_plugin in ['calico', 'canal', 'flannel', 'weave', 'cloud'] + that: kube_network_plugin in ['calico', 'canal', 'flannel', 'weave', 'cloud', 'cilium', 'contiv'] when: kube_network_plugin is defined ignore_errors: "{{ ignore_assert_errors }}"