From 5b0f3f07887462646d7ebe355016798fa412a05b Mon Sep 17 00:00:00 2001 From: pstefans Date: Mon, 24 Feb 2025 20:02:08 +0000 Subject: [PATCH] update az command to use latest non techPreview k8s version in aks-provision-command.sh --- .../step-registry/aks/provision/aks-provision-commands.sh | 2 +- .../azure/aks/e2e/hypershift-azure-aks-e2e-workflow.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/aks/provision/aks-provision-commands.sh b/ci-operator/step-registry/aks/provision/aks-provision-commands.sh index 83f6ad290c66..3d864465aba5 100644 --- a/ci-operator/step-registry/aks/provision/aks-provision-commands.sh +++ b/ci-operator/step-registry/aks/provision/aks-provision-commands.sh @@ -77,7 +77,7 @@ fi if [[ -n "$AKS_K8S_VERSION" ]]; then AKS_CREATE_COMMAND+=(--kubernetes-version "$AKS_K8S_VERSION") elif [[ "$USE_LATEST_K8S_VERSION" == "true" ]]; then - K8S_LATEST_VERSION=$(az aks get-versions --location "${AZURE_LOCATION}" --output json --query 'max(orchestrators[*].orchestratorVersion)') + K8S_LATEST_VERSION=$(az aks get-versions --location "${AZURE_LOCATION}" --output json --query 'max(orchestrators[?isPreview==`null`].orchestratorVersion)') AKS_CREATE_COMMAND+=(--kubernetes-version "$K8S_LATEST_VERSION") fi diff --git a/ci-operator/step-registry/hypershift/azure/aks/e2e/hypershift-azure-aks-e2e-workflow.yaml b/ci-operator/step-registry/hypershift/azure/aks/e2e/hypershift-azure-aks-e2e-workflow.yaml index 8baadf94f79a..08626c08da57 100644 --- a/ci-operator/step-registry/hypershift/azure/aks/e2e/hypershift-azure-aks-e2e-workflow.yaml +++ b/ci-operator/step-registry/hypershift/azure/aks/e2e/hypershift-azure-aks-e2e-workflow.yaml @@ -43,5 +43,4 @@ workflow: ENABLE_AKS_CERT_ROTATION: "true" AKS_CERT_ROTATION_POLL_INTERVAL: "1m" AKS_USE_HYPERSHIFT_MI: "true" - ENABLE_SIZE_TAGGING: "true" - AKS_K8S_VERSION: "1.31.5" + ENABLE_SIZE_TAGGING: "true" \ No newline at end of file