From 5ae6af819b86d5a4b6b4c3f29433b5e7e97c5d66 Mon Sep 17 00:00:00 2001 From: Ayushman Mishra Date: Sat, 11 Dec 2021 02:34:29 +0530 Subject: [PATCH 1/2] Changed Docker EE to MCR in Windows Signed-off-by: Ayushman Mishra --- .../windows/intro-windows-in-kubernetes.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md index d5b1e19068..00d3e53d56 100644 --- a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md +++ b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md @@ -649,13 +649,13 @@ when using GMSA with containerd to access Windows network shares, which requires kernel patch. {{< /note >}} -#### Docker EE +#### MCR -{{< feature-state for_k8s_version="v1.14" state="stable" >}} +{{< feature-state for_k8s_version="v1.23" state="stable" >}} -[Docker EE](https://docs.mirantis.com/containers/v3.0/dockeree-products/dee-intro.html)-basic 19.03+ is available as a container runtime for all Windows Server versions. This works with the legacy dockershim adapter. +[Mirantis Container Runtime](https://docs.mirantis.com/mcr/20.10/overview.html) (MCR) is available as a container runtime for all Windows Server 2019 and later versions. -See [Install Docker](https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/deploy-containers-on-server#install-docker) for more information. +See [Install MCR](https://docs.mirantis.com/mcr/20.10/install/mcr-windows.html) for more information. ## Windows OS version compatibility {#windows-os-version-support} From 2042d8966d8fc5bd38c159d64e91ce137293863b Mon Sep 17 00:00:00 2001 From: Ayushman Mishra Date: Sat, 11 Dec 2021 21:53:07 +0530 Subject: [PATCH 2/2] changes Signed-off-by: Ayushman Mishra --- .../windows/intro-windows-in-kubernetes.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md index 00d3e53d56..13f90862f0 100644 --- a/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md +++ b/content/en/docs/setup/production-environment/windows/intro-windows-in-kubernetes.md @@ -649,13 +649,11 @@ when using GMSA with containerd to access Windows network shares, which requires kernel patch. {{< /note >}} -#### MCR - -{{< feature-state for_k8s_version="v1.23" state="stable" >}} +#### Mirantis Container Runtime {#mcr} [Mirantis Container Runtime](https://docs.mirantis.com/mcr/20.10/overview.html) (MCR) is available as a container runtime for all Windows Server 2019 and later versions. -See [Install MCR](https://docs.mirantis.com/mcr/20.10/install/mcr-windows.html) for more information. +See [Install MCR on Windows Servers](https://docs.mirantis.com/mcr/20.10/install/mcr-windows.html) for more information. ## Windows OS version compatibility {#windows-os-version-support}