From 1a57780a751cf9f7ddfddfbf854621350f42e130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Necatican=20Y=C4=B1ld=C4=B1r=C4=B1m?= Date: Mon, 11 Oct 2021 19:36:41 +0300 Subject: [PATCH] Add kubeadm_join_phases_skip variable (#8067) * Add kubeadm_join_phases_skip variable * Update kubeadm_join_phases_skip comment Co-authored-by: Cristian Calin <6627509+cristicalin@users.noreply.github.com> * Add kubeadm_join_phases_skip_default variable to follow the same logic with kubeadm_init_phases_skip Co-authored-by: Cristian Calin <6627509+cristicalin@users.noreply.github.com> --- roles/kubernetes/control-plane/tasks/kubeadm-secondary.yml | 1 + roles/kubernetes/kubeadm/tasks/main.yml | 2 ++ roles/kubespray-defaults/defaults/main.yaml | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-secondary.yml b/roles/kubernetes/control-plane/tasks/kubeadm-secondary.yml index 1af7f0c6e72..3a4ee8aa625 100644 --- a/roles/kubernetes/control-plane/tasks/kubeadm-secondary.yml +++ b/roles/kubernetes/control-plane/tasks/kubeadm-secondary.yml @@ -57,6 +57,7 @@ {{ bin_dir }}/kubeadm join --config {{ kube_config_dir }}/kubeadm-controlplane.yaml --ignore-preflight-errors=all + --skip-phases={{ kubeadm_join_phases_skip | join(',') }} environment: PATH: "{{ bin_dir }}:{{ ansible_env.PATH }}" register: kubeadm_join_control_plane diff --git a/roles/kubernetes/kubeadm/tasks/main.yml b/roles/kubernetes/kubeadm/tasks/main.yml index 6a02f0dab7a..420ea0bb681 100644 --- a/roles/kubernetes/kubeadm/tasks/main.yml +++ b/roles/kubernetes/kubeadm/tasks/main.yml @@ -76,6 +76,7 @@ {{ bin_dir }}/kubeadm join --config {{ kube_config_dir }}/kubeadm-client.conf --ignore-preflight-errors=DirAvailable--etc-kubernetes-manifests + --skip-phases={{ kubeadm_join_phases_skip | join(',') }} register: kubeadm_join rescue: @@ -86,6 +87,7 @@ {{ bin_dir }}/kubeadm join --config {{ kube_config_dir }}/kubeadm-client.conf --ignore-preflight-errors=all + --skip-phases={{ kubeadm_join_phases_skip | join(',') }} register: kubeadm_join always: diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index dade9d893f9..bf73304418c 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -38,6 +38,12 @@ kubeadm_init_phases_skip: >- {{ kubeadm_init_phases_skip_default }} {%- endif -%} +# List of kubeadm phases that should be skipped when joining a new node +# You may need to set this to ['preflight'] for air-gaped deployments to avoid failing connectivity tests. +kubeadm_join_phases_skip_default: [] +kubeadm_join_phases_skip: >- + {{ kubeadm_join_phases_skip_default }} + # A string slice of values which specify the addresses to use for NodePorts. # Values may be valid IP blocks (e.g. 1.2.3.0/24, 1.2.3.4/32). # The default empty string slice ([]) means to use all local addresses.