From 9c2bdeec63114d11f219d0329bb55b61bde5b9e6 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Fri, 16 May 2025 14:51:29 +0200 Subject: [PATCH] Decouple etcd defaults in a separate role This allows us to reuse the defaults in other places without putting everything in kubespray-defaults. In that, for kubernetes/control-plane. --- roles/etcd/meta/main.yml | 1 + roles/{etcd => etcd_defaults}/defaults/main.yml | 0 roles/{etcd => etcd_defaults}/vars/main.yml | 0 roles/kubernetes/control-plane/meta/main.yml | 1 + 4 files changed, 2 insertions(+) rename roles/{etcd => etcd_defaults}/defaults/main.yml (100%) rename roles/{etcd => etcd_defaults}/vars/main.yml (100%) diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml index e99664660..eda7561e2 100644 --- a/roles/etcd/meta/main.yml +++ b/roles/etcd/meta/main.yml @@ -6,3 +6,4 @@ dependencies: - role: adduser user: "{{ addusers.kube }}" when: not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos) + - role: etcd_defaults diff --git a/roles/etcd/defaults/main.yml b/roles/etcd_defaults/defaults/main.yml similarity index 100% rename from roles/etcd/defaults/main.yml rename to roles/etcd_defaults/defaults/main.yml diff --git a/roles/etcd/vars/main.yml b/roles/etcd_defaults/vars/main.yml similarity index 100% rename from roles/etcd/vars/main.yml rename to roles/etcd_defaults/vars/main.yml diff --git a/roles/kubernetes/control-plane/meta/main.yml b/roles/kubernetes/control-plane/meta/main.yml index 9e5d86e0f..ceb05687d 100644 --- a/roles/kubernetes/control-plane/meta/main.yml +++ b/roles/kubernetes/control-plane/meta/main.yml @@ -7,3 +7,4 @@ dependencies: - etcd_deployment_type == "kubeadm" - not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos) - role: network_plugin/calico_defaults + - role: etcd_defaults