Merge pull request #11523 from wainersm/ci_setup_kubectl

workflows: adopting azure/setup-kubectl
This commit is contained in:
Steve Horsman 2025-07-09 09:09:38 +01:00 committed by GitHub
commit 990c4e68ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 15 additions and 11 deletions

View File

@ -107,7 +107,9 @@ jobs:
run: bash tests/integration/kubernetes/gha-run.sh install-kata-tools kata-artifacts run: bash tests/integration/kubernetes/gha-run.sh install-kata-tools kata-artifacts
- name: Download Azure CLI - name: Download Azure CLI
run: bash tests/integration/kubernetes/gha-run.sh install-azure-cli uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
with:
version: 'latest'
- name: Log into the Azure account - name: Log into the Azure account
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0 uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
@ -129,7 +131,9 @@ jobs:
run: bash tests/integration/kubernetes/gha-run.sh install-bats run: bash tests/integration/kubernetes/gha-run.sh install-bats
- name: Install `kubectl` - name: Install `kubectl`
run: bash tests/integration/kubernetes/gha-run.sh install-kubectl uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
with:
version: 'latest'
- name: Download credentials for the Kubernetes CLI to use them - name: Download credentials for the Kubernetes CLI to use them
run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials

View File

@ -114,7 +114,9 @@ jobs:
run: bash tests/integration/kubernetes/gha-run.sh install-bats run: bash tests/integration/kubernetes/gha-run.sh install-bats
- name: Install `kubectl` - name: Install `kubectl`
run: bash tests/integration/kubernetes/gha-run.sh install-kubectl uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
with:
version: 'latest'
- name: Download credentials for the Kubernetes CLI to use them - name: Download credentials for the Kubernetes CLI to use them
run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials

View File

@ -292,7 +292,9 @@ jobs:
run: bash tests/integration/kubernetes/gha-run.sh install-bats run: bash tests/integration/kubernetes/gha-run.sh install-bats
- name: Install `kubectl` - name: Install `kubectl`
run: bash tests/integration/kubernetes/gha-run.sh install-kubectl uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
with:
version: 'latest'
- name: Download credentials for the Kubernetes CLI to use them - name: Download credentials for the Kubernetes CLI to use them
run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials run: bash tests/integration/kubernetes/gha-run.sh get-cluster-credentials

View File

@ -95,7 +95,9 @@ jobs:
run: bash tests/functional/kata-deploy/gha-run.sh install-bats run: bash tests/functional/kata-deploy/gha-run.sh install-bats
- name: Install `kubectl` - name: Install `kubectl`
run: bash tests/functional/kata-deploy/gha-run.sh install-kubectl uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
with:
version: 'latest'
- name: Download credentials for the Kubernetes CLI to use them - name: Download credentials for the Kubernetes CLI to use them
run: bash tests/functional/kata-deploy/gha-run.sh get-cluster-credentials run: bash tests/functional/kata-deploy/gha-run.sh get-cluster-credentials

View File

@ -135,10 +135,6 @@ function install_bats() {
sudo add-apt-repository --remove 'deb http://archive.ubuntu.com/ubuntu/ noble universe' sudo add-apt-repository --remove 'deb http://archive.ubuntu.com/ubuntu/ noble universe'
} }
function install_kubectl() {
sudo az aks install-cli
}
# Install the kustomize tool in /usr/local/bin if it doesn't exist on # Install the kustomize tool in /usr/local/bin if it doesn't exist on
# the system yet. # the system yet.
# #

View File

@ -576,7 +576,6 @@ function main() {
install-bats) install_bats ;; install-bats) install_bats ;;
install-kata-tools) install_kata_tools ;; install-kata-tools) install_kata_tools ;;
install-kbs-client) install_kbs_client ;; install-kbs-client) install_kbs_client ;;
install-kubectl) install_kubectl ;;
get-cluster-credentials) get_cluster_credentials "" ;; get-cluster-credentials) get_cluster_credentials "" ;;
deploy-csi-driver) return 0 ;; deploy-csi-driver) return 0 ;;
deploy-kata) deploy_kata ;; deploy-kata) deploy_kata ;;

View File

@ -32,7 +32,6 @@ function main() {
create-cluster) create_cluster ;; create-cluster) create_cluster ;;
install-bats) install_bats ;; install-bats) install_bats ;;
install-kata-tools) install_kata_tools ;; install-kata-tools) install_kata_tools ;;
install-kubectl) install_kubectl ;;
get-cluster-credentials) get_cluster_credentials ;; get-cluster-credentials) get_cluster_credentials ;;
deploy-snapshotter) deploy_snapshotter ;; deploy-snapshotter) deploy_snapshotter ;;
deploy-kata-aks) deploy_kata "aks" ;; deploy-kata-aks) deploy_kata "aks" ;;