Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

ci: use 1.4.0 containerd release for windows in CI #3742

Merged
merged 2 commits into from Aug 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/topics/features.md
Expand Up @@ -514,7 +514,7 @@ We are investigating possible risks & mitigations for when VMs are deprovisioned

Kubernetes 1.18 introduces alpha support for the ContainerD runtime on Windows Server 2019. This is still a work-in-progress tracked in [kubernetes/enhancements#1001](https://github.com/kubernetes/enhancements/issues/1001). This feature in AKS-Engine is for testing the in-development versions of ContainerD and Kubernetes, and is not for production use. Be sure to review [open issues](https://github.com/azure/aks-engine/issues?q=containerd+label%3Awindows+is%3Aopen) if you want to test or contribute to this effort.

Containerd now has supported builds at https://github.com/containerd/containerd/releases/tag/v1.4.0-rc.0. You can find nightly builds of Containerd at https://github.com/marosset/windows-cri-containerd/releases/download/nightly/windows-cri-containerd.zip.
Containerd now has supported builds starting with https://github.com/containerd/containerd/releases/tag/v1.4.0. You can find nightly builds of Containerd at https://github.com/marosset/windows-cri-containerd/releases/download/nightly/windows-cri-containerd.zip.

### Deploying multi-OS clusters with ContainerD

Expand Down
2 changes: 1 addition & 1 deletion examples/windows/kubernetes-hybrid.azure-containerd.json
Expand Up @@ -7,7 +7,7 @@
"kubernetesConfig": {
"networkPlugin": "azure",
"containerRuntime": "containerd",
"windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.0-rc.0/containerd-1.4.0-rc.0-windows-amd64.tar.gz"
"windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.0/containerd-1.4.0-windows-amd64.tar.gz"
}
},
"masterProfile": {
Expand Down
2 changes: 1 addition & 1 deletion examples/windows/kubernetes-hybrid.kubenet-containerd.json
Expand Up @@ -7,7 +7,7 @@
"kubernetesConfig": {
"networkPlugin": "kubenet",
"containerRuntime": "containerd",
"windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.0-rc.0/containerd-1.4.0-rc.0-windows-amd64.tar.gz",
"windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.0/containerd-1.4.0-windows-amd64.tar.gz",
"windowsSdnPluginURL": "https://aksenginee2etestimages.blob.core.windows.net/test-content/windows-cni-containerd.zip"
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/engine/template.go
Expand Up @@ -231,7 +231,7 @@ func Build(cfg *config.Config, masterSubnetID string, agentSubnetIDs []string, i

if config.ContainerRuntime == "containerd" &&
prop.OrchestratorProfile.KubernetesConfig.WindowsContainerdURL == "" {
prop.OrchestratorProfile.KubernetesConfig.WindowsContainerdURL = "https://github.com/containerd/containerd/releases/download/v1.4.0-rc.0/containerd-1.4.0-rc.0-windows-amd64.tar.gz"
prop.OrchestratorProfile.KubernetesConfig.WindowsContainerdURL = "https://github.com/containerd/containerd/releases/download/v1.4.0/containerd-1.4.0-windows-amd64.tar.gz"
}

if config.ContainerRuntime != "" {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/test_cluster_configs/containerd.json
Expand Up @@ -8,7 +8,7 @@
"kubernetesConfig": {
"networkPlugin": "azure",
"containerRuntime": "containerd",
"windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.0-rc.0/containerd-1.4.0-rc.0-windows-amd64.tar.gz"
"windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.0/containerd-1.4.0-windows-amd64.tar.gz"
marosset marked this conversation as resolved.
Show resolved Hide resolved
}
},
"masterProfile": {
Expand Down