From 5a84571739183c3a5ac08c94cdbc9aaf0e9d0965 Mon Sep 17 00:00:00 2001 From: Nawaz Hussain Khazielakha Date: Fri, 26 Jul 2024 18:55:04 -0700 Subject: [PATCH] add 23h2-datacenter-core image as windows-annual-containerd - update packer/azure/, makefile - reuse annual channel for win offering - remove sig information from the container json --- images/capi/packer/azure/scripts/init-sig.sh | 2 +- .../packer/azure/windows-annual-containerd.json | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/images/capi/packer/azure/scripts/init-sig.sh b/images/capi/packer/azure/scripts/init-sig.sh index 447c11337c..b0ee80fd45 100755 --- a/images/capi/packer/azure/scripts/init-sig.sh +++ b/images/capi/packer/azure/scripts/init-sig.sh @@ -84,7 +84,7 @@ case ${SIG_TARGET} in create_image_definition ${SIG_TARGET} "win-2022-containerd" "V1" "Windows" ;; windows-annual-containerd) - create_image_definition ${SIG_TARGET} "win-annual-containerd" "V1" "Windows" + create_image_definition ${SIG_TARGET} "23h2-datacenter-core" "V1" "Windows" ;; windows-2019-containerd-cvm) SKU="windows-2019-cvm-containerd" diff --git a/images/capi/packer/azure/windows-annual-containerd.json b/images/capi/packer/azure/windows-annual-containerd.json index 8bfe24d57a..b8a4fadb7b 100644 --- a/images/capi/packer/azure/windows-annual-containerd.json +++ b/images/capi/packer/azure/windows-annual-containerd.json @@ -3,15 +3,14 @@ "additional_registry_images_list": "", "build_name": "windows-annual-containerd", "distribution": "windows", - "distribution_version": "annual", + "distribution_version": "23h2", + "distribution_release": "23h2-datacenter-core", + "image_offer": "WindowsServer", + "image_publisher": "MicrosoftWindowsServer", + "image_sku": "23h2-datacenter-core", + "image_version": "latest", "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": "",