From d983f3620e97ab360e476b16d462fe617173a4f8 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Thu, 2 Mar 2023 09:20:14 +0530 Subject: [PATCH] ci: fix multus ci Signed-off-by: subhamkrai --- .github/workflows/canary-integration-test.yml | 9 +++------ .github/workflows/canary-test-config/action.yaml | 2 +- tests/scripts/github-action-helper.sh | 7 +++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 4f1ed522a..431f24616 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -1358,13 +1358,10 @@ jobs: with: go-version: 1.19 - - name: setup minikube - uses: manusa/actions-setup-minikube@v2.7.2 + - name: setup cluster resources + uses: ./.github/workflows/canary-test-config with: - minikube version: "v1.26.1" - kubernetes version: "v1.26.1" - start args: --memory 6g --cpus=2 --addons ingress --cni=calico - github token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} - name: install deps shell: bash --noprofile --norc -eo pipefail -x {0} diff --git a/.github/workflows/canary-test-config/action.yaml b/.github/workflows/canary-test-config/action.yaml index e8d5cb9f0..46b3f7952 100644 --- a/.github/workflows/canary-test-config/action.yaml +++ b/.github/workflows/canary-test-config/action.yaml @@ -16,7 +16,7 @@ runs: - name: Setup Minikube shell: bash --noprofile --norc -eo pipefail -x {0} run: | - tests/scripts/github-action-helper.sh install_minikube_with_none_driver v1.26.0 + tests/scripts/github-action-helper.sh install_minikube_with_none_driver v1.26.1 - name: install deps shell: bash --noprofile --norc -eo pipefail -x {0} diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index 7a98fa28a..d7db6de78 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -509,10 +509,9 @@ function deploy_multus() { # install whereabouts kubectl apply \ - -f https://raw.githubusercontent.com/k8snetworkplumbingwg/whereabouts/v0.5.3/doc/crds/daemonset-install.yaml \ - -f https://raw.githubusercontent.com/k8snetworkplumbingwg/whereabouts/v0.5.3/doc/crds/ip-reconciler-job.yaml \ - -f https://github.com/k8snetworkplumbingwg/whereabouts/raw/v0.5.3/doc/crds/whereabouts.cni.cncf.io_ippools.yaml \ - -f https://github.com/k8snetworkplumbingwg/whereabouts/raw/v0.5.3/doc/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml + -f https://raw.githubusercontent.com/k8snetworkplumbingwg/whereabouts/master/doc/crds/daemonset-install.yaml \ + -f https://github.com/k8snetworkplumbingwg/whereabouts/raw/master/doc/crds/whereabouts.cni.cncf.io_ippools.yaml \ + -f https://github.com/k8snetworkplumbingwg/whereabouts/raw/master/doc/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml # create the rook-ceph namespace if it doesn't exist, the NAD will go in this namespace kubectl create namespace rook-ceph || true