Fix E2E Kubernetes version override

Author: wenxuan0923

hack/e2e/lib/node-join-kubeadm.sh

@@ -307,7 +307,7 @@ node_join_kubeadm() {
       "kubernetes.azure.com/managed": "false"
     },
     "kubelet": {
-      "serverURL": "${server_url}",
+      "clusterFQDN": "${server_url}",
       "caCertData": "${ca_cert_data}"
     }
   },
@@ -316,9 +316,11 @@ node_join_kubeadm() {
     "logDir": "/var/log/aks-flex-node",
     "e2eMode": true
   },
-  "kubernetes": { "version": "${E2E_KUBERNETES_VERSION}" },
-  "containerd": { "version": "${E2E_CONTAINERD_VERSION}" },
-  "runc": { "version": "${E2E_RUNC_VERSION}" }
+  "components": {
+    "kubernetes": "${E2E_KUBERNETES_VERSION}",
+    "containerd": "${E2E_CONTAINERD_VERSION}",
+    "runc": "${E2E_RUNC_VERSION}"
+  }
 }
 EOF
 

hack/e2e/lib/node-join-msi.sh

@@ -54,7 +54,7 @@ node_join_msi() {
   },
   "node": {
     "kubelet": {
-      "serverURL": "${server_url}",
+      "clusterFQDN": "${server_url}",
       "caCertData": "${ca_cert_data}"
     }
   },
@@ -63,9 +63,11 @@ node_join_msi() {
     "logDir": "/var/log/aks-flex-node",
     "e2eMode": true
   },
-  "kubernetes": { "version": "${E2E_KUBERNETES_VERSION}" },
-  "containerd": { "version": "${E2E_CONTAINERD_VERSION}" },
-  "runc": { "version": "${E2E_RUNC_VERSION}" }
+  "components": {
+    "kubernetes": "${E2E_KUBERNETES_VERSION}",
+    "containerd": "${E2E_CONTAINERD_VERSION}",
+    "runc": "${E2E_RUNC_VERSION}"
+  }
 }
 EOF
 

hack/e2e/lib/node-join-token.sh

@@ -65,9 +65,11 @@ node_join_token() {
     '.agent.logLevel = "debug"
       | .agent.e2eMode = true
       | .node.kubelet.nodeIP = $nodeIP
-      | .kubernetes.version = $kubernetesVersion
-      | .containerd.version = $containerdVersion
-      | .runc.version = $runcVersion' \
+      | .components = (.components // {})
+      | .components.kubernetes = $kubernetesVersion
+      | .components.containerd = $containerdVersion
+      | .components.runc = $runcVersion
+      | del(.kubernetes, .containerd, .runc)' \
     "${config_file}" > "${config_file}.tmp"
   mv "${config_file}.tmp" "${config_file}"
 

scripts/aks-flex-config

@@ -136,7 +136,8 @@ def cluster_metadata(args: argparse.Namespace) -> dict[str, str]:
         "resource_id": run(["az", "aks", "show", *aks, "--query", "id", "-o", "tsv"], capture=True),
         "location": run(["az", "aks", "show", *aks, "--query", "location", "-o", "tsv"], capture=True),
         "kubernetes_version": run(
-            ["az", "aks", "show", *aks, "--query", "kubernetesVersion", "-o", "tsv"], capture=True
+            ["az", "aks", "show", *aks, "--query", "currentKubernetesVersion || kubernetesVersion", "-o", "tsv"],
+            capture=True,
         ),
         "dns_service_ip": run(
             ["az", "aks", "show", *aks, "--query", "networkProfile.dnsServiceIp", "-o", "tsv"], capture=True