diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml index a1503f1516..ed6a64ace8 100644 --- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml @@ -22,6 +22,10 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" + - task: KubectlInstaller@0 + inputs: + kubectlVersion: latest + - task: AzureCLI@1 inputs: azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) @@ -58,9 +62,6 @@ steps: - script: | ls -lah pwd - echo "installing kubectl" - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl kubectl cluster-info kubectl get po -owide -A sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(dropgzVersion) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }} diff --git a/.pipelines/singletenancy/aks/e2e-step-template.yaml b/.pipelines/singletenancy/aks/e2e-step-template.yaml index 5392a6217f..7a37e42b54 100644 --- a/.pipelines/singletenancy/aks/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks/e2e-step-template.yaml @@ -17,6 +17,9 @@ steps: echo '##vso[task.prependpath]$(GOROOT)/bin' name: "GoEnv" displayName: "Set up the Go environment" + - task: KubectlInstaller@0 + inputs: + kubectlVersion: latest - task: AzureCLI@1 inputs: azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) diff --git a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml index 30d2e3c58b..d989286b66 100644 --- a/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml @@ -22,6 +22,10 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" + - task: KubectlInstaller@0 + inputs: + kubectlVersion: latest + - task: AzureCLI@1 inputs: azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) @@ -31,15 +35,8 @@ steps: inlineScript: | set -e make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }} - ls -lah - pwd - echo "installing kubectl" - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - kubectl cluster-info - kubectl get po -owide -A - name: "installKubectl" - displayName: "Install Kubectl" + name: "kubeconfig" + displayName: "Set Kubeconfig" - ${{ if eq( parameters['testDropgz'], true) }}: - script: | diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml index 8731f6ed5f..55601e1131 100644 --- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml @@ -22,6 +22,10 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" + - task: KubectlInstaller@0 + inputs: + kubectlVersion: latest + - task: AzureCLI@1 inputs: azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) @@ -33,9 +37,6 @@ steps: make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }} ls -lah pwd - echo "installing kubectl" - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl kubectl cluster-info kubectl get po -owide -A if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then FILE_PATH=-nightly && echo "Running nightly"; fi diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml index 914129241c..d57aa0af3e 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml @@ -22,6 +22,10 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" + - task: KubectlInstaller@0 + inputs: + kubectlVersion: latest + - task: AzureCLI@1 inputs: azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) @@ -33,9 +37,6 @@ steps: make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }} ls -lah pwd - echo "installing kubectl" - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl kubectl cluster-info kubectl get po -owide -A echo "deploy Cilium ConfigMap" diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml index f4239ac67d..82fc522b93 100644 --- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml +++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-step-template.yaml @@ -16,6 +16,10 @@ steps: name: "GoEnv" displayName: "Set up the Go environment" + - task: KubectlInstaller@0 + inputs: + kubectlVersion: latest + - task: AzureCLI@2 inputs: azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) @@ -25,16 +29,8 @@ steps: inlineScript: | set -e make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }} - ls -lah - pwd - echo "installing kubectl" - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl - kubectl cluster-info - kubectl get po -owide -A - retryCountOnTaskFailure: 3 - name: "installKubectl" - displayName: "Install Kubectl" + name: "kubeconfig" + displayName: "Set Kubeconfig" - ${{ if eq( parameters['testDropgz'], true) }}: - script: |