Browse Source
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.
pull/8565/head
Sander Klein
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
6 deletions
-
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'] |
|
|
|