Browse Source
Deduplicate kubeadm_patches tasks
kubernetes/control-plane and kubernetes/kubeadm roles both push kubeadm
patches in the same way.
Extract that code and make it a dependency of both.
This is safe because it's only configuration for kubeadm, which only
takes effect when kubeadm is run.
pull/11521/head
Max Gautier
7 months ago
Failed to extract signature
5 changed files with
19 additions and
30 deletions
roles/kubernetes/control-plane/meta/main.yml
roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
roles/kubernetes/kubeadm/meta/main.yml
roles/kubernetes/kubeadm/tasks/main.yml
roles/kubernetes/kubeadm_common/tasks/main.yml
@ -1,5 +1,6 @@
---
dependencies:
- role : kubernetes/kubeadm_common
- role : kubernetes/tokens
when : kube_token_auth
tags:
@ -176,21 +176,6 @@
- apiserver_sans_ip_check.changed or apiserver_sans_host_check.changed
- not kube_external_ca_mode
- name : Kubeadm | Create directory to store kubeadm patches
file:
path : "{{ kubeadm_patches.dest_dir }}"
state : directory
mode : "0640"
when : kubeadm_patches is defined and kubeadm_patches.enabled
- name : Kubeadm | Copy kubeadm patches from inventory files
copy:
src : "{{ kubeadm_patches.source_dir }}/"
dest : "{{ kubeadm_patches.dest_dir }}"
owner : "root"
mode : "0644"
when : kubeadm_patches is defined and kubeadm_patches.enabled
- name : Kubeadm | Initialize first control plane node
command : >-
timeout -k {{ kubeadm_init_timeout }} {{ kubeadm_init_timeout }}
@ -0,0 +1,3 @@
---
dependencies:
- role : kubernetes/kubeadm_common
@ -83,21 +83,6 @@
mode : "0640"
when : ('kube_control_plane' not in group_names)
- name : Kubeadm | Create directory to store kubeadm patches
file:
path : "{{ kubeadm_patches.dest_dir }}"
state : directory
mode : "0640"
when : kubeadm_patches is defined and kubeadm_patches.enabled
- name : Kubeadm | Copy kubeadm patches from inventory files
copy:
src : "{{ kubeadm_patches.source_dir }}/"
dest : "{{ kubeadm_patches.dest_dir }}"
owner : "root"
mode : "0644"
when : kubeadm_patches is defined and kubeadm_patches.enabled
- name : Join to cluster if needed
environment:
PATH : "{{ bin_dir }}:{{ ansible_env.PATH }}:/sbin"
@ -0,0 +1,15 @@
---
- name : Kubeadm | Create directory to store kubeadm patches
file:
path : "{{ kubeadm_patches.dest_dir }}"
state : directory
mode : "0640"
when : kubeadm_patches is defined and kubeadm_patches.enabled
- name : Kubeadm | Copy kubeadm patches from inventory files
copy:
src : "{{ kubeadm_patches.source_dir }}/"
dest : "{{ kubeadm_patches.dest_dir }}"
owner : "root"
mode : "0644"
when : kubeadm_patches is defined and kubeadm_patches.enabled