fix: disable docker when containerD is specified (#4282)

* Disable docker when containerd is enabled * Set nssm DependOnService when depending service exists * Add generated code * Kubelet should depend on container runtime service * Remove unnecessary check * Resolve comments
Azure · Mar 24, 2021 · 41a716a · 41a716a
1 parent c316d27
commit 41a716a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/parts/k8s/kuberneteswindowssetup.ps1 b/parts/k8s/kuberneteswindowssetup.ps1
@@ -406,7 +406,8 @@ try
         New-ExternalHnsNetwork -IsDualStackEnabled $global:IsDualStackEnabled
 
         Install-KubernetesServices `
-            -KubeDir $global:KubeDir
+            -KubeDir $global:KubeDir `
+            -ContainerRuntime $global:ContainerRuntime
 
         Get-LogCollectionScripts
 

diff --git a/parts/k8s/windowskubeletfunc.ps1 b/parts/k8s/windowskubeletfunc.ps1
@@ -315,10 +315,12 @@ New-NSSMService {
         $KubeletStartFile,
         [string]
         [Parameter(Mandatory = $true)]
-        $KubeProxyStartFile
+        $KubeProxyStartFile,
+        [Parameter(Mandatory = $false)][string]
+        $ContainerRuntime = "docker"
     )
 
-    $kubeletDependOnServices = "docker"
+    $kubeletDependOnServices = $ContainerRuntime
     if ($global:EnableCsiProxy) {
         $kubeletDependOnServices += " csi-proxy"
     }
@@ -373,7 +375,9 @@ function
 Install-KubernetesServices {
     param(
         [Parameter(Mandatory = $true)][string]
-        $KubeDir
+        $KubeDir,
+        [Parameter(Mandatory = $false)][string]
+        $ContainerRuntime = "docker"
     )
 
     # TODO ksbrmnn fix callers to this function
@@ -383,5 +387,6 @@ Install-KubernetesServices {
 
     New-NSSMService -KubeDir $KubeDir `
         -KubeletStartFile $KubeletStartFile `
-        -KubeProxyStartFile $KubeProxyStartFile
+        -KubeProxyStartFile $KubeProxyStartFile `
+        -ContainerRuntime $ContainerRuntime
 }
diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
diff --git a/vhd/packer/configure-windows-vhd.ps1 b/vhd/packer/configure-windows-vhd.ps1
@@ -331,10 +331,10 @@ switch ($env:ProvisioningPhase) {
     "2" {
         Write-Log "Performing actions for provisioning phase 2 for container runtime '$containerRuntime'"
         Set-WinRmServiceAutoStart
-        # TODO: make decision on if we want to install docker along with containerd (will need to update CSE too,)
-        Install-Docker
         if ($containerRuntime -eq 'containerd') {
             Install-ContainerD
+        } else {
+            Install-Docker
         }
         Update-Registry
         Get-ContainerImages -containerRuntime $containerRuntime -WindowsServerVersion $windowsServerVersion