From 3a9d63f8380a619c924364d0548cf9fa7d3a13cc Mon Sep 17 00:00:00 2001
From: Kalya Subramanian <kasubra@microsoft.com>
Date: Wed, 25 Mar 2020 15:19:41 -0700
Subject: [PATCH] generate

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

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
index f41bf4af7dc..e654785041d 100644
--- a/pkg/engine/templates_generated.go
+++ b/pkg/engine/templates_generated.go
@@ -39821,7 +39821,13 @@ try
         if ($useContainerD) {
             Write-Log "Installing ContainerD"
             $containerdTimer = [System.Diagnostics.Stopwatch]::StartNew()
-            Install-Containerd -ContainerdUrl $global:ContainerdUrl
+            $cniBinPath = $global:AzureCNIBinDir
+            $cniConfigPath = $global:AzureCNIConfDir
+            if ($global:NetworkPlugin -eq "kubenet") {
+                $cniBinPath = $global:CNIPath
+                $cniConfigPath = $global:CNIConfigPath
+            }
+            Install-Containerd -ContainerdUrl $global:ContainerdUrl -CNIBinPath $cniBinPath -CNIConfigPath $cniConfigPath
             $containerdTimer.Stop()
             $global:AppInsightsClient.TrackMetric("Install-ContainerD", $containerdTimer.Elapsed.TotalSeconds)
             # TODO: disable/uninstall Docker later
@@ -39941,7 +39947,6 @@ try
                     -AzureEnvironmentFilePath $([io.path]::Combine($global:KubeDir, "azurestackcloud.json")) ` + "`" + `
                     -IdentitySystem "{{ GetIdentitySystem }}"
             }
-            # To Check: Hopefully no change needed here for containerd
         }
         elseif ($global:NetworkPlugin -eq "kubenet") {
             Write-Log "Fetching additional files needed for kubenet"
@@ -40967,7 +40972,11 @@ function Install-Containerd
 {
     Param(
       [Parameter(Mandatory = $true)][string]
-      $ContainerdUrl
+      $ContainerdUrl,
+      [Parameter(Mandatory=$true)][string]
+      $CNIBinDir,
+      [Parameter(Mandatory=$true)][string]
+      $CNIConfDir
     )
     $zipfile =  [Io.path]::Combine($ENV:TEMP, "containerd.zip")
     DownloadFileOverHttp -Url $ContainerdUrl -DestinationPath $zipfile
@@ -40984,6 +40993,7 @@ function Install-Containerd
 
     # TODO: call containerd.exe dump config, then modify instead of starting with hardcoded
     $configFile = [Io.Path]::Combine($global:ContainerdInstallLocation, "config.toml")
+
     @"
 version = 2
 root = "C:\\ProgramData\\containerd\\root"
@@ -41071,8 +41081,8 @@ oom_score = 0
           runtime_root = ""
           privileged_without_host_devices = false
     [plugins."io.containerd.grpc.v1.cri".cni]
-      bin_dir = "C:\\k\\azurecni\\bin"
-      conf_dir = "C:\\k\\azurecni\\netconf"
+      bin_dir = "$(($CNIBinDir).Replace("\","//"))"
+      conf_dir = "$(($CNIConfDir).Replace("\","//"))"
       max_conf_num = 1
       conf_template = ""
     [plugins."io.containerd.grpc.v1.cri".registry]