From 30243bc9831da9edb8544e0a39c2be4a20be64ac Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 23 Feb 2024 07:48:38 +0000 Subject: [PATCH 1/4] chore: upgrade CSI driver versions in vhd image for AKS 1.29 only --- vhdbuilder/packer/components.json | 9 ++++++--- vhdbuilder/packer/generate-windows-vhd-configuration.ps1 | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index 3d0c7dde28d..d84b97625a3 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -247,7 +247,8 @@ "v1.28.5", "v1.28.6", "v1.29.2", - "v1.29.3" + "v1.29.3", + "v1.30.0" ] }, { @@ -259,7 +260,8 @@ "v1.28.7", "v1.28.8", "v1.29.2", - "v1.29.3" + "v1.29.3", + "v1.30.0" ] }, { @@ -271,7 +273,8 @@ "v1.22.4", "v1.22.5", "v1.23.2", - "v1.23.3" + "v1.23.3", + "v1.24.0" ] }, { diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 2a1c9fceb09..396776a8e56 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -81,7 +81,7 @@ $global:imagesToPull += @( "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.1.1-windows-hp", # for k8s 1.28.x "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.2-windows-hp", # for k8s 1.28.x "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.3-windows-hp", # for k8s 1.28.x - "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.24.11", # for k8s 1.25.x + "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.30.0-windows-hp", # for k8s 1.29.x "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.26.9", # for k8s 1.26.x "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.26.10", # for k8s 1.26.x "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.26.11", # for k8s 1.26.x @@ -91,6 +91,7 @@ $global:imagesToPull += @( "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.29.1-windows-hp", # for k8s 1.28.x "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.29.2-windows-hp", # for k8s 1.28.x "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.29.3-windows-hp", # for k8s 1.28.x + "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.30.0-windows-hp", # for k8s 1.29.x # Addon of Azure secrets store. Owner: jiashun0011 (Jiashun Liu) "mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.3.4", "mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:v1.4.0", From 258f6dde61271cc56a8bc65d57911caf09ed96d3 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 23 Feb 2024 11:06:25 +0000 Subject: [PATCH 2/4] chore: remove blob-csi image from vhd --- vhdbuilder/packer/components.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index d84b97625a3..bac5cdb35cd 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -273,8 +273,7 @@ "v1.22.4", "v1.22.5", "v1.23.2", - "v1.23.3", - "v1.24.0" + "v1.23.3" ] }, { From 2eadd11e1f8e2e63041f707aecf15e8e442e86a8 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 23 Feb 2024 12:59:24 +0000 Subject: [PATCH 3/4] chore: remove one blob csi driver image to save space --- vhdbuilder/packer/components.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index bac5cdb35cd..bdcd7b79467 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -268,7 +268,6 @@ "downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/blob-csi:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "v1.21.6", "v1.21.7", "v1.22.4", "v1.22.5", From 26c9ef275295a6d34463b99d75a8c692578c8d80 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Fri, 23 Feb 2024 14:33:32 +0000 Subject: [PATCH 4/4] chore: remove blob csi driver images in vhd to save space --- vhdbuilder/packer/components.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index bdcd7b79467..964fd73bead 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -269,9 +269,7 @@ "amd64OnlyVersions": [], "multiArchVersions": [ "v1.21.7", - "v1.22.4", "v1.22.5", - "v1.23.2", "v1.23.3" ] },