Skip to content

Commit

Permalink
test/e2e: fix cilium CNI provisioning.
Browse files Browse the repository at this point in the history
Signed-off-by: Krisztian Litkey <[email protected]>
  • Loading branch information
klihub committed Oct 13, 2023
1 parent e17119d commit 7a35a71
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 52 deletions.
38 changes: 0 additions & 38 deletions test/e2e/files/cilium-install.sh

This file was deleted.

24 changes: 10 additions & 14 deletions test/e2e/playbook/provision.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -312,21 +312,17 @@
- kubectl taint nodes --all node-role.kubernetes.io/control-plane- || true
- kubectl taint nodes --all node-role.kubernetes.io/master- || true

- name: copy cilium install script
copy:
src: "{{ nri_resource_policy_src }}/test/e2e/files/cilium-install.sh"
dest: /usr/local/bin/cilium-install.sh
owner: root
group: root
mode: '0755'
- block:
- name: Fetch and extract cilium (installer) release tarball
ansible.builtin.unarchive:
src: "https://github.com/cilium/cilium-cli/releases/latest/download/cilium-linux-amd64.tar.gz"
dest: /usr/local/bin
remote_src: yes

- name: Install cilium cni
command: "{{ item }}"
with_items:
- curl -L --remote-name-all https://github.com/cilium/cilium-cli/releases/latest/download/cilium-linux-amd64.tar.gz
- tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
- cilium-install.sh
- rm -f cilium-linux-amd64.tar.gz
- name: Run cilium installer
ansible.builtin.shell:
cmd: cilium install --wait
when: cni_plugin == "cilium"

- block:
- name: Copy CNI bridge plugin configuration
Expand Down

0 comments on commit 7a35a71

Please sign in to comment.