From 1ca50f3eea92a76494b0a5e0e2910fae7f3cf3e6 Mon Sep 17 00:00:00 2001
From: Jack <jack4zhang@gmail.com>
Date: Wed, 8 Mar 2023 16:31:12 +0800
Subject: [PATCH] Update check calico version command (#9861)
---
roles/network_plugin/calico/tasks/check.yml | 48 ++++++++++-----------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/roles/network_plugin/calico/tasks/check.yml b/roles/network_plugin/calico/tasks/check.yml
index cc514a5a9..81f37ef7e 100644
--- a/roles/network_plugin/calico/tasks/check.yml
+++ b/roles/network_plugin/calico/tasks/check.yml
@@ -43,35 +43,33 @@
run_once: True
delegate_to: "{{ groups['kube_control_plane'][0] }}"
-- name: Get current calico cluster version
- shell: "set -o pipefail && {{ bin_dir }}/calicoctl.sh version | grep 'Cluster Version:' | awk '{ print $3}'"
- args:
- executable: /bin/bash
- register: calico_version_on_server
- async: 10
- poll: 3
+- name: Check if calico exists
+ stat:
+ path: "{{ bin_dir }}/calicoctl.sh"
+ register: calico_exists
run_once: True
- until: calico_version_on_server.stdout != 'unknown'
- retries: 5
- delay: "{{ retry_stagger | random + 3 }}"
delegate_to: "{{ groups['kube_control_plane'][0] }}"
- changed_when: false
- failed_when: false
- name: Check that current calico version is enough for upgrade
- assert:
- that:
- - calico_version_on_server.stdout is version(calico_min_version_required, '>=')
- msg: >
- Your version of calico is not fresh enough for upgrade.
- Minimum version is {{ calico_min_version_required }} supported by the previous kubespray release.
- But current version is {{ calico_version_on_server.stdout }}.
- when:
- - 'calico_version_on_server.stdout is defined'
- - calico_version_on_server.stdout
- - inventory_hostname == groups['kube_control_plane'][0]
- run_once: True
- delegate_to: "{{ groups['kube_control_plane'][0] }}"
+ block:
+ - name: Get current calico version
+ shell: "set -o pipefail && {{ bin_dir }}/calicoctl.sh version | grep 'Client Version:' | awk '{ print $3}'"
+ args:
+ executable: /bin/bash
+ register: calico_version_on_server
+ changed_when: false
+
+ - name: Assert that current calico version is enough for upgrade
+ assert:
+ that:
+ - calico_version_on_server.stdout is version(calico_min_version_required, '>=')
+ msg: >
+ Your version of calico is not fresh enough for upgrade.
+ Minimum version is {{ calico_min_version_required }} supported by the previous kubespray release.
+ But current version is {{ calico_version_on_server.stdout }}.
+ run_once: True
+ delegate_to: "{{ groups['kube_control_plane'][0] }}"
+ when: calico_exists.stat.exists
- name: "Check that cluster_id is set if calico_rr enabled"
assert:
--
GitLab