Skip to content

Commit 3d3c61b

Browse files
authored
Merge pull request #31942 from sagidlow/BZ-1862278
BZ-1862278: Added changes as requested in the bug
2 parents 9644888 + 8ff2668 commit 3d3c61b

File tree

4 files changed

+29
-19
lines changed

4 files changed

+29
-19
lines changed

installing/installing_gcp/installing-gcp-user-infra-vpc.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ The cluster requires several firewall rules. If you do not use a shared VPC, the
126126

127127
If you choose to create each rule based on events, you must create firewall rules after you provision the cluster and during the life of the cluster when the console notifies you that rules are missing. Events that are similar to the following event are displayed, and you must add the firewall rules that are required:
128128

129+
[source,terminal]
130+
----
131+
$ oc get events -n openshift-ingress --field-selector="reason=LoadBalancerManualChange"
132+
----
133+
129134
.Example output
130135
[source,terminal]
131136
----

modules/installation-deployment-manager-int-lb.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ You can use the following Deployment Manager template to deploy the internal loa
1515
include::https://raw.githubusercontent.com/openshift/installer/release-4.8/upi/gcp/02_lb_int.py[]
1616
----
1717
====
18+
19+
You will need this template in addition to the `02_lb_ext.py` template when you create an external cluster.

modules/installation-gcp-user-infra-adding-ingress.adoc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ ifdef::shared-vpc[]
1616
= Adding the ingress DNS records
1717
endif::shared-vpc[]
1818

19-
If you removed the DNS Zone configuration when creating Kubernetes manifests and
20-
generating Ignition configs, you must manually create DNS records that point at
21-
the ingress load balancer. You can create either a wildcard
22-
`*.apps.{baseDomain}.` or specific records. You can use A, CNAME, and other
23-
records per your requirements.
19+
ifndef::shared-vpc[]
20+
If you removed the DNS zone configuration when creating Kubernetes manifests and generating Ignition configs, you must manually create DNS records that point at the ingress load balancer. You can create either a wildcard `*.apps.{baseDomain}.` or specific records. You can use A, CNAME, and other records per your requirements.
21+
endif::[]
22+
ifdef::shared-vpc[]
23+
DNS zone configuration is removed when creating Kubernetes manifests and generating Ignition configs. You must manually create DNS records that point at the ingress load balancer. You can create either a wildcard
24+
`*.apps.{baseDomain}.` or specific records. You can use A, CNAME, and other records per your requirements.
25+
endif::[]
2426

2527
.Prerequisites
2628

modules/installation-gcp-user-infra-shared-vpc-config-yaml.adoc

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ endif::openshift-origin[]
5454
- 172.30.0.0/16
5555
platform:
5656
gcp:
57-
projectID: openshift-production
58-
region: us-central1 <5>
57+
projectID: openshift-production <5>
58+
region: us-central1 <6>
5959
pullSecret: '{"auths": ...}'
6060
ifndef::openshift-origin[]
61-
fips: false <6>
62-
sshKey: ssh-ed25519 AAAA... <7>
63-
publish: Internal <8>
61+
fips: false <7>
62+
sshKey: ssh-ed25519 AAAA... <8>
63+
publish: Internal <9>
6464
endif::openshift-origin[]
6565
ifdef::openshift-origin[]
66-
sshKey: ssh-ed25519 AAAA... <6>
67-
publish: Internal <7>
66+
sshKey: ssh-ed25519 AAAA... <7>
67+
publish: Internal <8>
6868
endif::openshift-origin[]
6969
----
7070
<1> Specify the public DNS on the host project.
@@ -76,24 +76,25 @@ endif::openshift-origin[]
7676
====
7777
If you disable simultaneous multithreading, ensure that your capacity planning accounts for the dramatically decreased machine performance. Use larger machine types, such as `n1-standard-8`, for your machines if you disable simultaneous multithreading.
7878
====
79-
<5> Specify the region that your VPC network is in.
79+
<5> Specify the main project where the VM instances reside.
80+
<6> Specify the region that your VPC network is in.
8081
ifndef::openshift-origin[]
81-
<6> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
82-
<7> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
82+
<7> Whether to enable or disable FIPS mode. By default, FIPS mode is not enabled. If FIPS mode is enabled, the {op-system-first} machines that {product-title} runs on bypass the default Kubernetes cryptography suite and use the cryptography modules that are provided with {op-system} instead.
83+
<8> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
8384
endif::openshift-origin[]
8485
ifdef::openshift-origin[]
85-
<6> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
86+
<7> You can optionally provide the `sshKey` value that you use to access the machines in your cluster.
8687
endif::openshift-origin[]
8788
+
8889
[NOTE]
8990
====
9091
For production {product-title} clusters on which you want to perform installation debugging or disaster recovery, specify an SSH key that your `ssh-agent` process uses.
9192
====
9293
ifndef::openshift-origin[]
93-
<8> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the Internet. The default value is `External`.
94+
<9> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the Internet. The default value is `External`.
9495
To use a shared VPC in a cluster that uses infrastructure that you provision, you must set `publish` to `Internal`. The installation program will no longer be able to access the public DNS zone for the base domain in the host project.
9596
endif::openshift-origin[]
9697
ifdef::openshift-origin[]
97-
<7> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the Internet. The default value is `External`.
98+
<8> How to publish the user-facing endpoints of your cluster. Set `publish` to `Internal` to deploy a private cluster, which cannot be accessed from the Internet. The default value is `External`.
9899
To use a shared VPC in a cluster that uses infrastructure that you provision, you must set `publish` to `Internal`. The installation program will no longer be able to access the public DNS zone for the base domain in the host project.
99-
endif::openshift-origin[]
100+
endif::openshift-origin[]

0 commit comments

Comments
 (0)