Merge branch 'master' into kevinhwang/add-on-bump-3.18

Azure · Feb 13, 2025 · fba7a5d · fba7a5d
2 parents b62eddd + c064374
commit fba7a5d
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 24 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -201,10 +201,14 @@
       ],
       "groupName": "acr-credential-provider",
       "assignees": [
-        "mainred"
+        "mainred",
+        "MartinForReal",
+        "nilo19"
       ],
       "reviewers": [
-        "mainred"
+        "mainred",
+        "MartinForReal",
+        "nilo19"
       ]
     },
     {
@@ -242,6 +246,22 @@
       ],
       "groupName": "azure-ipam"
     },
+    {
+      "matchPackageNames": [
+        "oss/kubernetes/azure-cloud-node-manager"
+      ],
+      "groupName": "azure-cloud-node-manager",
+      "assignees": [
+        "mainred",
+        "MartinForReal",
+        "nilo19"
+      ],
+      "reviewers": [
+        "mainred",
+        "MartinForReal",
+        "nilo19"
+      ]
+    },
     {
       "matchPackageNames": [
         "windows/nanoserver",
@@ -412,4 +432,4 @@
       ]
     }
   }
-}
+}
diff --git a/.pipelines/.vsts-vhd-builder.yaml b/.pipelines/.vsts-vhd-builder.yaml
@@ -16,6 +16,7 @@ pr:
     - parts/linux/*
     - packer.mk
     - aks-node-controller/**
+    - parts/common/components.json
     exclude:
     - vhdbuilder/release-notes
     - vhdbuilder/packer/*.ps1

diff --git a/.pipelines/.vsts-vhd-refresh-testdata.yaml b/.pipelines/.vsts-vhd-refresh-testdata.yaml
@@ -11,6 +11,7 @@ trigger:
     - .pipelines/.vsts-vhd-refresh-testdata.yaml
     - parts/linux/*
     - packer.mk
+    - parts/common/components.json
     exclude:
     - vhdbuilder/packer/*.ps1
     - vhdbuilder/packer/**/*.ps1

diff --git a/.pipelines/e2e-windows.yaml b/.pipelines/e2e-windows.yaml
@@ -20,6 +20,7 @@ pr:
       - e2e
       - parts/windows
       - pkg/agent
+      - parts/common/components.json
       - staging/cse/windows/
     exclude:
       - pkg/agent/datamodel/sig_config*.go # SIG config changes

diff --git a/.pipelines/e2e.yaml b/.pipelines/e2e.yaml
@@ -19,6 +19,7 @@ pr:
       - .pipelines/templates/e2e-template.yaml
       - e2e
       - parts/linux
+      - parts/common/components.json
       - pkg/agent
     exclude:
       - pkg/agent/datamodel/sig_config*.go # SIG config changes

diff --git a/e2e/scenario_test.go b/e2e/scenario_test.go
@@ -808,6 +808,22 @@ func Test_Ubuntu2204_ArtifactStreaming(t *testing.T) {
 	})
 }
 
+func Test_Ubuntu2204_ArtifactStreaming_Scriptless(t *testing.T) {
+	RunScenario(t, &Scenario{
+		Description: "tests that a new ubuntu 2204 node using artifact streaming can be properly bootstrapepd",
+		Config: Config{
+			Cluster: ClusterKubenet,
+			VHD:     config.VHDUbuntu2204Gen2Containerd,
+			AKSNodeConfigMutator: func(config *aksnodeconfigv1.Configuration) {
+				config.EnableArtifactStreaming = true
+			},
+			Validator: func(ctx context.Context, s *Scenario) {
+				ValidateNonEmptyDirectory(ctx, s, "/etc/overlaybd")
+			},
+		},
+	})
+}
+
 func Test_Ubuntu2204_ChronyRestarts(t *testing.T) {
 	RunScenario(t, &Scenario{
 		Description: "Tests that the chrony service restarts if it is killed",

diff --git a/parts/common/components.json b/parts/common/components.json
@@ -28,7 +28,8 @@
       "multiArchVersionsV2": [],
       "windowsVersions": [
         {
-          "renovateTag": "registry=https://mcr.microsoft.com, name=windows/nanoserver",
+          "comment": "1809 gets patches every 6 months or so. The alternative is ltsc2019 which gets patches every couple of years. Most customers use 1809, so we keep that on the VHD",
+          "renovateTag": "<DO_NOT_UPDATE>",
           "latestVersion": "1809",
           "windowsSkuMatch": "2019-containerd"
         },
@@ -460,28 +461,43 @@
       "windowsVersions": [
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
-          "latestVersion": "v1.27.21-windows-hpc",
-          "previousLatestVersion": "v1.27.21"
+          "latestVersion": "v1.27.21-windows-hpc"
+        },
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
+          "latestVersion": "v1.27.21"
+        },
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
+          "latestVersion": "v1.28.13-windows-hpc"
+        },
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
+          "latestVersion": "v1.28.13"
+        },
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
+          "latestVersion": "v1.29.11-windows-hpc"
+        },
+        {
+          "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
+          "latestVersion": "v1.29.11"
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
-          "latestVersion": "v1.28.13-windows-hpc",
-          "previousLatestVersion": "v1.28.13"
+          "latestVersion": "v1.30.7-windows-hpc"
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
-          "latestVersion": "v1.29.11-windows-hpc",
-          "previousLatestVersion": "v1.29.11"
+          "latestVersion": "v1.30.7"
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
-          "latestVersion": "v1.30.7-windows-hpc",
-          "previousLatestVersion": "v1.30.7"
+          "latestVersion": "v1.31.1-windows-hpc"
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/azure-cloud-node-manager",
-          "latestVersion": "v1.31.1-windows-hpc",
-          "previousLatestVersion": "v1.30.1"
+          "latestVersion": "v1.31.1"
         }
       ]
     },
@@ -1237,12 +1253,12 @@
               {
                 "k8sVersion": "1.30",
                 "renovateTag": "OCI_registry=https://mcr.microsoft.com, name=oss/binaries/kubernetes/azure-acr-credential-provider",
-                "latestVersion": "v1.30.7"
+                "latestVersion": "v1.30.8"
               },
               {
                 "k8sVersion": "1.29",
                 "renovateTag": "OCI_registry=https://mcr.microsoft.com, name=oss/binaries/kubernetes/azure-acr-credential-provider",
-                "latestVersion": "v1.29.11"
+                "latestVersion": "v1.29.12"
               }
             ],
             "downloadURL": "mcr.microsoft.com/oss/binaries/kubernetes/azure-acr-credential-provider:${version}-linux-${CPU_ARCH}"

diff --git a/schemas/components.cue b/schemas/components.cue
@@ -23,6 +23,7 @@ package components
 }
 
 #WindowsVersion: {
+	comment?:                string
 	k8sVersion?:             string
 	renovateTag?:            string
 	latestVersion:           string

diff --git a/vhdbuilder/packer/windows/components_json_helpers.tests.ps1 b/vhdbuilder/packer/windows/components_json_helpers.tests.ps1
@@ -645,7 +645,7 @@ Describe 'Tests of components.json ' {
 
         $components.Length | Should -BeGreaterThan 0
 
-        # Pause image shouldn't change too often, so let's check that is in there.
+        # core images shouldn't change too often, so let's check that is in there.
         $components | Should -Contain "mcr.microsoft.com/windows/servercore:ltsc2019"
         $components | Should -Contain "mcr.microsoft.com/windows/nanoserver:1809"
     }

diff --git a/vhdbuilder/packer/windows/windows_settings.json b/vhdbuilder/packer/windows/windows_settings.json
@@ -3,37 +3,36 @@
     "2019": {
       "base_image_sku": "2019-Datacenter-Core-smalldisk",
       "windows_image_name": "windows-2019",
-      "base_image_version": "17763.6775.250109"
+      "base_image_version": "17763.6893.250210"
     },
     "2019-containerd": {
-      "os_disk_size": "30",
       "base_image_sku": "2019-Datacenter-Core-smalldisk",
       "windows_image_name": "windows-2019-containerd",
-      "base_image_version": "17763.6775.250109"
+      "base_image_version": "17763.6893.250210"
     },
     "2022-containerd": {
       "os_disk_size": "35",
       "base_image_sku": "2022-Datacenter-Core-smalldisk",
       "windows_image_name": "windows-2022-containerd",
-      "base_image_version": "20348.3091.250112"
+      "base_image_version": "20348.3207.250210"
     },
     "2022-containerd-gen2": {
       "os_disk_size": "35",
       "base_image_sku": "2022-datacenter-core-smalldisk-g2",
       "windows_image_name": "windows-2022-containerd",
-      "base_image_version": "20348.3091.250112"
+      "base_image_version": "20348.3207.250210"
     },
     "23H2": {
       "os_disk_size": "35",
       "base_image_sku": "23h2-datacenter-core",
       "windows_image_name": "windows-23H2",
-      "base_image_version": "25398.1369.250111"
+      "base_image_version": "25398.1425.250210"
     },
     "23H2-gen2": {
       "os_disk_size": "35",
       "base_image_sku": "23h2-datacenter-core-g2",
       "windows_image_name": "windows-23H2",
-      "base_image_version": "25398.1369.250111"
+      "base_image_version": "25398.1425.250210"
     }
   },
   "WindowsRegistryKeys": [
@@ -677,6 +676,22 @@
       "Name": "1455863438",
       "Value": "1",
       "Type": "DWORD"
+    },
+    {
+      "Comment": "2025-2B",
+      "WindowsSkuMatch": "2022*",
+      "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Policies\\Microsoft\\FeatureManagement\\Overrides",
+      "Name": "1971481230",
+      "Value": "1",
+      "Type": "DWORD"
+    },
+    {
+      "Comment": "2025-2b",
+      "WindowsSkuMatch": "23H2*",
+      "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Policies\\Microsoft\\FeatureManagement\\Overrides",
+      "Name": "1155685006",
+      "Value": "1",
+      "Type": "DWORD"
     }
   ]
 }