Add support for Windows OVS Containerisation in Install-OVS script

docs/windows.md

@@ -23,6 +23,7 @@ The following components should be configured and run on the Windows Node.
 
 antrea-agent and kube-proxy run as processes on host and are managed by
 management Pods. It is recommended to run OVS daemons as Windows services.
+We also support running OVS processes inside container.
 If you don't want to run antrea-agent and kube-proxy from the management Pods
 Antrea also provides scripts which help install and run these two components
 directly without Pod, please see [Manually run kube-proxy and antrea-agent on Windows worker Nodes](#Manually-run-kube-proxy-and-antrea-agent-on-Windows-worker-Nodes)
@@ -302,6 +303,14 @@ get-service ovsdb-server
 get-service ovs-vswitchd
 ```
 
+If you want to containerise OVS for containerd runtime, OVS userspace processes is
+not required on host and hence you can use the `InstallUserspace` parameter
+as false.
+
+```powershell
+.\Install-OVS.ps1 -InstallUserspace $false
+```
+
 #### 2. Disable Windows Firewall
 
 ```powershell

hack/windows/Install-OVS.ps1

@@ -21,20 +21,25 @@
   .PARAMETER ImportCertificate
   Specifies if a certificate file is needed for OVS package. If true, certificate
   will be retrieved from OVSExt.sys and a package.cer file will be generated.
+
+  .PARAMETER InstallUserspace
+  Specifies whether OVS userspace processes are included in the installation. If false, these processes will not 
+  be installed as Windows service on the host.
 #>
 Param(
     [parameter(Mandatory = $false)] [string] $DownloadDir,
     [parameter(Mandatory = $false)] [string] $DownloadURL,
     [parameter(Mandatory = $false)] [string] $OVSInstallDir = "C:\openvswitch",
     [parameter(Mandatory = $false)] [bool] $CheckFileHash = $true,
     [parameter(Mandatory = $false)] [string] $LocalFile,
-    [parameter(Mandatory = $false)] [bool] $ImportCertificate = $true
+    [parameter(Mandatory = $false)] [bool] $ImportCertificate = $true,
+    [parameter(Mandatory = $false)] [bool] $InstallUserspace = $true
 )
 
 $ErrorActionPreference = "Stop"
-$OVSDownloadURL = "https://downloads.antrea.io/ovs/ovs-2.16.7-antrea.0-win64.zip"
+$OVSDownloadURL = "https://downloads.antrea.io/ovs/ovs-3.0.5-antrea.0-win64.zip"
 # Use a SHA256 hash to ensure that the downloaded archive is correct.
-$OVSPublishedHash = '17d23ca0fbf84e1eac9a392f67ee4315edffd1d5233a729655e04e1332a9f565'
+$OVSPublishedHash = 'fd27703ef7314b26b98cffb7aea27d569530ebd3ac3c98daa981ca2654373032'
 $WorkDir = [System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition)
 $OVSDownloadDir = $WorkDir
 $PowerShellModuleBase = "C:\Windows\System32\WindowsPowerShell\v1.0\Modules"
@@ -259,8 +264,10 @@ DownloadOVS
 
 InstallOVS
 
-InstallDependency
+if ($InstallUserspace -eq $true) {
+    InstallDependency
 
-ConfigOVS
+    ConfigOVS
+} 
 
 Log "OVS Installation Complete!"

hack/windows/Prepare-Node.ps1

@@ -22,6 +22,10 @@ Install OVS
 .PARAMETER NodeIP
 The node ip used by kubelet
 
+.PARAMETER InstallOVSUserspace
+Specifies whether OVS userspace processes is included in the installation. If false, these processes will not 
+be installed as Windows service on the host.
+
 .EXAMPLE
 PS> .\Prepare-Node.ps1 -KubernetesVersion v1.18.0 -InstallOVS -NodeIP 192.168.1.10
 
@@ -32,6 +36,7 @@ Param(
     [parameter(Mandatory = $true, HelpMessage="Node IP")] [string] $NodeIP,
     [parameter(Mandatory = $false)] [switch] $InstallOVS = $false,
     [parameter(Mandatory = $false, HelpMessage="Kubernetes download")] [string] $KubernetesURL="dl.k8s.io"
+    [parameter(Mandatory = $false)] [bool] $InstallOVSUserspace = $true 
 )
 $ErrorActionPreference = 'Stop'
 
@@ -127,5 +132,5 @@ New-NetFirewallRule -Name kubelet -DisplayName 'kubelet' -Enabled True -Directio
 
 if ($InstallOVS) {
     Write-Host "Installing OVS"
-    & .\Install-OVS.ps1
+    & .\Install-OVS.ps1 -InstallUserspace $InstallOVSUserspace
 }