From 200b75032863404c4531f8fc6121d1afcea9610f Mon Sep 17 00:00:00 2001
From: Christina Lau <christinalau@microsoft.com>
Date: Thu, 24 Oct 2024 09:35:22 -0700
Subject: [PATCH 1/4] chore: update containerd to v1.6.35 and runc to v1.1.13

---
 parts/k8s/cloud-init/artifacts/cse_install.sh | 4 ++--
 parts/k8s/kubernetesparams.t                  | 5 +++--
 pkg/api/const.go                              | 4 ++--
 pkg/api/defaults_test.go                      | 4 ++--
 pkg/api/vlabs/validate.go                     | 2 +-
 pkg/api/vlabs/validate_test.go                | 2 +-
 vhd/packer/configure-windows-vhd-phase1.ps1   | 2 +-
 vhd/packer/configure-windows-vhd-phase2.ps1   | 2 +-
 vhd/packer/configure-windows-vhd.ps1          | 2 +-
 vhd/packer/install-dependencies.sh            | 2 +-
 10 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh
index cc8ae382b..e3a2538c8 100755
--- a/parts/k8s/cloud-init/artifacts/cse_install.sh
+++ b/parts/k8s/cloud-init/artifacts/cse_install.sh
@@ -108,8 +108,8 @@ installRunc() {
   local v
   local url
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.1.12" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.1.12* --allow-downgrades || exit 27
+  if [[ $v != "1.1.13" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.1.13* --allow-downgrades || exit 27
   fi
 }
 installMoby() {
diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t
index a5ddac8c5..7b3d31670 100644
--- a/parts/k8s/kubernetesparams.t
+++ b/parts/k8s/kubernetesparams.t
@@ -239,7 +239,7 @@
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.6.28",
+      "defaultValue": "1.6.35",
       "metadata": {
         "description": "The Azure containerd build version"
       },
@@ -262,7 +262,8 @@
          "1.5.13",
          "1.5.16",
          "1.6.21",
-         "1.6.28"
+         "1.6.28",
+         "1.6.35"
        ],
       "type": "string"
     },
diff --git a/pkg/api/const.go b/pkg/api/const.go
index 7379dfed9..1925bf2da 100644
--- a/pkg/api/const.go
+++ b/pkg/api/const.go
@@ -448,7 +448,7 @@ const (
 	// DefaultMobyVersion specifies the default Azure build version of Moby to install.
 	DefaultMobyVersion = "20.10.14"
 	// DefaultContainerdVersion specifies the default containerd version to install.
-	DefaultContainerdVersion = "1.6.28"
+	DefaultContainerdVersion = "1.6.35"
 	// DefaultDockerBridgeSubnet specifies the default subnet for the docker bridge network for masters and agents.
 	DefaultDockerBridgeSubnet = "172.17.0.1/16"
 	// DefaultKubernetesMaxPodsKubenet is the maximum number of pods to run on a node for Kubenet.
@@ -470,7 +470,7 @@ const (
 	// DefaultWindowsSSHEnabled is the default windowsProfile.sshEnabled value
 	DefaultWindowsSSHEnabled = true
 	// DefaultWindowsContainerdURL is the URL for the default containerd package on Windows
-	DefaultWindowsContainerdURL = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.28+azure/windows/windows_amd64/moby-containerd-1.6.28+azure-u1.amd64.zip"
+	DefaultWindowsContainerdURL = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
 )
 
 // WindowsProfile defaults
diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go
index 186b270ce..690773f1c 100644
--- a/pkg/api/defaults_test.go
+++ b/pkg/api/defaults_test.go
@@ -6179,9 +6179,9 @@ func ExampleContainerService_setOrchestratorDefaults() {
 
 	// Output:
 	// level=warning msg="Moby will be upgraded to version 20.10.14\n"
-	// level=warning msg="containerd will be upgraded to version 1.6.28\n"
+	// level=warning msg="containerd will be upgraded to version 1.6.35\n"
 	// level=warning msg="Any new nodes will have Moby version 20.10.14\n"
-	// level=warning msg="Any new nodes will have containerd version 1.6.28\n"
+	// level=warning msg="Any new nodes will have containerd version 1.6.35\n"
 }
 
 func TestCombineValues(t *testing.T) {
diff --git a/pkg/api/vlabs/validate.go b/pkg/api/vlabs/validate.go
index 81c2bf852..0a243b740 100644
--- a/pkg/api/vlabs/validate.go
+++ b/pkg/api/vlabs/validate.go
@@ -38,7 +38,7 @@ var (
 		"3.1.0", "3.1.1", "3.1.2", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7", "3.1.8", "3.1.9", "3.1.10",
 		"3.2.0", "3.2.1", "3.2.2", "3.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9", "3.2.11", "3.2.12",
 		"3.2.13", "3.2.14", "3.2.15", "3.2.16", "3.2.23", "3.2.24", "3.2.25", "3.2.26", "3.3.0", "3.3.1", "3.3.8", "3.3.9", "3.3.10", "3.3.13", "3.3.15", "3.3.18", "3.3.19", "3.3.22", "3.3.25"}
-	containerdValidVersions              = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.4.4", "1.4.6", "1.4.7", "1.4.8", "1.4.9", "1.4.11", "1.5.11", "1.5.13", "1.5.16", "1.6.21", "1.6.28"}
+	containerdValidVersions              = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.4.4", "1.4.6", "1.4.7", "1.4.8", "1.4.9", "1.4.11", "1.5.11", "1.5.13", "1.5.16", "1.6.21", "1.6.28", "1.6.35"}
 	kubernetesImageBaseTypeValidVersions = [...]string{"", common.KubernetesImageBaseTypeGCR, common.KubernetesImageBaseTypeMCR}
 	cachingTypesValidValues              = [...]string{"", string(compute.CachingTypesNone), string(compute.CachingTypesReadWrite), string(compute.CachingTypesReadOnly)}
 	linuxEth0MTUAllowedValues            = [...]int{1500, 3900}
diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
index dc18a6cd2..7cde4f111 100644
--- a/pkg/api/vlabs/validate_test.go
+++ b/pkg/api/vlabs/validate_test.go
@@ -63,7 +63,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 					},
 				},
 			},
-			expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9 1.4.4 1.4.6 1.4.7 1.4.8 1.4.9 1.4.11 1.5.11 1.5.13 1.5.16 1.6.21 1.6.28]",
+			expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9 1.4.4 1.4.6 1.4.7 1.4.8 1.4.9 1.4.11 1.5.11 1.5.13 1.5.16 1.6.21 1.6.28 1.6.35]",
 		},
 		"should error when KubernetesConfig has containerdVersion value for docker container runtime": {
 			properties: &Properties{
diff --git a/vhd/packer/configure-windows-vhd-phase1.ps1 b/vhd/packer/configure-windows-vhd-phase1.ps1
index f116df5df..c2e5f15df 100644
--- a/vhd/packer/configure-windows-vhd-phase1.ps1
+++ b/vhd/packer/configure-windows-vhd-phase1.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 
 filter Timestamp { "$(Get-Date -Format o): $_" }
 
-$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.28+azure/windows/windows_amd64/moby-containerd-1.6.28+azure-u1.amd64.zip"
+$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
 
 function Write-Log($Message) {
     $msg = $message | Timestamp
diff --git a/vhd/packer/configure-windows-vhd-phase2.ps1 b/vhd/packer/configure-windows-vhd-phase2.ps1
index 72510d551..45c86b334 100644
--- a/vhd/packer/configure-windows-vhd-phase2.ps1
+++ b/vhd/packer/configure-windows-vhd-phase2.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 
 filter Timestamp { "$(Get-Date -Format o): $_" }
 
-$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.28+azure/windows/windows_amd64/moby-containerd-1.6.28+azure-u1.amd64.zip"
+$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
 
 function Write-Log($Message) {
     $msg = $message | Timestamp
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
index 770b0eb71..727e920c4 100644
--- a/vhd/packer/configure-windows-vhd.ps1
+++ b/vhd/packer/configure-windows-vhd.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 
 filter Timestamp { "$(Get-Date -Format o): $_" }
 
-$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.28+azure/windows/windows_amd64/moby-containerd-1.6.28+azure-u1.amd64.zip"
+$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
 
 function Write-Log($Message) {
     $msg = $message | Timestamp
diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
index 0c83124d7..9bf7fa0ac 100644
--- a/vhd/packer/install-dependencies.sh
+++ b/vhd/packer/install-dependencies.sh
@@ -78,7 +78,7 @@ installBpftrace
 echo "  - bpftrace" >> ${VHD_LOGS_FILEPATH}
 
 MOBY_VERSION="20.10.14"
-CONTAINERD_VERSION="1.6.28"
+CONTAINERD_VERSION="1.6.35"
 installMoby
 installRunc
 systemctl_restart 100 5 30 docker || exit 1

From 9f11b3be4d61317ad5a012decdfff047582ebdd7 Mon Sep 17 00:00:00 2001
From: Christina Lau <christinalau@microsoft.com>
Date: Thu, 24 Oct 2024 09:41:46 -0700
Subject: [PATCH 2/4] Generate template

---
 pkg/engine/templates_generated.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
index b051ffd9e..4bc668e53 100644
--- a/pkg/engine/templates_generated.go
+++ b/pkg/engine/templates_generated.go
@@ -16783,8 +16783,8 @@ installRunc() {
   local v
   local url
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.1.12" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.1.12* --allow-downgrades || exit 27
+  if [[ $v != "1.1.13" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.1.13* --allow-downgrades || exit 27
   fi
 }
 installMoby() {
@@ -20368,7 +20368,7 @@ var _k8sKubernetesparamsT = []byte(`    "etcdServerCertificate": {
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.6.28",
+      "defaultValue": "1.6.35",
       "metadata": {
         "description": "The Azure containerd build version"
       },
@@ -20391,7 +20391,8 @@ var _k8sKubernetesparamsT = []byte(`    "etcdServerCertificate": {
          "1.5.13",
          "1.5.16",
          "1.6.21",
-         "1.6.28"
+         "1.6.28",
+         "1.6.35"
        ],
       "type": "string"
     },

From fc9aba276c98f02d7960d3255393cc6a41d71231 Mon Sep 17 00:00:00 2001
From: Christina Lau <christinalau@microsoft.com>
Date: Thu, 24 Oct 2024 10:32:24 -0700
Subject: [PATCH 3/4] chore: update containerd to v1.6.36 and runc to v1.1.14

---
 parts/k8s/cloud-init/artifacts/cse_install.sh | 4 ++--
 parts/k8s/kubernetesparams.t                  | 4 ++--
 pkg/api/const.go                              | 4 ++--
 pkg/api/defaults_test.go                      | 4 ++--
 pkg/api/vlabs/validate.go                     | 2 +-
 pkg/api/vlabs/validate_test.go                | 2 +-
 vhd/packer/configure-windows-vhd-phase1.ps1   | 2 +-
 vhd/packer/configure-windows-vhd-phase2.ps1   | 2 +-
 vhd/packer/configure-windows-vhd.ps1          | 2 +-
 vhd/packer/install-dependencies.sh            | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh
index e3a2538c8..ca2468106 100755
--- a/parts/k8s/cloud-init/artifacts/cse_install.sh
+++ b/parts/k8s/cloud-init/artifacts/cse_install.sh
@@ -108,8 +108,8 @@ installRunc() {
   local v
   local url
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.1.13" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.1.13* --allow-downgrades || exit 27
+  if [[ $v != "1.1.14" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.1.14* --allow-downgrades || exit 27
   fi
 }
 installMoby() {
diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t
index 7b3d31670..dfc43d614 100644
--- a/parts/k8s/kubernetesparams.t
+++ b/parts/k8s/kubernetesparams.t
@@ -239,7 +239,7 @@
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.6.35",
+      "defaultValue": "1.6.36",
       "metadata": {
         "description": "The Azure containerd build version"
       },
@@ -263,7 +263,7 @@
          "1.5.16",
          "1.6.21",
          "1.6.28",
-         "1.6.35"
+         "1.6.36"
        ],
       "type": "string"
     },
diff --git a/pkg/api/const.go b/pkg/api/const.go
index 1925bf2da..9c581b8eb 100644
--- a/pkg/api/const.go
+++ b/pkg/api/const.go
@@ -448,7 +448,7 @@ const (
 	// DefaultMobyVersion specifies the default Azure build version of Moby to install.
 	DefaultMobyVersion = "20.10.14"
 	// DefaultContainerdVersion specifies the default containerd version to install.
-	DefaultContainerdVersion = "1.6.35"
+	DefaultContainerdVersion = "1.6.36"
 	// DefaultDockerBridgeSubnet specifies the default subnet for the docker bridge network for masters and agents.
 	DefaultDockerBridgeSubnet = "172.17.0.1/16"
 	// DefaultKubernetesMaxPodsKubenet is the maximum number of pods to run on a node for Kubenet.
@@ -470,7 +470,7 @@ const (
 	// DefaultWindowsSSHEnabled is the default windowsProfile.sshEnabled value
 	DefaultWindowsSSHEnabled = true
 	// DefaultWindowsContainerdURL is the URL for the default containerd package on Windows
-	DefaultWindowsContainerdURL = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
+	DefaultWindowsContainerdURL = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"
 )
 
 // WindowsProfile defaults
diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go
index 690773f1c..3b311fdfd 100644
--- a/pkg/api/defaults_test.go
+++ b/pkg/api/defaults_test.go
@@ -6179,9 +6179,9 @@ func ExampleContainerService_setOrchestratorDefaults() {
 
 	// Output:
 	// level=warning msg="Moby will be upgraded to version 20.10.14\n"
-	// level=warning msg="containerd will be upgraded to version 1.6.35\n"
+	// level=warning msg="containerd will be upgraded to version 1.6.36\n"
 	// level=warning msg="Any new nodes will have Moby version 20.10.14\n"
-	// level=warning msg="Any new nodes will have containerd version 1.6.35\n"
+	// level=warning msg="Any new nodes will have containerd version 1.6.36\n"
 }
 
 func TestCombineValues(t *testing.T) {
diff --git a/pkg/api/vlabs/validate.go b/pkg/api/vlabs/validate.go
index 0a243b740..a578f0c94 100644
--- a/pkg/api/vlabs/validate.go
+++ b/pkg/api/vlabs/validate.go
@@ -38,7 +38,7 @@ var (
 		"3.1.0", "3.1.1", "3.1.2", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7", "3.1.8", "3.1.9", "3.1.10",
 		"3.2.0", "3.2.1", "3.2.2", "3.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9", "3.2.11", "3.2.12",
 		"3.2.13", "3.2.14", "3.2.15", "3.2.16", "3.2.23", "3.2.24", "3.2.25", "3.2.26", "3.3.0", "3.3.1", "3.3.8", "3.3.9", "3.3.10", "3.3.13", "3.3.15", "3.3.18", "3.3.19", "3.3.22", "3.3.25"}
-	containerdValidVersions              = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.4.4", "1.4.6", "1.4.7", "1.4.8", "1.4.9", "1.4.11", "1.5.11", "1.5.13", "1.5.16", "1.6.21", "1.6.28", "1.6.35"}
+	containerdValidVersions              = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9", "1.4.4", "1.4.6", "1.4.7", "1.4.8", "1.4.9", "1.4.11", "1.5.11", "1.5.13", "1.5.16", "1.6.21", "1.6.28", "1.6.36"}
 	kubernetesImageBaseTypeValidVersions = [...]string{"", common.KubernetesImageBaseTypeGCR, common.KubernetesImageBaseTypeMCR}
 	cachingTypesValidValues              = [...]string{"", string(compute.CachingTypesNone), string(compute.CachingTypesReadWrite), string(compute.CachingTypesReadOnly)}
 	linuxEth0MTUAllowedValues            = [...]int{1500, 3900}
diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
index 7cde4f111..b83259ff6 100644
--- a/pkg/api/vlabs/validate_test.go
+++ b/pkg/api/vlabs/validate_test.go
@@ -63,7 +63,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 					},
 				},
 			},
-			expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9 1.4.4 1.4.6 1.4.7 1.4.8 1.4.9 1.4.11 1.5.11 1.5.13 1.5.16 1.6.21 1.6.28 1.6.35]",
+			expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9 1.4.4 1.4.6 1.4.7 1.4.8 1.4.9 1.4.11 1.5.11 1.5.13 1.5.16 1.6.21 1.6.28 1.6.36]",
 		},
 		"should error when KubernetesConfig has containerdVersion value for docker container runtime": {
 			properties: &Properties{
diff --git a/vhd/packer/configure-windows-vhd-phase1.ps1 b/vhd/packer/configure-windows-vhd-phase1.ps1
index c2e5f15df..6d2cc91d5 100644
--- a/vhd/packer/configure-windows-vhd-phase1.ps1
+++ b/vhd/packer/configure-windows-vhd-phase1.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 
 filter Timestamp { "$(Get-Date -Format o): $_" }
 
-$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
+$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"
 
 function Write-Log($Message) {
     $msg = $message | Timestamp
diff --git a/vhd/packer/configure-windows-vhd-phase2.ps1 b/vhd/packer/configure-windows-vhd-phase2.ps1
index 45c86b334..8b6e619fa 100644
--- a/vhd/packer/configure-windows-vhd-phase2.ps1
+++ b/vhd/packer/configure-windows-vhd-phase2.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 
 filter Timestamp { "$(Get-Date -Format o): $_" }
 
-$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
+$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"
 
 function Write-Log($Message) {
     $msg = $message | Timestamp
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
index 727e920c4..5996b7fdc 100644
--- a/vhd/packer/configure-windows-vhd.ps1
+++ b/vhd/packer/configure-windows-vhd.ps1
@@ -12,7 +12,7 @@ $ErrorActionPreference = "Stop"
 
 filter Timestamp { "$(Get-Date -Format o): $_" }
 
-$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.35+azure/windows/windows_amd64/moby-containerd-1.6.35+azure-u1.amd64.zip"
+$global:containerdPackageUrl = "https://mobyartifacts.azureedge.net/moby/moby-containerd/1.6.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"
 
 function Write-Log($Message) {
     $msg = $message | Timestamp
diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
index 9bf7fa0ac..dce8b8c11 100644
--- a/vhd/packer/install-dependencies.sh
+++ b/vhd/packer/install-dependencies.sh
@@ -78,7 +78,7 @@ installBpftrace
 echo "  - bpftrace" >> ${VHD_LOGS_FILEPATH}
 
 MOBY_VERSION="20.10.14"
-CONTAINERD_VERSION="1.6.35"
+CONTAINERD_VERSION="1.6.36"
 installMoby
 installRunc
 systemctl_restart 100 5 30 docker || exit 1

From c06822b23d32784b31e46577d0f1c8b7ae67b3e9 Mon Sep 17 00:00:00 2001
From: Christina Lau <christinalau@microsoft.com>
Date: Thu, 24 Oct 2024 10:37:36 -0700
Subject: [PATCH 4/4] Generate template

---
 pkg/engine/templates_generated.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
index 4bc668e53..2289e8bfe 100644
--- a/pkg/engine/templates_generated.go
+++ b/pkg/engine/templates_generated.go
@@ -16783,8 +16783,8 @@ installRunc() {
   local v
   local url
   v=$(runc --version | head -n 1 | cut -d" " -f3)
-  if [[ $v != "1.1.13" ]]; then
-    apt_get_install 20 30 120 moby-runc=1.1.13* --allow-downgrades || exit 27
+  if [[ $v != "1.1.14" ]]; then
+    apt_get_install 20 30 120 moby-runc=1.1.14* --allow-downgrades || exit 27
   fi
 }
 installMoby() {
@@ -20368,7 +20368,7 @@ var _k8sKubernetesparamsT = []byte(`    "etcdServerCertificate": {
       "type": "string"
     },
     "containerdVersion": {
-      "defaultValue": "1.6.35",
+      "defaultValue": "1.6.36",
       "metadata": {
         "description": "The Azure containerd build version"
       },
@@ -20392,7 +20392,7 @@ var _k8sKubernetesparamsT = []byte(`    "etcdServerCertificate": {
          "1.5.16",
          "1.6.21",
          "1.6.28",
-         "1.6.35"
+         "1.6.36"
        ],
       "type": "string"
     },