github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99742 from ibabou/containerd-register

Browse Source 
Update gce Containerd initialization to handle the runtime existence case
This commit is contained in:
Kubernetes Prow Robot 2021-03-06 12:50:05 -08:00 committed by GitHub
commit b33b426dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -1569,11 +1569,24 @@ function Install_Containerd {
Remove-Item -Force -Recurse $tmp_dir Remove-Item -Force -Recurse $tmp_dir
} }
# Lookup the path of containerd config if exists, else returns a default.
function Get_Containerd_ConfigPath {
$service = Get-WMIObject -Class Win32_Service -Filter "Name='containerd'"
if (!($service -eq $null) -and
$service.PathName -match ".*\s--config\s*(\S+).*" -and
$matches.Length -eq 2) {
return $matches[1]
} else {
return 'C:\Program Files\containerd\config.toml'
}
}
# Generates the containerd config.toml file. # Generates the containerd config.toml file.
function Configure_Containerd { function Configure_Containerd {
$config_dir = 'C:\Program Files\containerd' $config_path = Get_Containerd_ConfigPath
$config_dir = [System.IO.Path]::GetDirectoryName($config_path)
New-Item $config_dir -ItemType 'directory' -Force | Out-Null New-Item $config_dir -ItemType 'directory' -Force | Out-Null
Set-Content "$config_dir\config.toml" @" Set-Content ${config_path} @"
[plugins.cri] [plugins.cri]
sandbox_image = 'INFRA_CONTAINER_IMAGE' sandbox_image = 'INFRA_CONTAINER_IMAGE'
[plugins.cri.cni] [plugins.cri.cni]
@ -1584,12 +1597,16 @@ function Configure_Containerd {
replace('CNI_CONF_DIR', ${env:CNI_CONFIG_DIR}) replace('CNI_CONF_DIR', ${env:CNI_CONFIG_DIR})
} }
# Register and start containerd service. # Register if needed and start containerd service.
function Start_Containerd { function Start_Containerd {
Log-Output "Creating containerd service" # Do the registration only if the containerd service does not exist.
& containerd.exe --register-service --log-file ${env:LOGS_DIR}/containerd.log if (Get-WMIObject -Class Win32_Service -Filter "Name='containerd'" -eq $null) {
Log-Output "Creating containerd service"
& containerd.exe --register-service --log-file "${env:LOGS_DIR}/containerd.log"
}
Log-Output "Starting containerd service" Log-Output "Starting containerd service"
Start-Service containerd Restart-Service containerd
} }
# Pigz Resources # Pigz Resources