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

Azure · Aug 24, 2020 · 15fefdc · 15fefdc
1 parent 14d044e
commit 15fefdc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docs/topics/features.md b/docs/topics/features.md
@@ -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
 

diff --git a/examples/windows/kubernetes-hybrid.azure-containerd.json b/examples/windows/kubernetes-hybrid.azure-containerd.json
@@ -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": {

diff --git a/examples/windows/kubernetes-hybrid.kubenet-containerd.json b/examples/windows/kubernetes-hybrid.kubenet-containerd.json
@@ -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"
       }
     },

diff --git a/test/e2e/engine/template.go b/test/e2e/engine/template.go
@@ -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 != "" {

diff --git a/test/e2e/test_cluster_configs/containerd.json b/test/e2e/test_cluster_configs/containerd.json
@@ -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"
                 }
             },
             "masterProfile": {