Skip to content
Open
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
3 changes: 2 additions & 1 deletion installing/installing_gcp/installing-gcp-customizations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
.Additional resources
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-configuration-parameters-additional-gcp_installation-config-parameters-gcp[Additional {gcp-first} configuration parameters]

include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]

include::modules/installation-configure-proxy.adoc[leveloffset=+2]
Expand Down
3 changes: 2 additions & 1 deletion installing/installing_gcp/installing-gcp-private.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
.Additional resources
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]

include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]

include::modules/nw-gcp-installing-global-access-configuration.adoc[leveloffset=+2]
Expand Down
7 changes: 6 additions & 1 deletion installing/installing_gcp/installing-gcp-shared-vpc.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
.Additional resources
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]

include::modules/installation-gcp-shared-vpc-config.adoc[leveloffset=+2]
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]

include::modules/installation-configure-proxy.adoc[leveloffset=+2]

Expand Down
3 changes: 2 additions & 1 deletion installing/installing_gcp/installing-gcp-vpc.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
.Additional resources
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]

include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
* xref:../../machine_management/creating_machinesets/creating-machineset-gcp.adoc#machineset-enabling-customer-managed-encryption_creating-machineset-gcp[Enabling customer-managed encryption keys for a compute machine set]

include::modules/nw-gcp-installing-global-access-configuration.adoc[leveloffset=+2]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
.Additional resources
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]

include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]

[role="_additional-resources"]
.Additional resources

* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]

include::modules/nw-gcp-installing-global-access-configuration.adoc[leveloffset=+2]

Expand Down
54 changes: 54 additions & 0 deletions modules/installation-gcp-config-yaml-simple.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Module included in the following assemblies:
//
// * installing/installing_gcp/installing-gcp-customizations.adoc
// * installing/installing_gcp/installing-gcp-network-customizations.adoc
// * installing/installing_gcp/installing-gcp-vpc.adoc
// * installing/installing_gcp/installing-gcp-private.adoc
// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc

:_mod-docs-content-type: REFERENCE
[id="installation-gcp-config-yaml_{context}"]
= Sample customized install-config.yaml file for {gcp-full}

[role="_abstract"]
To specify more details about your {product-title} cluster's platform or modify the values of the required parameters, you can customize the `install-config.yaml` file.

[IMPORTANT]
====
This sample YAML file is provided for reference only. You must obtain your `install-config.yaml` file by using the installation program and modify it.
====

[source,yaml]
----
apiVersion: v1
baseDomain: example.com
pullSecret: '{"auths": ...}'
controlPlane:
name: master
replicas: 3
platform:
gcp:
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure how minimal you want to go but this type may not be required, but if you do want to show the structure there are certainly other fields that could be mentioned here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, I am open to suggestions. At a minimum I'd like to put 1 parameter in each section. is there another you would recommend?

type: n2-standard-4
compute:
- name: worker
replicas: 3
platform:
gcp:
type: n2-standard-4
metadata:
name: test-cluster
networking:
clusterNetwork:
- cidr: 10.128.0.0/14
hostPrefix: 23
platform:
gcp:
projectID: sample-project

Choose a reason for hiding this comment

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

platform.gcp.region is also a required field.

Choose a reason for hiding this comment

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

@bscott-rh Besides, I'm trying to understand the updates, for example, in the 4.18 doc chapter "Chapter 6. Installing a cluster on GCP in a disconnected environment", the section "6.5. Creating the installation configuration file" explains how to edit "install-config.yaml" to give the additional information that is required for an installation in a restricted network. But in your changes, it seems no such info, how do you expect the end-users know generally what's required?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @jianli-wei , I am resuming work on this ticket finally :) I will add the region parameter.

Regarding the updates, if the correct information is in the "Creating the installation configuration file" procedure, then it is okay for it to be removed from the sample install-config.yaml file, because the sample file is only meant to be a reference for the syntax of the file, not a complete config file. Does that make sense?

region: us-east1
----
where:

`controlPlane`:: Specifies parameters that apply to control plane machines.
`compute`:: Specifies parameters that apply to compute machines.
`networking`:: Specifies parameters that apply to the cluster networking configuration. If you do not provide networking values, the installation program provides default values.
`platform`:: Specifies parameters that apply to the infrastructure platform that hosts the cluster.
71 changes: 0 additions & 71 deletions modules/installation-gcp-shared-vpc-config.adoc

This file was deleted.

27 changes: 27 additions & 0 deletions modules/installation-initializing-manual.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,33 @@ $ mkdir <installation_directory>
You must create a directory. Some installation assets, such as bootstrap X.509 certificates have short expiration intervals, so you must not reuse an installation directory. If you want to reuse individual files from another cluster installation, you can copy them into your directory. However, the file names for the installation assets might change between releases. Use caution when copying installation files from an earlier {product-title} version.
====

ifdef::gcp-private[]
. Edit the `install-config.yaml` file to set the `publish: Internal` parameter.
endif::gcp-private[]
ifdef::gcp-shared[]
. Edit the `install-config.yaml` file to set the parameters necessary for installation into a shared VPC.
.. Define the network, subnets, and project names for the shared VPC:
+
[source,yaml]
----
# ...
platform:
gcp:
computeSubnet: <shared_vpc_compute_subnet>
controlPlaneSubnet: <shared_vpc_control_plane_subnet>
network: <shared_vpc_name>
networkProjectID: <host_project_name>
projectID: <service_project_name>
----
where:

`<shared_vpc_compute_subnet>`:: Specifies the name of the subnet in the shared VPC for compute machines to use.
`<shared_vpc_control_plane_subnet>`:: Specifies the name of the subnet in the shared VPC for control plane machines to use.
`<shared_vpc_name>`:: Specifies the name of the shared VPC.
`<host_project_name>`:: Specifies the name of the host project where the shared VPC exists.
`<service_project_name>`:: Specifies the name of the project where you want to install the cluster.
endif::gcp-shared[]

. Customize the provided sample `install-config.yaml` file template and save the file in the `<installation_directory>`.
ifdef::ibm-cloud-restricted[]
+
Expand Down
8 changes: 5 additions & 3 deletions modules/installation-initializing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,11 @@ ifdef::gcp+restricted[]
+
[source,yaml]
----
network: <existing_vpc>
controlPlaneSubnet: <control_plane_subnet>
computeSubnet: <compute_subnet>
platform:
gcp:
network: <existing_vpc>
controlPlaneSubnet: <control_plane_subnet>
computeSubnet: <compute_subnet>
----
+
For `platform.gcp.network`, specify the name for the existing Google VPC. For `platform.gcp.controlPlaneSubnet` and `platform.gcp.computeSubnet`, specify the existing subnets to deploy the control plane machines and compute machines, respectively.
Expand Down
3 changes: 2 additions & 1 deletion modules/private-clusters-about-gcp.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
[id="private-clusters-about-gcp_{context}"]
= Private clusters in {gcp-short}

To create a private cluster on {gcp-first}, you must provide an existing private VPC and subnets to host the cluster. The installation program must also be able to resolve the DNS records that the cluster requires. The installation program configures the Ingress Operator and API server for only internal traffic.
[role="_abstract"]
To create a private cluster on {gcp-first}, you must provide an existing private VPC and subnets to host the cluster, and you must specify `publish: Internal` in your `install-config.yaml` file. The installation program must also be able to resolve the DNS records that the cluster requires. The installation program configures the Ingress Operator and API server for only internal traffic.

Choose a reason for hiding this comment

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

Suggest to replace "you must provide an existing private VPC and subnets to host the cluster" with "you must provide an existing VPC network and subnets to host the cluster", i.e. remove the word "private" and add the word "network".


The cluster still requires access to internet to access the {gcp-short} APIs.

Expand Down