[enterprise-4.3] bug 1738456 setting the control plane as unschedulable

installing/installing_bare_metal/installing-bare-metal.adoc

@@ -56,7 +56,7 @@ include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
-include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1]
+include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
 
 [id="creating-machines-bare-metal"]
 == Creating {op-system-first} machines

installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc

@@ -65,7 +65,7 @@ include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
-include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1]
+include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
 
 [id="creating-machines-bare-metal-restricted-network"]
 == Creating {op-system-first} machines

installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc

@@ -58,7 +58,7 @@ include::modules/installation-vsphere-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
-include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1]
+include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
 
 include::modules/installation-vsphere-machines.adoc[leveloffset=+1]
 

installing/installing_vsphere/installing-vsphere.adoc

@@ -47,7 +47,7 @@ include::modules/installation-vsphere-config-yaml.adoc[leveloffset=+2]
 
 include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
-include::modules/installation-generate-ignition-configs.adoc[leveloffset=+1]
+include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
 
 include::modules/installation-vsphere-machines.adoc[leveloffset=+1]
 

modules/installation-generate-ignition-configs.adoc

@@ -1,9 +1,6 @@
 // Module included in the following assemblies:
 //
-// * installing/installing_bare_metal/installing-bare-metal.adoc
-// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc
-// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc
-// * installing/installing_vsphere/installing-vsphere.adoc
+
 
 ifeval::["{context}" == "installing-restricted-networks-vsphere"]
 :restricted:

modules/installation-user-infra-generate-k8s-manifest-ignition.adoc

@@ -1,14 +1,26 @@
 // Module included in the following assemblies:
 //
 // * installing/installing_aws_user_infra/installing-aws-user-infra.adoc
-// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc
+// * installing/installing_bare_metal/installing-bare-metal.adoc
 // * installing/installing_gcp_user_infra/installing-gcp-user-infra.adoc
+// * installing/installing_restricted_networks/installing-restricted-networks-aws.adoc
+// * installing/installing_restricted_networks/installing-restricted-networks-bare-metal.adoc
+// * installing/installing_restricted_networks/installing-restricted-networks-vsphere.adoc
+// * installing/installing_vsphere/installing-vsphere.adoc
+
 
+ifeval::["{context}" == "installing-aws-user-infra"]
+:aws:
+endif::[]
 ifeval::["{context}" == "installing-restricted-networks-aws"]
+:aws:
 :restricted:
 endif::[]
-ifeval::["{context}" == "installing-aws-user-infra"]
-:aws:
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:restricted:
 endif::[]
 ifeval::["{context}" == "installing-gcp-user-infra"]
 :gcp:
@@ -17,9 +29,7 @@ endif::[]
 [id="installation-user-infra-generate-k8s-manifest-ignition_{context}"]
 = Creating the Kubernetes manifest and Ignition config files
 
-Because you must manually start the cluster machines, you must generate the
-Kubernetes manifest and Ignition config files that the cluster needs to make its
-machines.
+Because you must modify some cluster definition files and manually start the cluster machines, you must generate the Kubernetes manifest and Ignition config files that the cluster needs to make its machines.
 
 [IMPORTANT]
 ====
@@ -53,47 +63,47 @@ contains the `install-config.yaml` file you created.
 Because you create your own compute machines later in the installation process,
 you can safely ignore this warning.
 
+ifdef::aws,gcp[]
 . Remove the Kubernetes manifest files that define the control plane machines:
 +
 ----
 $ rm -f openshift/99_openshift-cluster-api_master-machines-*.yaml
 ----
 +
 By removing these files, you prevent the cluster from automatically generating control plane machines.
-
-ifdef::aws[]
-. Remove the Kubernetes manifest files that define the worker machines:
-+
-----
-$ rm -f openshift/99_openshift-cluster-api_worker-machineset-*
-----
-+
-Because you create and manage the worker machines yourself, you do not need
-to initialize these machines.
-endif::[]
+endif::aws,gcp[]
 
 ifdef::gcp[]
 . Optional: If you do not want the cluster to provision compute machines, remove
 the Kubernetes manifest files that define the worker machines:
+endif::gcp[]
+ifdef::aws[]
+. Remove the Kubernetes manifest files that define the worker machines:
+endif::aws[]
+ifdef::aws,gcp[]
 +
 ----
 $ rm -f openshift/99_openshift-cluster-api_worker-machineset-*.yaml
 ----
 +
 Because you create and manage the worker machines yourself, you do not need
 to initialize these machines.
+endif::aws,gcp[]
 
-. Optional: Currently, emptying the compute pools makes control plane machines
-schedulable. However, due to a
-link:https://github.com/kubernetes/kubernetes/issues/65618[Kubernetes limitation],
-router Pods running on control plane machines will not be reachable by the
-ingress load balancer.
+. Modify the `manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file to prevent Pods from being scheduled on the control plane machines:
 +
-If you emptied the compute note in an earlier step, ensure the
-`mastersSchedulable` parameter is set to `false` in the
-`manifests/cluster-scheduler-02-config.yml` scheduler configuration file to keep
-router Pods and other workloads off the control plane machines.
+--
+.. Open the `manifests/cluster-scheduler-02-config.yml` file.
+.. Locate the `mastersSchedulable` parameter and set its value to `False`.
+.. Save and exit the file.
+--
++
+[NOTE]
+====
+Currently, due to a link:https://github.com/kubernetes/kubernetes/issues/65618[Kubernetes limitation], router Pods running on control plane machines will not be reachable by the ingress load balancer. This step might not be required in a future minor version of {product-title}.
+====
 
+ifdef::gcp[]
 . Optional: If you do not want
 link:https://github.com/openshift/cluster-ingress-operator[the Ingress Operator]
 to create DNS records on your behalf, remove the `privateZone` and `publicZone`
@@ -117,7 +127,7 @@ status: {}
 <1> Remove these sections completely.
 +
 If you do so, you must add ingress DNS records manually in a later step.
-endif::[]
+endif::gcp[]
 
 . Obtain the Ignition config files:
 +
@@ -140,6 +150,7 @@ The following files are generated in the directory:
 ----
 
 ifeval::["{context}" == "installing-restricted-networks-aws"]
+:!aws:
 :!restricted:
 endif::[]
 ifeval::["{context}" == "installing-aws-user-infra"]
@@ -148,3 +159,9 @@ endif::[]
 ifeval::["{context}" == "installing-gcp-user-infra"]
 :!gcp:
 endif::[]
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:!restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:!restricted:
+endif::[]