Merge branch 'master' into xinhl/kversion

Azure · Feb 24, 2025 · f37f807 · f37f807
2 parents ad475fc + 4fbb3da
commit f37f807
Show file tree

Hide file tree

Showing 28 changed files with 3,558 additions and 340 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -278,12 +278,6 @@
         "gaopenghigh"
       ]
     },
-    {
-      "matchPackageNames": [
-        "containernetworking/azure-ipam"
-      ],
-      "groupName": "azure-ipam"
-    },
     {
       "matchPackageNames": [
         "oss/kubernetes/azure-cloud-node-manager"

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,46 +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: installOpenSshServer
-  displayName: Install Open SSH Server
-  type: boolean
-  default: True
-- 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"
@@ -63,9 +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.yaml b/.pipelines/.vsts-vhd-builder.yaml
@@ -12,6 +12,8 @@ pr:
     - 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

diff --git a/.pipelines/templates/.build-and-test-windows-vhd-template.yaml b/.pipelines/templates/.build-and-test-windows-vhd-template.yaml
@@ -29,6 +29,9 @@ parameters:
   - name: hyperVGeneration
     type: string
     displayName: V1 or V2.
+  - name: architecture
+    type: string
+    displayName: CPU Architecture - X86_64 or ARM64
   - name: skipExtensionCheck
     displayName: Skip Extension Check
     type: boolean
@@ -46,6 +49,12 @@ parameters:
   - name: windowsCoreImageUrl
     displayName: Windows core base container image URL Override
     type: string
+  - name: overrideBranch
+    type: string
+    default: master
+  - name: useOverrides
+    displayName: Use component overrides
+    type: boolean
 
 stages:
   - stage: build_${{ parameters.stageName }}
@@ -55,25 +64,26 @@ stages:
     dependsOn: [ ]
     jobs:
       - job: build_${{ parameters.stageName }}
-        dependsOn: []
+        dependsOn: [ ]
         timeoutInMinutes: 180
         steps:
-          - bash: |
-              echo '##vso[task.setvariable variable=VHD_DEBUG]${{ parameters.vhddebug }}'
-              echo '##vso[task.setvariable variable=DRY_RUN]${{ parameters.dryrun }}'
-              echo '##vso[task.setvariable variable=HYPERV_GENERATION]${{ parameters.hyperVGeneration }}'
-              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]${{ parameters.buildVmSize }}'
-              echo '##vso[task.setvariable variable=WINDOWS_SKU]${{ parameters.windowsSku }}'
-              echo '##vso[task.setvariable variable=SKIP_EXTENSION_CHECK]${{ parameters.skipExtensionCheck }}'
-              echo '##vso[task.setvariable variable=INSTALL_OPEN_SSH_SERVER]${{ parameters.installOpenSshServer }}'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]${{ parameters.windowsBaseImageUrl }}'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]${{ parameters.windowsNanoImageUrl }}'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]${{ parameters.windowsCoreImageUrl }}'
-              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
-            displayName: Setup Build Variables
           - template: ./.builder-release-template-windows.yaml
             parameters:
               artifactName: ${{ parameters.artifactName }}
+              windowsSku: ${{ parameters.windowsSku }}
+              hyperVGeneration: ${{ parameters.hyperVGeneration }}
+              architecture: ${{ parameters.architecture }}
+              buildVmSize: ${{ parameters.buildVmSize }}
+              build: ${{ parameters.build }}
+              vhddebug: ${{ parameters.vhddebug }}
+              dryrun: ${{ parameters.dryrun }}
+              installOpenSshServer: ${{ parameters.installOpenSshServer }}
+              skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
+              windowsBaseImageUrl: ${{ parameters.windowsBaseImageUrl }}
+              windowsNanoImageUrl: ${{ parameters.windowsNanoImageUrl }}
+              windowsCoreImageUrl: ${{ parameters.windowsCoreImageUrl }}
+              overrideBranch: ${{ parameters.overrideBranch }}
+              useOverrides: ${{ parameters.useOverrides }}
 
   - stage: e2e_${{ parameters.stageName }}
     displayName: E2E (${{ parameters.artifactName }})

diff --git a/.pipelines/templates/.build-and-test-windows-vhds-template.yaml b/.pipelines/templates/.build-and-test-windows-vhds-template.yaml
@@ -33,15 +33,22 @@ parameters:
   - name: buildVmSize
     displayName: Build VM Size
     type: string
+  - name: overrideBranch
+    type: string
+    default: master
+  - name: useOverrides
+    displayName: Use component overrides
+    type: boolean
 
 stages:
-  - template:   ./.build-and-test-windows-vhd-template.yaml
+  - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
       stageName: win_2019_v1
       artifactName: 2019-containerd
       imageName: windows-2019-containerd
       windowsSku: 2019-containerd
       hyperVGeneration: V1
+      architecture: X86_64
       build: ${{ parameters.build2019containerd }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
@@ -51,14 +58,17 @@ stages:
       windowsBaseImageUrl: $(WINDOWS_2019_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2019_NANO_IMAGE_URL)
       windowsCoreImageUrl: $(WINDOWS_2019_CORE_IMAGE_URL)
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
 
-  - template:   ./.build-and-test-windows-vhd-template.yaml
+  - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
       stageName: win_2022_v1
       artifactName: 2022-containerd
       imageName: windows-2022-containerd
       windowsSku: 2022-containerd
       hyperVGeneration: V1
+      architecture: X86_64
       build: ${{ parameters.build2022containerd }}
       vhddebug: ${{ parameters.vhddebug }}
       dryrun: ${{ parameters.dryrun }}
@@ -68,14 +78,17 @@ stages:
       windowsBaseImageUrl: $(WINDOWS_2022_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
       windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
 
-  - template:   ./.build-and-test-windows-vhd-template.yaml
+  - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
       stageName: win_2022_v2
       artifactName: 2022-containerd-gen2
       imageName: windows-2022-containerd-gen2
       windowsSku: 2022-containerd-gen2
       hyperVGeneration: V2
+      architecture: X86_64
       buildVmSize: ${{ parameters.buildVmSize }}
       build: ${{ parameters.build2022containerdgen2 }}
       vhddebug: ${{ parameters.vhddebug }}
@@ -85,14 +98,17 @@ stages:
       windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
       windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
 
-  - template:   ./.build-and-test-windows-vhd-template.yaml
+  - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
       stageName: win_23H2_v1
       artifactName: 23H2
       imageName: windows-23H2
       windowsSku: 23H2
       hyperVGeneration: V1
+      architecture: X86_64
       buildVmSize: ${{ parameters.buildVmSize }}
       build: ${{ parameters.build23H2 }}
       vhddebug: ${{ parameters.vhddebug }}
@@ -102,6 +118,8 @@ stages:
       windowsBaseImageUrl: $(WINDOWS_23H2_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
       windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
 
   - template: ./.build-and-test-windows-vhd-template.yaml
     parameters:
@@ -110,6 +128,7 @@ stages:
       imageName: windows-23H2-gen2
       windowsSku: 23H2-gen2
       hyperVGeneration: V2
+      architecture: X86_64
       buildVmSize: ${{ parameters.buildVmSize }}
       build: ${{ parameters.build23H2gen2 }}
       vhddebug: ${{ parameters.vhddebug }}
@@ -119,9 +138,11 @@ stages:
       windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
       windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
       windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
+      overrideBranch: ${{ parameters.overrideBranch }}
+      useOverrides: ${{ parameters.useOverrides }}
 
   - stage: backfill_cleanup_outdated_resources
-    dependsOn: []
+    dependsOn: [ ]
     condition: always()
     jobs:
       - job: build