From ec4c09d0767003a7c85cd215833de08777782f98 Mon Sep 17 00:00:00 2001 From: chuhua Date: Thu, 4 Apr 2024 00:33:48 +0000 Subject: [PATCH 1/4] chore: patch image cves --- vhdbuilder/packer/components.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index 973ae11766e..e4f3f452543 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -92,7 +92,8 @@ "multiArchVersions": [ "v1.3.4-1", "v1.4.1", - "v1.4.2" + "v1.4.2", + "v1.4.2-1" ] }, { @@ -207,10 +208,10 @@ "downloadURL": "mcr.microsoft.com/oss/cilium/cilium:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "1.13.10-1", "1.13.10-2", - "1.14.4", - "1.14.4-1" + "1.13.10-3", + "1.14.4-1", + "1.14.4-3" ] }, { @@ -264,9 +265,12 @@ "downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "v1.26.11", + "v1.26.11-2", + "v1.26.11-3", "v1.28.9", + "v1.28.9-1", "v1.29.3", + "v1.29.3-1", "v1.29.4", "v1.30.0", "v1.30.1" @@ -277,6 +281,7 @@ "amd64OnlyVersions": [], "multiArchVersions": [ "v1.22.5-3", + "v1.22.5-4", "v1.22.6", "v1.23.3", "v1.23.4", @@ -396,4 +401,4 @@ "targetContainerRuntime": "containerd" } ] -} +} \ No newline at end of file From 77534a702e51205e1ed5f76560304f29190e7ad1 Mon Sep 17 00:00:00 2001 From: Chudi Huang Date: Sun, 7 Apr 2024 18:23:51 +0000 Subject: [PATCH 2/4] chore: remove patches for deprecating k8s version --- vhdbuilder/packer/components.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index e4f3f452543..842418f070e 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -266,7 +266,6 @@ "amd64OnlyVersions": [], "multiArchVersions": [ "v1.26.11-2", - "v1.26.11-3", "v1.28.9", "v1.28.9-1", "v1.29.3", From 64fb28db2ed6a75baf263cca572d8c86b4756fc0 Mon Sep 17 00:00:00 2001 From: Chudi Huang Date: Sun, 7 Apr 2024 18:25:17 +0000 Subject: [PATCH 3/4] chore: remove patches meant to be skipped --- vhdbuilder/packer/components.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index 842418f070e..8e9e993441d 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -269,7 +269,6 @@ "v1.28.9", "v1.28.9-1", "v1.29.3", - "v1.29.3-1", "v1.29.4", "v1.30.0", "v1.30.1" From 41f1d1d97c04a0a7e9acffa18ae3faa2466c4dbd Mon Sep 17 00:00:00 2001 From: Chudi Huang Date: Mon, 8 Apr 2024 05:41:19 +0000 Subject: [PATCH 4/4] chore: remove unintented patch verssions --- vhdbuilder/packer/components.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index 8e9e993441d..ce2a49c6c08 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -265,7 +265,6 @@ "downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "v1.26.11-2", "v1.28.9", "v1.28.9-1", "v1.29.3",