Use role to copy CNI bin (#5953)

2026-03-16 08:27:31 -02:30 · 2020-04-16 19:06:45 +02:00
parent 065292f8a4
commit 0924c2510c
17 changed files with 22 additions and 136 deletions
--- a/roles/kubernetes-apps/network_plugin/cni/tasks/main.yml
+++ b/roles/kubernetes-apps/network_plugin/cni/tasks/main.yml
@@ -1,14 +0,0 @@
---
- name: CNI | make sure /opt/cni/bin exists
-  file:
-    path: /opt/cni/bin
-    state: directory
-    mode: 0755
-    owner: root
-    group: root
- name: CNI | Copy cni plugins
-  unarchive:
-    src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz"
-    dest: "/opt/cni/bin"
-    mode: 0755
-    remote_src: yes
--- a/roles/kubernetes-apps/network_plugin/meta/main.yml
+++ b/roles/kubernetes-apps/network_plugin/meta/main.yml
@@ -25,11 +25,6 @@ dependencies:
    tags:
      - contiv

-  - role: kubernetes-apps/network_plugin/cni
-    when: kube_network_plugin == 'cni'
-    tags:
-      - cni
-
  - role: kubernetes-apps/network_plugin/kube-ovn
    when: kube_network_plugin == 'kube-ovn'
    tags: