From ce13699dfa6535bfeebebc01ee7fc08c827935f3 Mon Sep 17 00:00:00 2001
From: ERIK <bo.jiang@daocloud.io>
Date: Mon, 12 Jun 2023 15:39:48 +0800
Subject: [PATCH] Use a uniform way to get the local path of the binaries
(#10211)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
---
roles/container-engine/kata-containers/tasks/main.yml | 2 +-
roles/download/tasks/prep_kubeadm_images.yml | 2 +-
roles/kubernetes/control-plane/tasks/main.yml | 2 +-
roles/kubernetes/node/tasks/install.yml | 4 ++--
roles/network_plugin/cni/tasks/main.yml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/roles/container-engine/kata-containers/tasks/main.yml b/roles/container-engine/kata-containers/tasks/main.yml
index 54bd25d0f..e5b7cd8db 100644
--- a/roles/container-engine/kata-containers/tasks/main.yml
+++ b/roles/container-engine/kata-containers/tasks/main.yml
@@ -6,7 +6,7 @@
- name: kata-containers | Copy kata-containers binary
unarchive:
- src: "{{ local_release_dir }}/kata-static-{{ kata_containers_version }}-{{ image_arch }}.tar.xz"
+ src: "{{ downloads.kata_containers.dest }}"
dest: "/"
mode: 0755
remote_src: yes
diff --git a/roles/download/tasks/prep_kubeadm_images.yml b/roles/download/tasks/prep_kubeadm_images.yml
index aa21849e0..2ab216a76 100644
--- a/roles/download/tasks/prep_kubeadm_images.yml
+++ b/roles/download/tasks/prep_kubeadm_images.yml
@@ -24,7 +24,7 @@
- name: prep_kubeadm_images | Copy kubeadm binary from download dir to system path
copy:
- src: "{{ local_release_dir }}/kubeadm-{{ kubeadm_version }}-{{ image_arch }}"
+ src: "{{ downloads.kubeadm.dest }}"
dest: "{{ bin_dir }}/kubeadm"
mode: 0755
remote_src: true
diff --git a/roles/kubernetes/control-plane/tasks/main.yml b/roles/kubernetes/control-plane/tasks/main.yml
index bd8029af2..344860e8e 100644
--- a/roles/kubernetes/control-plane/tasks/main.yml
+++ b/roles/kubernetes/control-plane/tasks/main.yml
@@ -29,7 +29,7 @@
- name: Install | Copy kubectl binary from download dir
copy:
- src: "{{ local_release_dir }}/kubectl-{{ kube_version }}-{{ image_arch }}"
+ src: "{{ downloads.kubectl.dest }}"
dest: "{{ bin_dir }}/kubectl"
mode: 0755
remote_src: true
diff --git a/roles/kubernetes/node/tasks/install.yml b/roles/kubernetes/node/tasks/install.yml
index cf7a1d84b..524353839 100644
--- a/roles/kubernetes/node/tasks/install.yml
+++ b/roles/kubernetes/node/tasks/install.yml
@@ -1,7 +1,7 @@
---
- name: install | Copy kubeadm binary from download dir
copy:
- src: "{{ local_release_dir }}/kubeadm-{{ kubeadm_version }}-{{ image_arch }}"
+ src: "{{ downloads.kubeadm.dest }}"
dest: "{{ bin_dir }}/kubeadm"
mode: 0755
remote_src: true
@@ -12,7 +12,7 @@
- name: install | Copy kubelet binary from download dir
copy:
- src: "{{ local_release_dir }}/kubelet-{{ kube_version }}-{{ image_arch }}"
+ src: "{{ downloads.kubelet.dest }}"
dest: "{{ bin_dir }}/kubelet"
mode: 0755
remote_src: true
diff --git a/roles/network_plugin/cni/tasks/main.yml b/roles/network_plugin/cni/tasks/main.yml
index b8bcec322..1e49d228b 100644
--- a/roles/network_plugin/cni/tasks/main.yml
+++ b/roles/network_plugin/cni/tasks/main.yml
@@ -9,7 +9,7 @@
- name: CNI | Copy cni plugins
unarchive:
- src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz"
+ src: "{{ downloads.cni.dest }}"
dest: "/opt/cni/bin"
mode: 0755
remote_src: yes
--
GitLab