Skip to content

Commit 94f512a

Browse files
committed
Removing DNS zones and createfirewallrules from GCP XPN
1 parent e0b9c22 commit 94f512a

File tree

3 files changed

+12
-43
lines changed

3 files changed

+12
-43
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ In {product-title} version {product-version}, you can install a cluster into a s
1111

1212
The installation program provisions the rest of the required infrastructure, which you can further customize. To customize the installation, you modify parameters in the `install-config.yaml` file before you install the cluster.
1313

14-
include::snippets/technology-preview.adoc[leveloffset=+1]
15-
1614
[id="installation-gcp-shared-vpc-prerequisites_{context}"]
1715
== Prerequisites
1816

@@ -46,8 +44,6 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
4644

4745
include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]
4846

49-
include::modules/installation-gcp-shared-vpc-ingress.adoc[leveloffset=+1]
50-
5147
[role="_additional-resources"]
5248
.Additional resources
5349

modules/installation-configuration-parameters.adoc

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,26 +1180,6 @@ Additional GCP configuration parameters are described in the following table:
11801180
|The name of the existing subnet where you want to deploy your compute machines.
11811181
|The subnet name.
11821182

1183-
|`platform.gcp.createFirewallRules`
1184-
|Optional. Set this value to `Disabled` if you want to create and manage your firewall rules using network tags. By default, the cluster will automatically create and manage the firewall rules that are required for cluster communication. Your service account must have `roles/compute.networkAdmin` and `roles/compute.securityAdmin` privileges in the host project to perform these tasks automatically. If your service account does not have the `roles/dns.admin` privilege in the host project, it must have the `dns.networks.bindPrivateDNSZone` permission.
1185-
|`Enabled` or `Disabled`. The default value is `Enabled`.
1186-
1187-
|`platform.gcp.publicDNSZone.project`
1188-
|Optional. The name of the project that contains the public DNS zone. If you set this value, your service account must have the `roles/dns.admin` privilege in the specified project. If you do not set this value, it defaults to `gcp.projectId`.
1189-
|The name of the project that contains the public DNS zone.
1190-
1191-
|`platform.gcp.publicDNSZone.id`
1192-
|Optional. The ID or name of an existing public DNS zone. The public DNS zone domain must match the `baseDomain` parameter. If you do not set this value, the installation program will use a public DNS zone in the service project.
1193-
|The public DNS zone name.
1194-
1195-
|`platform.gcp.privateDNSZone.project`
1196-
|Optional. The name of the project that contains the private DNS zone. If you set this value, your service account must have the `roles/dns.admin` privilege in the host project. If you do not set this value, it defaults to `gcp.projectId`.
1197-
|The name of the project that contains the private DNS zone.
1198-
1199-
|`platform.gcp.privateDNSZone.id`
1200-
|Optional. The ID or name of an existing private DNS zone. If you do not set this value, the installation program will create a private DNS zone in the service project.
1201-
|The private DNS zone name.
1202-
12031183
|`platform.gcp.licenses`
12041184
|A list of license URLs that must be applied to the compute images.
12051185
[IMPORTANT]

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

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,18 @@ platform:
2222
gcp:
2323
computeSubnet: shared-vpc-subnet-1 <2>
2424
controlPlaneSubnet: shared-vpc-subnet-2 <3>
25-
createFirewallRules: Disabled <4>
26-
network: shared-vpc <5>
27-
networkProjectID: host-project-name <6>
28-
publicDNSZone:
29-
id: public-dns-zone <7>
30-
project: host-project-name <8>
31-
projectID: service-project-name <9>
25+
network: shared-vpc <4>
26+
networkProjectID: host-project-name <5>
27+
projectID: service-project-name <6>
3228
region: us-east1
3329
defaultMachinePlatform:
34-
tags: <10>
30+
tags: <7>
3531
- global-tag1
3632
controlPlane:
3733
name: master
3834
platform:
3935
gcp:
40-
tags: <10>
36+
tags: <7>
4137
- control-plane-tag1
4238
type: n2-standard-4
4339
zones:
@@ -48,7 +44,7 @@ compute:
4844
- name: worker
4945
platform:
5046
gcp:
51-
tags: <10>
47+
tags: <7>
5248
- compute-tag1
5349
type: n2-standard-4
5450
zones:
@@ -62,16 +58,13 @@ networking:
6258
machineNetwork:
6359
- cidr: 10.0.0.0/16
6460
pullSecret: '{"auths": ...}'
65-
sshKey: ssh-ed25519 AAAA... <11>
61+
sshKey: ssh-ed25519 AAAA... <8>
6662
----
6763
<1> `credentialsMode` must be set to `Passthrough` to allow the cluster to use the provided GCP service account after cluster creation. See the "Prerequisites" section for the required GCP permissions that your service account must have.
6864
<2> The name of the subnet in the shared VPC for compute machines to use.
6965
<3> The name of the subnet in the shared VPC for control plane machines to use.
70-
<4> Optional. If you set `createFirewallRules` to `Disabled`, you can create and manage firewall rules manually through the use of network tags. By default, the cluster will automatically create and manage the firewall rules that are required for cluster communication. Your service account must have `roles/compute.networkAdmin` and `roles/compute.securityAdmin` privileges in the host project to perform these tasks automatically. If your service account does not have the `roles/dns.admin` privilege in the host project, it must have the `dns.networks.bindPrivateDNSZone` permission.
71-
<5> The name of the shared VPC.
72-
<6> The name of the host project where the shared VPC exists.
73-
<7> Optional. The name of a public DNS zone in the host project. If you set this value, your service account must have the `roles/dns.admin` privilege in the host project. The public DNS zone domain must match the `baseDomain` parameter. If you do not set this value, the installation program will use the public DNS zone in the service project.
74-
<8> Optional. The name of the host project which contains the public DNS zone. This value is required if you specify a public DNS zone that exists in another project.
75-
<9> The name of the GCP project where you want to install the cluster.
76-
<10> Optional. If you want to manually create and manage your GCP firewall rules, you can set `platform.gcp.createFirewallRules` to `Disabled` and then specify one or more network tags. You can set tags on the compute machines, the control plane machines, or all machines.
77-
<11> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
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 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.

0 commit comments

Comments
 (0)