Skip to content

chore: update containerd to v1.6.36 and runc to v1.1.14 #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 24, 2024
Merged

chore: update containerd to v1.6.36 and runc to v1.1.14 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
200b750
chore: update containerd to v1.6.35 and runc to v1.1.13
christinalau0 Oct 24, 2024
9f11b3b
Generate template
christinalau0 Oct 24, 2024
fc9aba2
chore: update containerd to v1.6.36 and runc to v1.1.14
christinalau0 Oct 24, 2024
c06822b
Generate template
christinalau0 Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions parts/k8s/cloud-init/artifacts/cse_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14" ]]; then
apt_get_install 20 30 120 moby-runc=1.1.14* --allow-downgrades || exit 27
fi
}
installMoby() {
Expand Down
5 changes: 3 additions & 2 deletions parts/k8s/kubernetesparams.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"type": "string"
},
"containerdVersion": {
"defaultValue": "1.6.28",
"defaultValue": "1.6.36",
"metadata": {
"description": "The Azure containerd build version"
},
Expand All @@ -262,7 +262,8 @@
"1.5.13",
"1.5.16",
"1.6.21",
"1.6.28"
"1.6.28",
"1.6.36"
],
"type": "string"
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.
Expand All @@ -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.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"
)

// WindowsProfile defaults
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.28\n"
// level=warning msg="Any new nodes will have containerd version 1.6.36\n"
}

func TestCombineValues(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/vlabs/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.36"}
kubernetesImageBaseTypeValidVersions = [...]string{"", common.KubernetesImageBaseTypeGCR, common.KubernetesImageBaseTypeMCR}
cachingTypesValidValues = [...]string{"", string(compute.CachingTypesNone), string(compute.CachingTypesReadWrite), string(compute.CachingTypesReadOnly)}
linuxEth0MTUAllowedValues = [...]int{1500, 3900}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/vlabs/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.36]",
},
"should error when KubernetesConfig has containerdVersion value for docker container runtime": {
properties: &Properties{
Expand Down
9 changes: 5 additions & 4 deletions pkg/engine/templates_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vhd/packer/configure-windows-vhd-phase1.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"

function Write-Log($Message) {
$msg = $message | Timestamp
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/configure-windows-vhd-phase2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"

function Write-Log($Message) {
$msg = $message | Timestamp
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/configure-windows-vhd.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.36+azure/windows/windows_amd64/moby-containerd-1.6.36+azure-u1.amd64.zip"

function Write-Log($Message) {
$msg = $message | Timestamp
Expand Down
2 changes: 1 addition & 1 deletion vhd/packer/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ installBpftrace
echo " - bpftrace" >> ${VHD_LOGS_FILEPATH}

MOBY_VERSION="20.10.14"
CONTAINERD_VERSION="1.6.28"
CONTAINERD_VERSION="1.6.36"
installMoby
installRunc
systemctl_restart 100 5 30 docker || exit 1
Expand Down