Merge pull request kubernetes-sigs#1353 from jsturtevant/windows-annual

Add Windows Annual Channel target for Azure

docs/book/src/capi/windows/windows.md

@@ -78,3 +78,16 @@ To fix the issue on macOS is to set the no_proxy environment variable. Example:
 ```
 'no_proxy=* make build-azure-vhd-windows-2019'
 ```
+
+## Annual Channel
+The [Windows Server Annual](https://techcommunity.microsoft.com/t5/windows-server-news-and-best/windows-server-annual-channel-for-containers/ba-p/3866248) channel licensing  requires users to host their own image.  
+
+In Azure this can be uploaded to an [Azure SIG](https://learn.microsoft.com/en-us/azure/virtual-machines/azure-compute-gallery), and the following environment variables should be set to use the source [shared image gallery](https://developer.hashicorp.com/packer/integrations/hashicorp/azure/v1.4.5/components/builder/arm#shared-image-gallery).
+
+```
+export SOURCE_SIG_SUB_ID=<azure sub>
+export SOURCE_SIG_RESOURCE_GROUP=<resource group>
+export SOURCE_SIG_NAME=<sig name>
+export SOURCE_SIG_IMAGE_NAME=<image name>
+export SOURCE_SIG_IMAGE_VERSION=<image version>
+```

images/capi/Makefile

@@ -665,6 +665,7 @@ build-azure-vhd-rhel-8: ## Builds RHEL 8 VHD image for Azure
 build-azure-vhd-windows-2019: ## Builds for Windows Server 2019
 build-azure-vhd-windows-2019-containerd: ## Builds for Windows Server 2019 with containerd
 build-azure-vhd-windows-2022-containerd: ## Builds for Windows Server 2022 with containerd
+build-azure-sig-windows-annual-containerd: ## Builds for Windows Server Annual Channel with containerd
 build-azure-sig-centos-7-gen2: ## Builds CentOS Gen2 managed image in Shared Image Gallery
 build-azure-sig-mariner-2-gen2: ## Builds Mariner Gen2 managed image in Shared Image Gallery
 build-azure-sig-flatcar: ## Builds Flatcar Azure managed image in Shared Image Gallery
@@ -834,6 +835,7 @@ validate-azure-sig-ubuntu-2204: ## Validates Ubuntu 22.04 Azure managed image in
 validate-azure-sig-windows-2019: ## Validate Windows Server 2019 Azure managed image in Shared Image Gallery Packer config
 validate-azure-sig-windows-2019-containerd: ## Validate Windows Server 2019 with containerd Azure managed image in Shared Image Gallery Packer config
 validate-azure-sig-windows-2022-containerd: ## Validate Windows Server 2022 with containerd Azure managed image in Shared Image Gallery Packer config
+validate-azure-sig-windows-annual-containerd: ## Validate Windows Server Annual Channel with containerd Azure managed image in Shared Image Gallery Packer config
 validate-azure-vhd-centos-7: ## Validates CentOS 7 VHD image Azure Packer config
 validate-azure-vhd-mariner-2: ## Validates Mariner 2 VHD image Azure Packer config
 validate-azure-vhd-rhel-8: ## Validates RHEL 8 VHD image Azure Packer config

images/capi/packer/azure/scripts/init-sig.sh

@@ -76,6 +76,9 @@ case ${SIG_TARGET} in
   windows-2022-containerd)
     create_image_definition ${SIG_TARGET} "win-2022-containerd" "V1" "Windows"
   ;;
+  windows-annual-containerd)
+    create_image_definition ${SIG_TARGET} "win-annual-containerd" "V1" "Windows"
+  ;;
   windows-2019-containerd-cvm)
     SKU="windows-2019-cvm-containerd"
     create_image_definition ${SKU} ${SKU} "V2" "Windows" ${SECURITY_TYPE_CVM_SUPPORTED_FEATURE}

images/capi/packer/azure/windows-annual-containerd.json

@@ -0,0 +1,19 @@
+{
+  "additional_registry_images": "false",
+  "additional_registry_images_list": "",
+  "build_name": "windows-annual-containerd",
+  "distribution": "windows",
+  "distribution_version": "annual",
+  "load_additional_components": "false",
+  "runtime": "containerd",
+  "shared_image_gallery_name": "{{env `GALLERY_NAME`}}",
+  "source_sig_image_name": "{{env `SOURCE_SIG_IMAGE_NAME`}}",
+  "source_sig_image_version": "{{env `SOURCE_SIG_IMAGE_VERSION`}}",
+  "source_sig_name": "{{env `SOURCE_SIG_NAME`}}",
+  "source_sig_resource_group_name": "{{env `SOURCE_SIG_RESOURCE_GROUP`}}",
+  "source_sig_subscription_id": "{{env `SOURCE_SIG_SUB_ID`}}",
+  "storage_account_type": "Standard_LRS",
+  "vm_size": "Standard_D4s_v3",
+  "windows_updates_kbs": "",
+  "wins_url": ""
+}