From 316b73178db24ebd8f6c0c43d35bfe774fd68abe Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Sat, 2 Feb 2019 04:09:04 +0000 Subject: [PATCH] Add timeout to Get current version of calico cluster version (#4149) Avoid waiting forever for this task that should be very quick. Fixes: #4148 --- roles/kubernetes/preinstall/tasks/0020-verify-settings.yml | 2 ++ roles/network_plugin/calico/tasks/check.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml index 9fa509f8d..4057e5cec 100644 --- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml @@ -138,6 +138,8 @@ - name: "Get current version of calico cluster version" shell: "{{ bin_dir }}/calicoctl version | grep 'Cluster Version:' | awk '{ print $3}'" register: calico_version_on_server + async: 10 + poll: 3 run_once: yes delegate_to: "{{ groups['kube-master'][0] }}" when: diff --git a/roles/network_plugin/calico/tasks/check.yml b/roles/network_plugin/calico/tasks/check.yml index bcfe25236..d35dda0fb 100644 --- a/roles/network_plugin/calico/tasks/check.yml +++ b/roles/network_plugin/calico/tasks/check.yml @@ -14,6 +14,8 @@ register: calico_version_on_server run_once: yes delegate_to: "{{ groups['kube-master'][0] }}" + async: 10 + poll: 3 - name: "Determine if calico upgrade is needed" block: