Skip to content

Commit b61706c

Browse files
committed
OSDOCS-14757 simplified install config yaml file, replaced shared vpc config yaml
1 parent 8164af1 commit b61706c

8 files changed

+86
-64
lines changed

installing/installing_gcp/installing-gcp-customizations.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
5959
.Additional resources
6060
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-configuration-parameters-additional-gcp_installation-config-parameters-gcp[Additional {gcp-first} configuration parameters]
6161

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

6464
[role="_additional-resources"]
6565
.Additional resources
6666

67+
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
6768
* 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]
6869

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

installing/installing_gcp/installing-gcp-network-customizations.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
6464
.Additional resources
6565
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]
6666

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

6969
[role="_additional-resources"]
7070
.Additional resources
7171

72+
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
7273
* 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]
7374

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

installing/installing_gcp/installing-gcp-private.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
6161
.Additional resources
6262
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]
6363

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

6666
[role="_additional-resources"]
6767
.Additional resources
6868

69+
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
6970
* 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]
7071

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

installing/installing_gcp/installing-gcp-shared-vpc.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
5252

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

55+
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]
56+
57+
[role="_additional-resources"]
58+
.Additional resources
59+
60+
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
61+
5562
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5663

5764
//Installing the OpenShift CLI by downloading the binary: Moved up to precede `ccoctl` steps, which require the use of `oc`

installing/installing_gcp/installing-gcp-vpc.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
5757
.Additional resources
5858
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]
5959

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

6262
[role="_additional-resources"]
6363
.Additional resources
6464

65+
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
6566
* 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]
6667

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

installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ include::modules/installation-gcp-managing-dns-solution.adoc[leveloffset=+2]
6969
.Additional resources
7070
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for {gcp-first}]
7171

72-
include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
72+
include::modules/installation-gcp-config-yaml-simple.adoc[leveloffset=+2]
73+
74+
[role="_additional-resources"]
75+
.Additional resources
76+
77+
* xref:../../installing/installing_gcp/installation-config-parameters-gcp.adoc#installation-config-parameters-gcp[Installation configuration parameters for GCP]
7378

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * installing/installing_gcp/installing-gcp-customizations.adoc
4+
// * installing/installing_gcp/installing-gcp-network-customizations.adoc
5+
// * installing/installing_gcp/installing-gcp-vpc.adoc
6+
// * installing/installing_gcp/installing-gcp-private.adoc
7+
// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
8+
9+
:_mod-docs-content-type: REFERENCE
10+
[id="installation-gcp-config-yaml_{context}"]
11+
= Sample customized install-config.yaml file for GCP
12+
13+
You can customize the `install-config.yaml` file to specify more details about your {product-title} cluster's platform or modify the values of the required parameters.
14+
15+
[IMPORTANT]
16+
====
17+
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.
18+
====
19+
20+
[source,yaml]
21+
----
22+
apiVersion: v1 <1>
23+
baseDomain: example.com
24+
pullSecret: '{"auths": ...}'
25+
controlPlane: <2>
26+
name: master
27+
replicas: 3
28+
platform:
29+
gcp:
30+
type: n2-standard-4
31+
compute: <3>
32+
- name: worker
33+
replicas: 3
34+
platform:
35+
gcp:
36+
type: n2-standard-4
37+
metadata:
38+
name: test-cluster
39+
networking: <4>
40+
clusterNetwork:
41+
- cidr: 10.128.0.0/14
42+
hostPrefix: 23
43+
platform: <5>
44+
gcp:
45+
projectID: sample-project
46+
----
47+
<1> Parameters at the first level of indentation apply to the cluster globally.
48+
<2> The `controlPlane` stanza applies to control plane machines.
49+
<3> The `compute` stanza applies to compute machines.
50+
<4> The `networking` stanza applies to the cluster networking configuration. If you do not provide networking values, the installation program provides default values.
51+
<5> The `platform` stanza applies to the infrastructure platform that hosts the cluster.

modules/installation-gcp-shared-vpc-config.adoc

Lines changed: 14 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,23 @@
33

44
:_mod-docs-content-type: PROCEDURE
55
[id="installation-gcp-shared-vpc-config_{context}"]
6-
= Sample customized install-config.yaml file for shared VPC installation
7-
There are several configuration parameters which are required to install {product-title} on {gcp-short} using a shared VPC. The following is a sample `install-config.yaml` file which demonstrates these fields.
8-
9-
[IMPORTANT]
10-
====
11-
This sample YAML file is provided for reference only. You must modify this file with the correct values for your environment and cluster.
12-
====
6+
= Enabling installation into a shared VPC
7+
There are several configuration parameters which are required to install {product-title} on GCP using a shared VPC.
8+
The following parameters must be added to the `install-config.yaml` file prior to installation.
139

10+
.Shared VPC parameters in `install-config.yaml`
1411
[source,yaml]
1512
----
16-
apiVersion: v1
17-
baseDomain: example.com
18-
credentialsMode: Passthrough <1>
19-
metadata:
20-
name: cluster_name
2113
platform:
2214
gcp:
23-
computeSubnet: shared-vpc-subnet-1 <2>
24-
controlPlaneSubnet: shared-vpc-subnet-2 <3>
25-
network: shared-vpc <4>
26-
networkProjectID: host-project-name <5>
27-
projectID: service-project-name <6>
28-
region: us-east1
29-
defaultMachinePlatform:
30-
tags: <7>
31-
- global-tag1
32-
controlPlane:
33-
name: master
34-
platform:
35-
gcp:
36-
tags: <7>
37-
- control-plane-tag1
38-
type: n2-standard-4
39-
zones:
40-
- us-central1-a
41-
- us-central1-c
42-
replicas: 3
43-
compute:
44-
- name: worker
45-
platform:
46-
gcp:
47-
tags: <7>
48-
- compute-tag1
49-
type: n2-standard-4
50-
zones:
51-
- us-central1-a
52-
- us-central1-c
53-
replicas: 3
54-
networking:
55-
clusterNetwork:
56-
- cidr: 10.128.0.0/14
57-
hostPrefix: 23
58-
machineNetwork:
59-
- cidr: 10.0.0.0/16
60-
pullSecret: '{"auths": ...}'
61-
sshKey: ssh-ed25519 AAAA... <8>
15+
computeSubnet: shared-vpc-subnet-1 <1>
16+
controlPlaneSubnet: shared-vpc-subnet-2 <2>
17+
network: shared-vpc <3>
18+
networkProjectID: host-project-name <4>
19+
projectID: service-project-name <5>
6220
----
63-
<1> `credentialsMode` must be set to `Passthrough` or `Manual`. See the "Prerequisites" section for the required {gcp-short} permissions that your service account must have.
64-
<2> The name of the subnet in the shared VPC for compute machines to use.
65-
<3> The name of the subnet in the shared VPC for control plane machines to use.
66-
<4> The name of the shared VPC.
67-
<5> The name of the host project where the shared VPC exists.
68-
<6> The name of the {gcp-short} project where you want to install the cluster.
69-
<7> Optional. One or more network tags to apply to compute machines, control plane machines, or all machines.
70-
<8> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
21+
<1> The name of the subnet in the shared VPC for compute machines to use.
22+
<2> The name of the subnet in the shared VPC for control plane machines to use.
23+
<3> The name of the shared VPC.
24+
<4> The name of the host project where the shared VPC exists.
25+
<5> The name of the GCP project where you want to install the cluster.

0 commit comments

Comments
 (0)