Merge branch 'master' into releaseNotes/win-2025-02b-release-notes

Azure · Feb 24, 2025 · 0062098 · 0062098
2 parents 44802c1 + 60f81cf
commit 0062098
Show file tree

Hide file tree

Showing 524 changed files with 10,925 additions and 2,572 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -56,7 +56,8 @@
         "moby-containerd",
         "oss/binaries/kubernetes/kubernetes-node",
         "oss/binaries/kubernetes/azure-acr-credential-provider",
-        "oss/binaries/deislabs/containerd-wasm-shims"
+        "oss/binaries/deislabs/containerd-wasm-shims",
+        "containernetworking/azure-npm"
       ],
       "matchUpdateTypes": [
         "minor"
@@ -116,14 +117,15 @@
     {
       "matchPackageNames": [
         "moby-runc",
-        "moby-containerd"
+        "moby-containerd",
+        "aks/aks-node-ca-watcher"
       ],
       "matchUpdateTypes": [
         "patch"
       ],
       "automerge": true,
       "enabled": true,
-      "groupName": "runc-containerd",
+      "groupName": "runc-containerd-ca_watcher",
       "assignees": [
         "devinwong",
         "anujmaheshwari1",
@@ -152,49 +154,83 @@
     {
       "matchPackageNames": [
         "azure-cni",
-        "azure-cns",
         "containernetworking/azure-cni",
-        "containernetworking/azure-cns",
-        "containernetworking/cilium/cilium"
+        "containernetworking/cilium/cilium",
+        "containernetworking/azure-ipam"
+      ],
+      "groupName": "azure-cni-cilium-ipam",
+      "reviewers": [
+        "team:acn-cni-reviewers"
       ],
-      "groupName": "azure-cni-cns-cilium",
       "assignees": [
         "rbtr",
         "behzad-mir",
-        "QxBytes",
-        "jpayne3506"
+        "jpayne3506",
+        "QxBytes"
+      ]
+    },
+    {
+      "matchPackageNames": [
+        "azure-cns",
+        "containernetworking/azure-cns"
       ],
+      "groupName": "azure-cns",
       "reviewers": [
+        "team:acn-cns-reviewers"
+      ],
+      "assignees": [
         "rbtr",
         "behzad-mir",
-        "QxBytes",
-        "jpayne3506"
+        "jpayne3506",
+        "QxBytes"
       ]
     },
     {
       "matchPackageNames": [
-        "aks/aks-node-ca-watcher"
+        "containernetworking/azure-npm"
       ],
+      "groupName": "azure-npm",
       "assignees": [
-        "UtheMan"
+        "rayaisaiah",
+        "huntergregory"
       ],
       "reviewers": [
-        "UtheMan"
+        "rayaisaiah",
+        "huntergregory"
       ]
     },
     {
       "matchPackageNames": [
+        "oss/kubernetes/autoscaler/addon-resizer",
+        "oss/kubernetes/autoscaler/cluster-proportional-autoscaler",
         "oss/kubernetes/coredns",
         "oss/v2/kubernetes/coredns"
       ],
-      "groupName": "coredns",
       "assignees": [
+        "nirnaymsft",
         "SriHarsha001"
       ],
       "reviewers": [
+        "nirnaymsft",
         "SriHarsha001"
       ]
     },
+    {
+      "matchPackageNames": [
+        "oss/v2/open-policy-agent/gatekeeper",
+        "azure-policy/policy-kubernetes-addon-prod"
+      ],
+      "assignees": [
+        "kevinhwangkr-msft",
+        "anlandu",
+        "nreisch"
+      ],
+      "reviewers": [
+        "kevinhwangkr-msft",
+        "anlandu",
+        "nreisch"
+      ]
+    },
     {
       "matchPackageNames": [
         "oss/binaries/kubernetes/azure-acr-credential-provider"
@@ -213,14 +249,16 @@
     },
     {
       "matchPackageNames": [
-        "oss/kubernetes-csi/*"
+        "oss/kubernetes-csi/**"
       ],
       "groupName": "csi",
       "assignees": [
-        "andyzhangx"
+        "andyzhangx",
+        "jiashun0011"
       ],
       "reviewers": [
-        "andyzhangx"
+        "andyzhangx",
+        "jiashun0011"
       ]
     },
     {
@@ -267,7 +305,7 @@
         "windows/nanoserver",
         "windows/servercore",
         "windows/servercore/iis",
-        "oss/kubernetes/windows-gmsa-webhook"
+        "oss/v2/kubernetes/windows-gmsa-webhook"
       ],
       "groupName": "windowsbase",
       "assignees": [

diff --git a/.pipelines/.vsts-vhd-builder-pr-windows.yaml b/.pipelines/.vsts-vhd-builder-pr-windows.yaml
@@ -3,33 +3,35 @@ trigger: none
 pr:
   branches:
     include:
-    - master
-    - dev
+      - master
+      - dev
   paths:
     include:
-    - .pipelines/.vsts-vhd-builder-release-windows.yaml
-    - .pipelines/.vsts-vhd-builder-pr-windows.yaml
-    - .pipelines/templates/.build-and-test-windows-vhds-template.yaml
-    - .pipelines/templates/.build-and-test-windows-vhd-template.yaml
-    - .pipelines/templates/.builder-release-template-windows.yaml
-    - .pipelines/templates/e2e-template.yaml
-    - packer.mk
-    - vhdbuilder/packer/packer-plugin.pkr.hcl
-    - vhdbuilder/packer/*.ps1
-    - vhdbuilder/packer/test/*.ps1
-    - vhdbuilder/packer/test/run-test.sh
-    - vhdbuilder/packer/backfill-cleanup.sh
-    - vhdbuilder/packer/cleanup.sh
-    - vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh
-    - vhdbuilder/packer/generate-vhd-publishing-info.sh
-    - vhdbuilder/packer/init-variables.sh
-    - vhdbuilder/packer/windows/
-    - parts/common/components.json
+      - .pipelines/.vsts-vhd-builder-release-windows.yaml
+      - .pipelines/.vsts-vhd-builder-pr-windows.yaml
+      - .pipelines/templates/.template-override-components-json.yaml
+      - .pipelines/templates/.template-copy-file.yaml
+      - .pipelines/templates/.build-and-test-windows-vhds-template.yaml
+      - .pipelines/templates/.build-and-test-windows-vhd-template.yaml
+      - .pipelines/templates/.builder-release-template-windows.yaml
+      - .pipelines/templates/e2e-template.yaml
+      - packer.mk
+      - vhdbuilder/packer/packer-plugin.pkr.hcl
+      - vhdbuilder/packer/*.ps1
+      - vhdbuilder/packer/test/*.ps1
+      - vhdbuilder/packer/test/run-test.sh
+      - vhdbuilder/packer/backfill-cleanup.sh
+      - vhdbuilder/packer/cleanup.sh
+      - vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh
+      - vhdbuilder/packer/generate-vhd-publishing-info.sh
+      - vhdbuilder/packer/init-variables.sh
+      - vhdbuilder/packer/windows/
+      - parts/common/components.json
     exclude:
-    - vhdbuilder/release-notes
-    - /**/*.md
-    - .github/**
-    - e2e/scenario_test.go
+      - vhdbuilder/release-notes
+      - /**/*.md
+      - .github/**
+      - e2e/scenario_test.go
 
 pool:
   name: $(AZURE_POOL_NAME)
@@ -55,3 +57,5 @@ stages:
       build2022containerdgen2: True
       build23H2: False
       build23H2gen2: True
+      overrideBranch: master
+      useOverrides: False
diff --git a/.pipelines/.vsts-vhd-builder-release-windows.yaml b/.pipelines/.vsts-vhd-builder-release-windows.yaml
@@ -11,42 +11,54 @@ variables:
   POOL_NAME: $(AZURE_POOL_NAME)
 
 parameters:
-- name: build2019containerd
-  displayName: Build 2019 containerd
-  type: boolean
-  default: True
-- name: build2022containerd
-  displayName: Build 2022 containerd
-  type: boolean
-  default: True
-- name: build2022containerdgen2
-  displayName: Build 2022 containerd Gen 2
-  type: boolean
-  default: True
-- name: build23H2
-  displayName: Build 23H2
-  type: boolean
-  default: True
-- name: build23H2gen2
-  displayName: Build 23H2 Gen 2
-  type: boolean
-  default: True
-- name: dryrun
-  displayName: Dry run
-  type: boolean
-  default: False
-- name: vhddebug
-  displayName: VHD Debug
-  type: boolean
-  default: False
-- name: skipExtensionCheck
-  displayName: Skip Extension Check
-  type: boolean
-  default: False
-- name: buildVmSize
-  displayName: Build VM Size
-  type: string
-  default: Standard_D4ds_v5
+  - name: build2019containerd
+    displayName: Build 2019 containerd
+    type: boolean
+    default: True
+  - name: build2022containerd
+    displayName: Build 2022 containerd
+    type: boolean
+    default: True
+  - name: build2022containerdgen2
+    displayName: Build 2022 containerd Gen 2
+    type: boolean
+    default: True
+  - name: build23H2
+    displayName: Build 23H2
+    type: boolean
+    default: True
+  - name: build23H2gen2
+    displayName: Build 23H2 Gen 2
+    type: boolean
+    default: True
+  - name: dryrun
+    displayName: Dry run
+    type: boolean
+    default: False
+  - name: vhddebug
+    displayName: VHD Debug
+    type: boolean
+    default: False
+  - name: skipExtensionCheck
+    displayName: Skip Extension Check
+    type: boolean
+    default: False
+  - name: installOpenSshServer
+    displayName: Install Open SSH Server
+    type: boolean
+    default: True
+  - name: buildVmSize
+    displayName: Build VM Size
+    type: string
+    default: Standard_D4ds_v5
+  - name: useOverrides
+    displayName: Use component overrides
+    type: boolean
+    default: false
+  - name: overrideBranch
+    displayName: Branch in aks-rp to use for overrides
+    type: string
+    default: master
 
 # Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build"
 # Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build - PR check-in gate"
@@ -59,8 +71,11 @@ stages:
       dryrun: ${{ parameters.dryrun }}
       buildVmSize: ${{ parameters.buildVmSize }}
       build2019containerd: ${{ parameters.build2019containerd }}
-      build2022containerd:  ${{ parameters.build2022containerd }}
-      build2022containerdgen2:  ${{ parameters.build2022containerdgen2 }}
-      build23H2:  ${{ parameters.build23H2 }}
-      build23H2gen2:  ${{ parameters.build23H2gen2 }}
+      build2022containerd: ${{ parameters.build2022containerd }}
+      build2022containerdgen2: ${{ parameters.build2022containerdgen2 }}
+      build23H2: ${{ parameters.build23H2 }}
+      build23H2gen2: ${{ parameters.build23H2gen2 }}
       skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
+      installOpenSshServer: ${{ parameters.installOpenSshServer }}
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
diff --git a/.pipelines/.vsts-vhd-builder-release.yaml b/.pipelines/.vsts-vhd-builder-release.yaml
@@ -160,7 +160,7 @@ parameters:
   - name: build2404cvmgen2containerd
     displayName: Build 2404 CVM Gen2 Containerd
     type: boolean
-    default: false
+    default: true
   - name: build2404gen2containerd
     displayName: Build 2404 Gen2 Containerd
     type: boolean
@@ -1156,7 +1156,7 @@ stages:
               echo '##vso[task.setvariable variable=IMG_VERSION]latest'
               echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
               echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DC16ads_v5'
-              echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
+              echo '##vso[task.setvariable variable=FEATURE_FLAGS]cvm'
               echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
               echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
               echo '##vso[task.setvariable variable=ENABLE_FIPS]False'
@@ -1234,7 +1234,7 @@ stages:
               echo '##vso[task.setvariable variable=IMG_VERSION]latest'
               echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
               echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DC16ads_v5'
-              echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
+              echo '##vso[task.setvariable variable=FEATURE_FLAGS]cvm'
               echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
               echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
               echo '##vso[task.setvariable variable=ENABLE_FIPS]False'

diff --git a/.pipelines/.vsts-vhd-builder.yaml b/.pipelines/.vsts-vhd-builder.yaml
@@ -7,20 +7,24 @@ pr:
     - dev
   paths:
     include:
-    - schemas
+    - schemas/
     - vhdbuilder/packer
     - vhdbuilder/scripts/linux
     - .pipelines/.vsts-vhd-builder.yaml
     - .pipelines/templates/.builder-release-template.yaml
+    - .pipelines/templates/.template-override-components-json.yaml
+    - .pipelines/templates/.template-copy-file.yaml
     - .pipelines/templates/e2e-template.yaml
     - parts/linux/*
     - packer.mk
     - aks-node-controller/**
     - parts/common/components.json
     exclude:
+    - schemas/windows_settings.cue
     - vhdbuilder/release-notes
     - vhdbuilder/packer/*.ps1
     - vhdbuilder/packer/**/*.ps1
+    - vhdbuilder/packer/windows/
     - vhdbuilder/packer/*windows*
     - vhdbuilder/packer/**/*windows*
     - /**/*.md