From c7072b48dcde947ac2f97ac5a9e8d4f1adb2244d Mon Sep 17 00:00:00 2001
From: Louis Tu <92532497+tu1h@users.noreply.github.com>
Date: Tue, 18 Apr 2023 21:58:58 +0800
Subject: [PATCH] add calico kubeconfig wait timeout (#9994)
Signed-off-by: tu1h <lihai.tu@daocloud.io>
---
roles/network_plugin/calico/defaults/main.yml | 3 +++
roles/network_plugin/calico/tasks/install.yml | 1 +
2 files changed, 4 insertions(+)
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index c6e1813ca..b3c5f809c 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -166,3 +166,6 @@ calico_apiserver_enabled: false
# Calico feature detect override
calico_feature_detect_override: ""
+
+# Calico kubeconfig wait timeout in seconds
+calico_kubeconfig_wait_timeout: 300
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index 158b62a9a..6a356719e 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -440,6 +440,7 @@
- name: Wait for calico kubeconfig to be created
wait_for:
path: /etc/cni/net.d/calico-kubeconfig
+ timeout: "{{ calico_kubeconfig_wait_timeout }}"
when:
- inventory_hostname not in groups['kube_control_plane']
- calico_datastore == "kdd"
--
GitLab