Install etcdutl file by default (#10385)

roles/etcd/tasks/install_docker.yml

@@ -1,9 +1,4 @@
 ---
-
-- name: Install etcdctl from docker
-  import_tasks: install_etcdctl_docker.yml
-  when: etcd_cluster_setup
-
 - name: Get currently-deployed etcd version
   shell: "{{ docker_bin_dir }}/docker ps --filter='name={{ etcd_member_name }}' --format='{{ '{{ .Image }}' }}'"
   register: etcd_current_docker_image

roles/etcd/tasks/install_etcdctl_docker.yml

@@ -1,11 +0,0 @@
----
-- name: Install | Copy etcdctl binary from docker container
-  command: sh -c "{{ docker_bin_dir }}/docker rm -f etcdctl-binarycopy;
-            {{ docker_bin_dir }}/docker create --name etcdctl-binarycopy {{ etcd_image_repo }}:{{ etcd_image_tag }} &&
-            {{ docker_bin_dir }}/docker cp etcdctl-binarycopy:/usr/local/bin/etcdctl {{ bin_dir }}/etcdctl &&
-            {{ docker_bin_dir }}/docker rm -f etcdctl-binarycopy"
-  register: etcdctl_install_result
-  until: etcdctl_install_result.rc == 0
-  retries: "{{ etcd_retries }}"
-  delay: "{{ retry_stagger | random + 3 }}"
-  changed_when: false

roles/etcd/tasks/install_host.yml

@@ -20,16 +20,7 @@
     - etcd_events_cluster_setup
     - etcd_version.lstrip('v') not in etcd_current_host_version.stdout | default('')
 
-- name: Install | Download etcd and etcdctl
-  include_tasks: "../../download/tasks/download_file.yml"
-  vars:
-    download: "{{ download_defaults | combine(downloads.etcd) }}"
-  when: etcd_cluster_setup
-  tags:
-    - never
-    - etcd
-
-- name: Install | Copy etcd and etcdctl binary from download dir
+- name: Install | Copy etcd binary from download dir
   copy:
     src: "{{ local_release_dir }}/etcd-{{ etcd_version }}-linux-{{ host_architecture }}/{{ item }}"
     dest: "{{ bin_dir }}/{{ item }}"
@@ -37,5 +28,4 @@
     remote_src: yes
   with_items:
     - etcd
-    - etcdctl
   when: etcd_cluster_setup

roles/etcd/tasks/main.yml

@@ -53,6 +53,17 @@
     - master
     - network
 
+- name: Install etcdctl and etcdutl binary
+  import_role:
+    name: etcdctl_etcdutl
+  tags:
+    - etcdctl
+    - etcdutl
+    - upgrade
+  when:
+    - inventory_hostname in groups['etcd']
+    - etcd_cluster_setup
+
 - name: Install etcd
   include_tasks: "install_{{ etcd_deployment_type }}.yml"
   when: is_etcd_master