From 40f0c8fbb766cbc0ba16f7b20cdff1f4eba6c914 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Mon, 11 Dec 2023 08:26:39 +0100 Subject: [PATCH] GHA: Use --client=true for k3s kubectl version This is to fix a broken usage for `k3s kubectl version` by switching an option `--short` to `--client=true`. Fixes: #8621 Signed-off-by: Hyounggyu Choi --- tests/gha-run-k8s-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index 7617f5989e..6e18dc4e9d 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -161,7 +161,7 @@ function deploy_k3s() { if [ "${ARCH}" = "x86_64" ]; then ARCH=amd64 fi - kubectl_version=$(/usr/local/bin/k3s kubectl version --short 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://storage.googleapis.com/kubernetes-release/release/${kubectl_version}/bin/linux/${ARCH}/kubectl sudo chmod +x /usr/bin/kubectl sudo rm -rf /usr/local/bin/kubectl