Merge pull request #13687 from kalexand-rh/osdocs285

updates from the training repo docs

Author: kalexand-rh

_topic_map.yml

@@ -217,14 +217,20 @@ Topics:
   File: creating-project-other-user
   Distros: openshift-enterprise,openshift-origin
 ---
-Name: Control Plane management
-Dir: control-plane-management
+Name: Machine management
+Dir: machine_management
 Distros: openshift-origin, openshift-enterprise
 Topics:
 - Name: Deploying machine health checks
   File: deploying-machine-health-checks
 - Name: Applying autoscaling to a cluster
   File: applying-autoscaling
+- Name: Manually scaling a MachineSet
+  File: manually-scaling-machineset
+- Name: Creating a MachineSet
+  File: creating-machineset
+- Name: Creating infrastructure MachineSets
+  File: creating-infrastructure-machinesets
 ---
 Name: Networking
 Dir: networking

installing-aws/installing-aws-account.adoc

@@ -18,6 +18,7 @@ include::modules/installation-aws-permissions.adoc[leveloffset=+1]
 
 include::modules/installation-aws-iam-user.adoc[leveloffset=+1]
 
+include::modules/installation-aws-regions.adoc[leveloffset=+1]
 
 .Next steps
 

installing-aws/installing-customizations-cloud.adoc

@@ -33,3 +33,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 
 include::modules/installing-customizations-cloud.adoc[leveloffset=+1]
+
+include::modules/cli-install.adoc[leveloffset=+1]
+
+include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]

installing-aws/installing-quickly-cloud.adoc

@@ -25,4 +25,8 @@ include::modules/installation-obtaining-installer.adoc[leveloffset=+1]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 
+include::modules/cli-install.adoc[leveloffset=+1]
+
+include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
+
 include::modules/installation-default-aws-config-yaml.adoc[leveloffset=+1]

control-plane-management/applying-autoscaling.adoc renamed to machine_management/applying-autoscaling.adoc

@@ -1,7 +1,7 @@
 [id='applying-autoscaling']
 = Applying autoscaling to a {product-title} cluster
 include::modules/common-attributes.adoc[]
-:context: pplying-autoscaling
+:context: applying-autoscaling
 
 toc::[]
 
@@ -21,7 +21,13 @@ include::modules/machine-autoscaler-about.adoc[leveloffset=+1]
 First, deploy the ClusterAutoscaler to manage automatic resource scaling in
 your {product-title} cluster.
 
-include::modules/cluster-autoscaler-crd.adoc[leveloffset=+2]
+[NOTE]
+====
+Because the ClusterAutoscaler is scoped to the entire cluster, you can make only
+one ClusterAutoscaler for the cluster.
+====
+
+include::modules/cluster-autoscaler-cr.adoc[leveloffset=+2]
 
 :FeatureName: ClusterAutoscaler
 include::modules/deploying-resource.adoc[leveloffset=+2]
@@ -35,11 +41,12 @@ cluster to manage deployments of individual machines.
 
 [NOTE]
 ====
-You must configure separate resources for each MachineSet that you want to
-autoscale.
+You must configure separate resources for each MachineSet. Remember that
+MachineSets are different in each AWS region, so consider whether you want to
+enable machine scaling in multiple regions.
 ====
 
-include::modules/machine-autoscaler-crd.adoc[leveloffset=+2]
+include::modules/machine-autoscaler-cr.adoc[leveloffset=+2]
 
 :FeatureName: MachineAutoscaler
 include::modules/deploying-resource.adoc[leveloffset=+2]

machine_management/creating-infrastructure-machinesets.adoc

@@ -0,0 +1,44 @@
+[id='creating-infrastructure-machinesets']
+= Creating infrastructure MachineSets
+include::modules/common-attributes.adoc[]
+:context: creating-infrastructure-machinesets
+
+toc::[]
+
+{nbsp} +
+
+You can create a MachineSet to host only infrastructure components.
+You apply specific Kubernetes labels to these Machines and then
+update the infrastructure components to run on only those Machines.These
+infrastructure nodes are not counted toward the total number of subscriptions
+that are required to run the environment.
+
+include::modules/infrastructure-components.adoc[leveloffset=+1]
+
+include::modules/machine-api-overview.adoc[leveloffset=+1]
+
+[id='creating-infrastructure-machinesets-production']
+== Creating infrastructure MachineSets for production environments
+
+In a production deployment, deploy at least three MachineSets to hold
+infrastructure components. Both the logging aggregation solution and
+the service mesh deploy ElasticSearch, and ElasticSearch requires three
+instances that are installed on different nodes. For high availability, install
+deploy these nodes to different availability zones. Since you need different
+MachineSets for each availability zone, create at least three MachineSets.
+
+include::modules/machineset-creating.adoc[leveloffset=+2]
+
+[id='moving-resources-to-infrastructure-machinesets']
+== Moving resources to infrastructure MachineSets
+
+Some of the infrastructure resources are deployed in your cluster by default.
+You can move them to the infrastructure MachineSets that you created.
+
+include::modules/infrastructure-moving-router.adoc[leveloffset=+2]
+
+include::modules/infrastructure-moving-registry.adoc[leveloffset=+2]
+
+include::modules/infrastructure-moving-monitoring.adoc[leveloffset=+2]
+
+include::modules/infrastructure-moving-logging.adoc[leveloffset=+2]

machine_management/creating-machineset.adoc

@@ -0,0 +1,11 @@
+[id='creating-machineset']
+= Creating a MachineSet
+include::modules/common-attributes.adoc[]
+:context: creating-machineset
+
+toc::[]
+
+{nbsp} +
+
+include::modules/machineset-creating.adoc[leveloffset=+1]
+

control-plane-management/deploying-machine-health-checks.adoc renamed to machine_management/deploying-machine-health-checks.adoc

@@ -0,0 +1,11 @@
+[id='manually-scaling-machineset']
+= Manually scaling a MachineSet
+include::modules/common-attributes.adoc[]
+:context: manually-scaling-machineset
+
+toc::[]
+
+{nbsp} +
+
+include::modules/machineset-manually-scaling.adoc[leveloffset=+1]
+