From 00e256430b3ded3e45f3d9330561527a53c15e65 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 4 Jun 2020 22:04:03 -0700 Subject: [PATCH] remove docker desktop's kubectl --- .github/workflows/pr.yml | 4 +++- test/integration/fn_tunnel_cmd.go | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 062f2a0566..d171b764e8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -212,6 +212,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.1.23/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe") choco install -y kubernetes-cli choco install -y jq + Remove-Item "C:\Program Files\Docker\Docker\resources\bin\kubectl.exe" - name: Run Integration Test in powershell continue-on-error: true shell: powershell @@ -319,9 +320,10 @@ jobs: shell: powershell run: | $ErrorActionPreference = "SilentlyContinue" - (New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.1.23/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe") + (New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.1.23/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe") choco install -y kubernetes-cli choco install -y jq + Remove-Item "C:\Program Files\Docker\Docker\resources\bin\kubectl.exe" - name: Run Integration Test in powershell continue-on-error: true shell: powershell diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go index abb19ed0d5..f9fa20afa2 100644 --- a/test/integration/fn_tunnel_cmd.go +++ b/test/integration/fn_tunnel_cmd.go @@ -151,9 +151,6 @@ func validateServiceStable(ctx context.Context, t *testing.T, profile string) { // Wait until the nginx-svc has a loadbalancer ingress IP err = wait.PollImmediate(1*time.Second, Minutes(4), func() (bool, error) { cmd := exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "svc", "nginx-svc", "-o", "jsonpath={.status.loadBalancer.ingress[0].ip}") - if runtime.GOOS == "windows" { - cmd := exec.CommandContext(ctx, "powershell.exe", "-NoProfile", "-NonInteractive", Target()+" -p "+profile+" kubectl -- --context"+profile+" get svc nginx-svc -o jsonpath={.status.loadBalancer.ingress[0].ip}") - } rr, err := Run(t, cmd) if err != nil { return false, err