github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 20:32:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10428 from GabyCT/topic/archk8sc

Browse Source 
gha: Use a arch_to_golang variable to have uniformity
This commit is contained in:
GabyCT 2024-10-17 11:00:59 -06:00 committed by GitHub
commit b00203ba9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/gha-run-k8s-common.sh
View File

@ -212,10 +212,8 @@ function deploy_k0s() {
# Download the kubectl binary into /usr/bin so we can avoid depending # Download the kubectl binary into /usr/bin so we can avoid depending
# on `k0s kubectl` command # on `k0s kubectl` command
ARCH=$(uname -m) ARCH=$(arch_to_golang)
if [ "${ARCH}" = "x86_64" ]; then
ARCH=amd64
fi
kubectl_version=$(sudo k0s kubectl version 2>/dev/null | grep "Client Version" | sed -e 's/Client Version: //') kubectl_version=$(sudo k0s kubectl version 2>/dev/null | grep "Client Version" | sed -e 's/Client Version: //')
sudo curl -fL --progress-bar -o /usr/bin/kubectl https://dl.k8s.io/release/${kubectl_version}/bin/linux/${ARCH}/kubectl sudo curl -fL --progress-bar -o /usr/bin/kubectl https://dl.k8s.io/release/${kubectl_version}/bin/linux/${ARCH}/kubectl
sudo chmod +x /usr/bin/kubectl sudo chmod +x /usr/bin/kubectl
@ -240,10 +238,8 @@ function deploy_k3s() {
# Which happens basically because k3s links `/usr/local/bin/kubectl` # Which happens basically because k3s links `/usr/local/bin/kubectl`
# to `/usr/local/bin/k3s`, and that does extra stuff that vanilla # to `/usr/local/bin/k3s`, and that does extra stuff that vanilla
# `kubectl` doesn't do. # `kubectl` doesn't do.
ARCH=$(uname -m) ARCH=$(arch_to_golang)
if [ "${ARCH}" = "x86_64" ]; then
ARCH=amd64
fi
kubectl_version=$(/usr/local/bin/k3s kubectl version --client=true 2>/dev/null | grep "Client Version" | sed -e 's/Client Version: //' -e 's/+k3s[0-9]\+//') kubectl_version=$(/usr/local/bin/k3s kubectl version --client=true 2>/dev/null | grep "Client Version" | sed -e 's/Client Version: //' -e 's/+k3s[0-9]\+//')
sudo curl -fL --progress-bar -o /usr/bin/kubectl https://dl.k8s.io/release/${kubectl_version}/bin/linux/${ARCH}/kubectl sudo curl -fL --progress-bar -o /usr/bin/kubectl https://dl.k8s.io/release/${kubectl_version}/bin/linux/${ARCH}/kubectl
sudo chmod +x /usr/bin/kubectl sudo chmod +x /usr/bin/kubectl