From 761457ddd21c0c0f2cfe9a56bfcad74b8e8d3357 Mon Sep 17 00:00:00 2001 From: Romain <58464216+RomainMou@users.noreply.github.com> Date: Mon, 25 Sep 2023 04:50:57 +0200 Subject: [PATCH] Fix etcdctl.sh TLS file path when not using kubeadm. (#10467) --- roles/etcdctl_etcdutl/templates/etcdctl.sh.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2 b/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2 index 71578fa0bba..e4ddfec8605 100644 --- a/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2 +++ b/roles/etcdctl_etcdutl/templates/etcdctl.sh.j2 @@ -8,7 +8,7 @@ etcdctl \ --cert {{ kube_cert_dir }}/etcd/server.crt \ --key {{ kube_cert_dir }}/etcd/server.key "$@" {% else %} - --cacert {{ etcd_cert_dir }}/etcd/ca.crt \ - --cert {{ etcd_cert_dir }}/etcd/server.crt \ - --key {{ etcd_cert_dir }}/etcd/server.key "$@" - {% endif %} \ No newline at end of file + --cacert {{ etcd_cert_dir }}/ca.pem \ + --cert {{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem \ + --key {{ etcd_cert_dir }}/admin-{{ inventory_hostname }}-key.pem "$@" +{% endif %}