diff --git a/.github/workflows/stage_airgap.yml b/.github/workflows/stage_airgap.yml index efa2c0ad7..8b251f503 100644 --- a/.github/workflows/stage_airgap.yml +++ b/.github/workflows/stage_airgap.yml @@ -69,7 +69,7 @@ jobs: run: | cd ./test if [[ $BUCKET != "terraform-backend-github" ]]; then \ - ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook playbooks/hauler_build.yml -e dir_build="${MOUNT_POINT}" -e rancher="true" -e archive="false"; \ + ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook playbooks/hauler_build.yml -e dir_build="${MOUNT_POINT}" -e longhorn="true" -e archive="false"; \ fi deploy: @@ -233,9 +233,9 @@ jobs: run: | ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -u root --private-key .key playbooks/install.yml - - name: Run playbook rancher.yml - run: | - ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -u root --private-key .key playbooks/rancher.yml + #- name: Run playbook rancher.yml + # run: | + # ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -u root --private-key .key playbooks/rancher.yml #- name: Run playbook longhorn.yml # run: | diff --git a/README.md b/README.md index b51d2d76c..51aad68a1 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ But the target to handle all the usecase below: | OS | Versions | Method | CNI | Cloud providers | Extra Install | |--------|-------------------------|----------------|--------|-----------------|-----------------| | Rocky8 | Defined in collections | airgap tarball | Canal | Digital Ocean | Kubevip | -| Ubuntu | Stable channels | airgap rpm | Calico | AWS | Longhorn | +| Ubuntu | Stable channels | airgap rpm | | AWS | Longhorn | | | Custom | online | | Azure | Rancher | | | | | | | Neuvector | diff --git a/roles/build_airgap_hauler/tasks/neuvector.yml b/roles/build_airgap_hauler/tasks/neuvector.yml index 0a1a92c38..ef8e28e8c 100644 --- a/roles/build_airgap_hauler/tasks/neuvector.yml +++ b/roles/build_airgap_hauler/tasks/neuvector.yml @@ -10,7 +10,6 @@ ansible.builtin.shell: cmd: | set -o pipefail - helm repo update helm template neuvector/core --version {{ neuvector_version }} | awk '$1 ~ /image:/ {print $2}' | sed s/\"//g executable: /bin/bash changed_when: false diff --git a/roles/build_airgap_hauler/tasks/rancher.yml b/roles/build_airgap_hauler/tasks/rancher.yml index 95b936fce..99ecc1142 100644 --- a/roles/build_airgap_hauler/tasks/rancher.yml +++ b/roles/build_airgap_hauler/tasks/rancher.yml @@ -10,7 +10,6 @@ ansible.builtin.shell: cmd: | set -o pipefail - helm repo update helm template jetstack/cert-manager --version {{ cert_manager_version }} | awk '$1 ~ /image:/ {print $2}' | sed s/\"//g executable: /bin/bash changed_when: false @@ -21,12 +20,6 @@ list_images_certmanager: "{{ certmanager_images['stdout'].splitlines() }}" # Rancher -- name: Add Rancher helm repo - kubernetes.core.helm_repository: - name: rancher-latest - repo_url: "https://releases.rancher.com/server-charts/latest" - force_update: true - - name: Get Rancher images from URL ansible.builtin.uri: url: "https://github.com/rancher/rancher/releases/download/v{{ rancher_version }}/rancher-images.txt"