fix allow unsupported distribution (kubernetes-sigs#9904)

Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
pedro-peter · May 8, 2024 · 439607d · 439607d
1 parent d601cef
commit 439607d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml
@@ -133,3 +133,6 @@ ntp_servers:
 
 ## Used to control no_log attribute
 unsafe_show_logs: false
+
+## If enabled it will allow kubespray to attempt setup even if the distribution is not supported. For unsupported distributions this can lead to unexpected failures in some cases.
+allow_unsupported_distribution_setup: false
diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
@@ -97,6 +97,3 @@ containerd_supported_distributions:
   - "UnionTech"
   - "UniontechOS"
   - "openEuler"
-
-# If enabled it will allow kubespray to attempt setup even if the distribution is not supported. For unsupported distributions this can lead to unexpected failures in some cases.
-allow_unsupported_distribution_setup: false
diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
@@ -24,7 +24,7 @@
 
 - name: Stop if the os does not support
   assert:
-    that: ansible_distribution in supported_os_distributions
+    that: (allow_unsupported_distribution_setup | default(false)) or ansible_distribution in supported_os_distributions
     msg: "{{ ansible_distribution }} is not a known OS"
   when: not ignore_assert_errors