From f6b7d22a2240f55a1a4f533f75bae238f9e21000 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 11 Sep 2026 14:36:23 -0500 Subject: [PATCH 1/2] fix: avoid root-owned kubeconfig in LSG pipeline Resolve the AKS version with the host Azure CLI so Make does not invoke the Docker default and create ~/.kube as root. Accept the minor-only orchestrator version returned by AKS node pool queries. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 851648b1-fbe5-4653-a99c-d4400609bc9d --- .pipelines/cni/lsg/lsg-cni-integration-template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/cni/lsg/lsg-cni-integration-template.yaml b/.pipelines/cni/lsg/lsg-cni-integration-template.yaml index b2698f3b3c..e1c7a8256d 100644 --- a/.pipelines/cni/lsg/lsg-cni-integration-template.yaml +++ b/.pipelines/cni/lsg/lsg-cni-integration-template.yaml @@ -47,7 +47,7 @@ stages: if [ "${K8S_VER:-__use-default__}" = "__use-default__" ]; then unset K8S_VER fi - K8S_VERSION=$(make -s -C ./hack/aks vars | sed -n 's/^K8S_VER=//p') + K8S_VERSION=$(make -s -C ./hack/aks vars AZCLI=az LTS=false | sed -n 's/^K8S_VER=//p') if [ -z "$K8S_VERSION" ]; then echo "Failed to resolve K8S_VER from hack/aks/Makefile" exit 1 @@ -85,7 +85,7 @@ stages: exit 1 } if [[ "$K8S_VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then - [[ "$ACTUAL_K8S_VERSION" == "$K8S_VERSION".* ]] || { + [[ "$ACTUAL_K8S_VERSION" == "$K8S_VERSION" || "$ACTUAL_K8S_VERSION" == "$K8S_VERSION".* ]] || { echo "Expected Kubernetes $K8S_VERSION.x, got $ACTUAL_K8S_VERSION" exit 1 } From e0b042f355ebf4160e5d8eac352b133074b6fc93 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 11 Sep 2026 14:49:43 -0500 Subject: [PATCH 2/2] fix: auto-detect AKS LTS support plan Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 851648b1-fbe5-4653-a99c-d4400609bc9d --- .pipelines/cni/lsg/lsg-cni-integration-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/cni/lsg/lsg-cni-integration-template.yaml b/.pipelines/cni/lsg/lsg-cni-integration-template.yaml index e1c7a8256d..e8ee26745c 100644 --- a/.pipelines/cni/lsg/lsg-cni-integration-template.yaml +++ b/.pipelines/cni/lsg/lsg-cni-integration-template.yaml @@ -58,7 +58,7 @@ stages: make -C ./hack/aks ${{ parameters.clusterType }} \ AZCLI=az REGION="$REGION" SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \ CLUSTER="$CLUSTER" NODE_COUNT=${{ parameters.nodeCount }} \ - VM_SIZE=${{ parameters.vmSize }} AUTOUPGRADE=none LTS=false \ + VM_SIZE=${{ parameters.vmSize }} AUTOUPGRADE=none LTS=auto \ K8S_VER="$K8S_VERSION" OS_SKU=$(osSKU) make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER="$CLUSTER"