From 9af719bf990cb17b3c6664dc853517db7165cc25 Mon Sep 17 00:00:00 2001 From: Sander Klein Date: Fri, 18 Feb 2022 16:20:23 +0100 Subject: [PATCH] This fixes the etcd node removal. (#8526) Since we are already on an etcd node while executing the commands, there is no need to find out an etcd IP because it is on localhost. --- roles/remove-node/remove-etcd-node/tasks/main.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/remove-node/remove-etcd-node/tasks/main.yml b/roles/remove-node/remove-etcd-node/tasks/main.yml index 6ff7a0f15..7022e64b4 100644 --- a/roles/remove-node/remove-etcd-node/tasks/main.yml +++ b/roles/remove-node/remove-etcd-node/tasks/main.yml @@ -37,9 +37,7 @@ ETCDCTL_CERT: "{{ kube_cert_dir + '/etcd/server.crt' if etcd_kubeadm_enabled else etcd_cert_dir + '/admin-' + groups['etcd']|first + '.pem' }}" ETCDCTL_KEY: "{{ kube_cert_dir + '/etcd/server.key' if etcd_kubeadm_enabled else etcd_cert_dir + '/admin-' + groups['etcd']|first + '-key.pem' }}" ETCDCTL_CACERT: "{{ kube_cert_dir + '/etcd/ca.crt' if etcd_kubeadm_enabled else etcd_cert_dir + '/ca.pem' }}" - ETCDCTL_ENDPOINTS: "https://{{ hostvars[groups['etcd']|first]['etcd_access_address'] | - default(hostvars[groups['etcd']|first]['ip']) | - default(hostvars[groups['etcd']|first]['fallback_ips'][groups['etcd']|first]) }}:2379" + ETCDCTL_ENDPOINTS: "https://127.0.0.1:2379" delegate_to: "{{ groups['etcd']|first }}" when: inventory_hostname in groups['etcd'] @@ -55,9 +53,7 @@ ETCDCTL_CERT: "{{ kube_cert_dir + '/etcd/server.crt' if etcd_kubeadm_enabled else etcd_cert_dir + '/admin-' + groups['etcd']|first + '.pem' }}" ETCDCTL_KEY: "{{ kube_cert_dir + '/etcd/server.key' if etcd_kubeadm_enabled else etcd_cert_dir + '/admin-' + groups['etcd']|first + '-key.pem' }}" ETCDCTL_CACERT: "{{ kube_cert_dir + '/etcd/ca.crt' if etcd_kubeadm_enabled else etcd_cert_dir + '/ca.pem' }}" - ETCDCTL_ENDPOINTS: "https://{{ hostvars[groups['etcd']|first]['etcd_access_address'] | - default(hostvars[groups['etcd']|first]['ip']) | - default(hostvars[groups['etcd']|first]['fallback_ips'][groups['etcd']|first]) }}:2379" + ETCDCTL_ENDPOINTS: "https://127.0.0.1:2379" delegate_to: "{{ groups['etcd']|first }}" when: - inventory_hostname in groups['etcd']