Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion installing/installing_vsphere/installing-vsphere.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
5 changes: 1 addition & 4 deletions modules/installation-generate-ignition-configs.adoc
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
71 changes: 44 additions & 27 deletions modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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]
====
Expand Down Expand Up @@ -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[]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jianlinliu, we didn't have a step to remove these manifest files for vSphere or bare metal.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After I took another look at the files that I'd need to change to apply this step to vSphere and bare metal, I realized that it would be easier to do it on this PR. For these methods, the 4.1 steps (eg vSphere) skip generating the manifests and just have you generate the Ignition configs. With this change, you need to generate the manifests too (proposed 4.2 change).

The way the conditionals are set up, the 4.2 docs still won't make you remove the control plane or compute manifests.

. 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:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jianlinliu, in the original GCP PR, this was marked as an optional step. Will you please double-confirm that we always need to change this setting on GCP?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@jianlinliu jianlinliu Oct 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per my test result, I do not think it is a optional step when we are guiding user set worker replica to 0. Now I think everywhere keep consistent now, it is a MUST (from comments in bugzilla).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adellape, FYI ^

+
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`
Expand All @@ -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:
+
Expand All @@ -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"]
Expand All @@ -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::[]