Merge pull request #49220 from openshift/revert-47588-winc-containerd

Revert "OSDOCS-2524: Windows Containers: containerd"

Author: mburke5678

_unused_topics/windows-machine-config-operator.adoc

@@ -8,7 +8,7 @@
 [discrete]
 == Purpose
 
-The Windows Machine Config Operator (WMCO) orchestrates the process of deploying and managing Windows workloads on a cluster. The WMCO configures Windows machines into compute nodes, enabling Windows container workloads to run in {product-title} clusters. This is done by creating a machine set that uses a Windows image. The WMCO completes all necessary steps to configure the underlying Windows VM so that it can join the cluster as a compute node.
+The Windows Machine Config Operator (WMCO) orchestrates the process of deploying and managing Windows workloads on a cluster. The WMCO configures Windows machines into compute nodes, enabling Windows container workloads to run in {product-title} clusters. This is done by creating a machine set that uses a Windows image with the Docker-formatted container runtime installed. The WMCO completes all necessary steps to configure the underlying Windows VM so that it can join the cluster as a compute node.
 
 [discrete]
 == Project

modules/byoh-configuring.adoc

@@ -11,6 +11,7 @@ Creating a BYOH Windows instance requires creating a config map in the WMCO name
 .Prerequisites
 Any Windows instances that are to be attached to the cluster as a node must fulfill the following requirements:
 
+* The Docker container runtime must be installed on the instance.
 * The instance must be on the same network as the Linux worker nodes in the cluster.
 * Port 22 must be open and running an SSH server.
 * The default shell for the SSH server must be the link:https://docs.microsoft.com/en-us/windows-server/administration/openssh/openssh_server_configuration#configuring-the-default-shell-for-openssh-in-windows[Windows Command shell], or `cmd.exe`.
@@ -22,11 +23,6 @@ Any Windows instances that are to be attached to the cluster as a node must fulf
 ** Starts with an alphanumeric character.
 ** Ends with an alphanumeric character.
 
-[NOTE]
-====
-Windows instances deployed by the WMCO are configured with the containerd container runtime. Because the WMCO installs and manages the runtime, it is recommended that you not manually install containerd on nodes.
-====
-
 .Procedure
 . Create a ConfigMap named `windows-instances` in the WMCO namespace that describes the Windows instances to be added.
 +

modules/creating-runtimeclass.adoc

@@ -18,7 +18,7 @@ apiVersion: node.k8s.io/v1beta1
 kind: RuntimeClass
 metadata:
   name: <runtime_class_name> <1>
-handler: 'runhcs-wcow-process'
+handler: 'docker'
 scheduling:
   nodeSelector: <2>
     kubernetes.io/os: 'windows'

modules/creating-the-vsphere-windows-vm-golden-image.adoc

@@ -64,6 +64,8 @@ PS C:\> Get-Service -Name VMTools | Select Status, StartType
 The public key used in the instructions must correspond to the private key you create later in the WMCO namespace that holds your secret. See the "Configuring a secret for the Windows Machine Config Operator" section for more details.
 ====
 
+. Install the `docker` container runtime on your Windows VM following the link:https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/set-up-environment?tabs=Windows-Server[Microsoft documentation].
+
 . You must create a new firewall rule in the Windows VM that allows incoming connections for container logs. Run the following PowerShell command to create the firewall rule on TCP port 10250:
 +
 [source,posh]

modules/windows-workload-management.adoc

@@ -10,7 +10,12 @@ To run Windows workloads in your cluster, you must first install the Windows Mac
 .WMCO design
 image::wmco-design.png[WMCO workflow]
 
-Before deploying Windows workloads, you must create a Windows compute node and have it join the cluster. The Windows node hosts the Windows workloads in a cluster, and can run alongside other Linux-based compute nodes. You can create a Windows compute node by creating a Windows machine set to host Windows Server compute machines. You must apply a Windows-specific label to the machine set that specifies a Windows OS image.
+Before deploying Windows workloads, you must create a Windows compute node and have it join the cluster. The Windows node hosts the Windows workloads in a cluster, and can run alongside other Linux-based compute nodes. You can create a Windows compute node by creating a Windows machine set to host Windows Server compute machines. You must apply a Windows-specific label to the machine set that specifies a Windows OS image that has the Docker-formatted container runtime add-on enabled.
+
+[IMPORTANT]
+====
+Currently, the Docker-formatted container runtime is used in Windows nodes. Kubernetes is deprecating Docker as a container runtime; you can reference the Kubernetes documentation for more information in link:https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/[Docker deprecation]. Containerd will be the new supported container runtime for Windows nodes in a future release of Kubernetes.
+====
 
 The WMCO watches for machines with the Windows label. After a Windows machine set is detected and its respective machines are provisioned, the WMCO configures the underlying Windows virtual machine (VM) so that it can join the cluster as a compute node.
 

modules/wmco-upgrades.adoc

@@ -7,23 +7,6 @@
 
 When a new version of the Windows Machine Config Operator (WMCO) is released that is compatible with the current cluster version, the Operator is upgraded based on the upgrade channel and subscription approval strategy it was installed with when using the Operator Lifecycle Manager (OLM). The WMCO upgrade results in the Kubernetes components in the Windows machine being upgraded.
 
-//the following paragraph and lists taken from https://github.com/openshift/enhancements/pull/962/files#diff-be9b7fd31ea4585b2c617aa51f14f35cb1212da129acf3455806aba6cddf782dR137
-Because WMCO 6.0.0 uses containerd as the default container runtime instead of Docker, note the following changes that are made during the upgrade:
-
-* For nodes created using a machine set:
-** All `machine` objects are deleted, which results in the draining and deletion of any Windows nodes.
-** New Windows nodes are created.
-** The upgraded WMCO configures the new Windows nodes with containerd as the default runtime.
-** After the new Windows nodes join the {product-title} cluster, you can deploy pods on those nodes.
-
-* For Bring-Your-Own-Host (BYOH) nodes:
-** The kubelet, kube-proxy, CNI, and the hybrid-overlay components, which were installed by the WMCO, are all uninstalled.
-** Any Windows OS-specific configurations that were created as part of configuring the instance, such as HNS networks, are deleted or reverted.
-** The WMCO installs containerd as the default runtime, and reinstalls the kubelet, kube-proxy, CNI, and hybrid-overlay components.
-** The kubelet service starts.
-** After the new Windows nodes join the {product-title} cluster, you can deploy pods on those nodes.
-** If any Docker service is present, it continues to run. Alternatively, you can manually uninstall Docker.
-
 [NOTE]
 ====
 If you are upgrading to a new version of the WMCO and want to use cluster monitoring, you must have the `openshift.io/cluster-monitoring=true` label present in the WMCO namespace. If you add the label to a pre-existing WMCO namespace, and there are already Windows nodes configured, restart the WMCO pod to allow monitoring graphs to display.

windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.adoc

@@ -12,7 +12,12 @@ You can create a Windows `MachineSet` object to serve a specific purpose in your
 == Prerequisites
 
 * You installed the Windows Machine Config Operator (WMCO) using Operator Lifecycle Manager (OLM).
-* You are using a supported Windows Server as the operating system image.
+* You are using a supported Windows Server as the operating system image with the Docker-formatted container runtime add-on enabled.
+
+[IMPORTANT]
+====
+Currently, the Docker-formatted container runtime is used in Windows nodes. Kubernetes is deprecating Docker as a container runtime; you can reference the Kubernetes documentation for more information in link:https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/[Docker deprecation]. Containerd will be the new supported container runtime for Windows nodes in a future release of Kubernetes.
+====
 
 include::modules/machine-api-overview.adoc[leveloffset=+1]
 include::modules/windows-machineset-aws.adoc[leveloffset=+1]

windows_containers/creating_windows_machinesets/creating-windows-machineset-azure.adoc

@@ -12,7 +12,12 @@ You can create a Windows `MachineSet` object to serve a specific purpose in your
 == Prerequisites
 
 * You installed the Windows Machine Config Operator (WMCO) using Operator Lifecycle Manager (OLM).
-* You are using a supported Windows Server as the operating system image.
+* You are using a supported Windows Server as the operating system image with the Docker-formatted container runtime add-on enabled.
+
+[IMPORTANT]
+====
+Currently, the Docker-formatted container runtime is used in Windows nodes. Kubernetes is deprecating Docker as a container runtime; you can reference the Kubernetes documentation for more information in link:https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/[Docker deprecation]. Containerd will be the new supported container runtime for Windows nodes in a future release of Kubernetes.
+====
 
 include::modules/machine-api-overview.adoc[leveloffset=+1]
 include::modules/windows-machineset-azure.adoc[leveloffset=+1]

windows_containers/creating_windows_machinesets/creating-windows-machineset-vsphere.adoc

@@ -12,7 +12,12 @@ You can create a Windows `MachineSet` object to serve a specific purpose in your
 == Prerequisites
 
 * You installed the Windows Machine Config Operator (WMCO) using Operator Lifecycle Manager (OLM).
-* You are using a supported Windows Server as the operating system image.
+* You are using a supported Windows Server as the operating system image with the Docker-formatted container runtime add-on enabled.
+
+[IMPORTANT]
+====
+Currently, the Docker-formatted container runtime is used in Windows nodes. Kubernetes is deprecating Docker as a container runtime; you can reference the Kubernetes documentation for more information on link:https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/[Docker deprecation]. Containerd will be the new supported container runtime for Windows nodes in a future release of Kubernetes.
+====
 
 include::modules/machine-api-overview.adoc[leveloffset=+1]
 

windows_containers/enabling-windows-container-workloads.adoc

@@ -28,7 +28,7 @@ Dual NIC is not supported on WMCO-managed Windows instances.
 
 [NOTE]
 ====
-Windows instances deployed by the WMCO are configured with the containerd container runtime. Because WMCO installs and manages the runtime, it is recommanded that you do not manually install containerd on nodes.
+The WMCO is not supported in clusters that use a xref:../networking/enable-cluster-wide-proxy.adoc#enable-cluster-wide-proxy[cluster-wide proxy] because the WMCO is not able to route traffic through the proxy connection for the workloads.
 ====
 
 [role="_additional-resources"]
@@ -40,11 +40,6 @@ Windows instances deployed by the WMCO are configured with the containerd contai
 
 You can install the Windows Machine Config Operator using either the web console or OpenShift CLI (`oc`).
 
-[NOTE]
-====
-The WMCO is not supported in clusters that use a xref:../networking/enable-cluster-wide-proxy.adoc#enable-cluster-wide-proxy[cluster-wide proxy] because the WMCO is not able to route traffic through the proxy connection for the workloads. 
-====
-
 include::modules/installing-wmco-using-web-console.adoc[leveloffset=+2]
 
 include::modules/installing-wmco-using-cli.adoc[leveloffset=+2]