From 078d2aad852c05b88cfdab4dad3b826d8cf3c03d Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Thu, 1 Feb 2024 14:46:15 +0100 Subject: [PATCH] Fix logical error when checking for boostrap-os Also remove some clutter along the way. --- roles/kubespray-defaults/tasks/main.yaml | 38 ++++++++++-------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/roles/kubespray-defaults/tasks/main.yaml b/roles/kubespray-defaults/tasks/main.yaml index e3defd27a8d..5dd751db46a 100644 --- a/roles/kubespray-defaults/tasks/main.yaml +++ b/roles/kubespray-defaults/tasks/main.yaml @@ -1,30 +1,22 @@ --- -- name: Configure defaults - debug: - msg: "Check roles/kubespray-defaults/defaults/main/main.yml" +- name: Set facts variables + when: > + ansible_play_role_names | + intersect(['bootstrap-os', 'kubernetes-sigs.kubespray.bootstrap-os']) | + length == 0 + # do not run gather facts when bootstrap-os in roles tags: - always + block: + - name: Set fallback_ips + import_tasks: fallback_ips.yml + when: fallback_ips is not defined -# do not run gather facts when bootstrap-os in roles -- name: Set fallback_ips - import_tasks: fallback_ips.yml - when: - - "'bootstrap-os' not in ansible_play_role_names or - 'kubernetes-sigs.kubespray.bootstrap-os' not in ansible_play_role_names" - - fallback_ips is not defined - tags: - - always - - -- name: Set no_proxy - import_tasks: no_proxy.yml - when: - - "'bootstrap-os' not in ansible_play_role_names or - 'kubernetes-sigs.kubespray.bootstrap-os' not in ansible_play_role_names" - - http_proxy is defined or https_proxy is defined - - no_proxy is not defined - tags: - - always + - name: Set no_proxy + import_tasks: no_proxy.yml + when: + - http_proxy is defined or https_proxy is defined + - no_proxy is not defined # TODO: Clean this task up when we drop backward compatibility support for `etcd_kubeadm_enabled` - name: Set `etcd_deployment_type` to "kubeadm" if `etcd_kubeadm_enabled` is true