Merge pull request #87025 from openshift-cherrypick-robot/cherry-pick-84718-to-enterprise-4.15

adellape · web-flow · commit 47e83a95045d · 2025-01-28T12:35:24.000-07:00
diff --git a/modules/cli-logging-in-kubeadmin.adoc b/modules/cli-logging-in-kubeadmin.adoc
@@ -60,6 +60,18 @@
 // * installing/installing-restricted-networks-azure-installer-provisioned.adoc
 // * installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc
 
+ifeval::["{context}" == "installing-gcp-user-infra"]
+:gcp:
+:three-node-cluster:
+endif::[]
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:gcp:
+:user-infra-vpc:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-gcp"]
+:gcp:
+:restricted:
+endif::[]
 
 :_mod-docs-content-type: PROCEDURE
 [id="cli-logging-in-kubeadmin_{context}"]
@@ -70,9 +82,13 @@ The `kubeconfig` file contains information about the cluster that is used by the
 The file is specific to a cluster and is created during {product-title} installation.
 
 .Prerequisites
-
+ifndef::gcp[]
 * You deployed an {product-title} cluster.
+endif::gcp[]
 * You installed the `oc` CLI.
+ifdef::gcp[]
+* Ensure the bootstrap process completed successfully.
+endif::gcp[]
 
 .Procedure
 
@@ -97,3 +113,16 @@ $ oc whoami
 ----
 system:admin
 ----
+
+ifeval::["{context}" == "installing-gcp-user-infra"]
+:!gcp:
+:!three-node-cluster:
+endif::[]
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:!gcp:
+:!user-infra-vpc:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-gcp"]
+:!gcp:
+:!restricted:
+endif::[]
diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc
@@ -98,6 +98,18 @@ endif::[]
 ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
 :bare-metal:
 endif::[]
+ifeval::["{context}" == "installing-gcp-user-infra"]
+:gcp:
+:three-node-cluster:
+endif::[]
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:gcp:
+:user-infra-vpc:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-gcp"]
+:gcp:
+:restricted:
+endif::[]
 ifeval::["{context}" == "installing-vsphere"]
 :vsphere:
 endif::[]
@@ -135,10 +147,12 @@ range that is specified in the `networking.machineNetwork[].cidr` field in the
 ====
 endif::bare-metal[]
 
-.Prerequisites
 
+.Prerequisites
+ifndef::gcp[]
 * You have an existing `install-config.yaml` file.
 // TODO: xref (../../installing/install_config/configuring-firewall.adoc#configuring-firewall)
+endif::gcp[]
 * You reviewed the sites that your cluster requires access to and determined whether any of them need to bypass the proxy. By default, all cluster egress traffic is proxied, including calls to hosting cloud provider APIs. You added sites to the `Proxy` object's `spec.noProxy` field to bypass the proxy if necessary.
 +
 [NOTE]
@@ -258,6 +272,18 @@ endif::[]
 ifeval::["{context}" == "installing-vsphere"]
 :!vsphere:
 endif::[]
+ifeval::["{context}" == "installing-gcp-user-infra"]
+:!gcp:
+:!three-node-cluster:
+endif::[]
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:!gcp:
+:!user-infra-vpc:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-gcp"]
+:!gcp:
+:!restricted:
+endif::[]
 ifeval::["{context}" == "installing-restricted-networks-vsphere"]
 :!vsphere:
 endif::[]
diff --git a/modules/installation-creating-gcp-bootstrap.adoc b/modules/installation-creating-gcp-bootstrap.adoc
@@ -26,12 +26,8 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
-* Create and configure networking and load balancers in GCP.
-* Create control plane and compute roles.
-* Ensure pyOpenSSL is installed.
+* Ensure you defined the variables in the _Exporting common variables_ and _Creating load balancers in GCP_ sections.
+* Ensure you installed pyOpenSSL.
 
 .Procedure
 
diff --git a/modules/installation-creating-gcp-control-plane.adoc b/modules/installation-creating-gcp-control-plane.adoc
@@ -26,11 +26,7 @@ might have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
-* Create and configure networking and load balancers in GCP.
-* Create control plane and compute roles.
+* Ensure you defined the variables in the _Exporting common variables_, _Creating load balancers in GCP_, _Creating IAM roles in GCP_, and _Creating the bootstrap machine in GCP_ sections.
 * Create the bootstrap machine.
 
 .Procedure
diff --git a/modules/installation-creating-gcp-firewall-rules-vpc.adoc b/modules/installation-creating-gcp-firewall-rules-vpc.adoc
@@ -25,9 +25,7 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
+* Ensure you defined the variables in the _Exporting common variables_ and _Creating load balancers in GCP_ sections.
 
 .Procedure
 
diff --git a/modules/installation-creating-gcp-iam-shared-vpc.adoc b/modules/installation-creating-gcp-iam-shared-vpc.adoc
@@ -25,9 +25,7 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
+* You have defined the variables in the _Exporting common variables_ section.
 
 .Procedure
 
diff --git a/modules/installation-creating-gcp-lb.adoc b/modules/installation-creating-gcp-lb.adoc
@@ -25,9 +25,7 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
+* You have defined the variables in the _Exporting common variables_ section.
 
 .Procedure
 
diff --git a/modules/installation-creating-gcp-private-dns.adoc b/modules/installation-creating-gcp-private-dns.adoc
@@ -25,9 +25,7 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
+* Ensure you defined the variables in the _Exporting common variables_ and _Creating load balancers in GCP_ sections.
 
 .Procedure
 
diff --git a/modules/installation-creating-gcp-vpc.adoc b/modules/installation-creating-gcp-vpc.adoc
@@ -26,10 +26,7 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-ifndef::shared-vpc[]
-* Generate the Ignition config files for your cluster.
-endif::shared-vpc[]
+* You have defined the variables in the _Exporting common variables_ section.
 
 .Procedure
 
diff --git a/modules/installation-creating-gcp-worker.adoc b/modules/installation-creating-gcp-worker.adoc
@@ -40,11 +40,7 @@ have to contact Red Hat support with your installation logs.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
-* Create and configure networking and load balancers in GCP.
-* Create control plane and compute roles.
+* Ensure you defined the variables in the _Exporting common variables_, _Creating load balancers in GCP_, and _Creating the bootstrap machine in GCP_ sections.
 * Create the bootstrap machine.
 * Create the control plane machines.
 
diff --git a/modules/installation-extracting-infraid.adoc b/modules/installation-extracting-infraid.adoc
@@ -85,10 +85,12 @@ The Ignition config files contain a unique cluster identifier that you can use t
 uniquely identify your cluster in {cp-first}. If you plan to use the cluster identifier as the name of your virtual machine folder, you must extract it.
 endif::vsphere[]
 
-.Prerequisites
 
+.Prerequisites
+ifndef::gcp[]
 * You obtained the {product-title} installation program and the pull secret for your cluster.
 * You generated the Ignition config files for your cluster.
+endif::gcp[]
 * You installed the `jq` package.
 
 .Procedure
diff --git a/modules/installation-gcp-enabling-confidential-vms.adoc b/modules/installation-gcp-enabling-confidential-vms.adoc
@@ -20,9 +20,6 @@ You can use Confidential VMs when installing your cluster. Confidential VMs encr
 Confidential VMs are currently not supported on 64-bit ARM architectures.
 ====
 
-.Prerequisites
-* You have created an `install-config.yaml` file.
-
 .Procedure
 
 * Use a text editor to edit the `install-config.yaml` file prior to deploying your cluster and add one of the following stanzas:
diff --git a/modules/installation-gcp-enabling-shielded-vms.adoc b/modules/installation-gcp-enabling-shielded-vms.adoc
@@ -19,9 +19,6 @@ You can use Shielded VMs when installing your cluster. Shielded VMs have extra s
 Shielded VMs are currently not supported on clusters with 64-bit ARM infrastructures.
 ====
 
-.Prerequisites
-* You have created an `install-config.yaml` file.
-
 .Procedure
 
 * Use a text editor to edit the `install-config.yaml` file prior to deploying your cluster and add one of the following stanzas:
diff --git a/modules/installation-gcp-user-infra-adding-ingress.adoc b/modules/installation-gcp-user-infra-adding-ingress.adoc
@@ -8,6 +8,10 @@ ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
 :shared-vpc:
 endif::[]
 
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:gcp:
+endif::[]
+
 :_mod-docs-content-type: PROCEDURE
 [id="installation-gcp-user-infra-adding-ingress_{context}"]
 ifndef::shared-vpc[]
@@ -27,15 +31,10 @@ endif::[]
 
 .Prerequisites
 
-* Configure a GCP account.
+* Ensure you defined the variables in the _Exporting common variables_ section.
 * Remove the DNS Zone configuration when creating Kubernetes manifests and
 generating Ignition configs.
-* Create and configure a VPC and associated subnets in GCP.
-* Create and configure networking and load balancers in GCP.
-* Create control plane and compute roles.
-* Create the bootstrap machine.
-* Create the control plane machines.
-* Create the worker machines.
+* Ensure the bootstrap process completed successfully.
 
 .Procedure
 
@@ -123,3 +122,7 @@ prometheus-k8s-openshift-monitoring.apps.your.cluster.domain.example.com
 ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
 :!shared-vpc:
 endif::[]
+
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:!gcp:
+endif::[]
diff --git a/modules/installation-gcp-user-infra-completing.adoc b/modules/installation-gcp-user-infra-completing.adoc
@@ -13,8 +13,7 @@ cluster is ready.
 
 .Prerequisites
 
-* Deploy the bootstrap machine for an {product-title} cluster on user-provisioned GCP infrastructure.
-* Install the `oc` CLI and log in.
+* Ensure the bootstrap process completed successfully.
 
 .Procedure
 
diff --git a/modules/installation-gcp-user-infra-wait-for-bootstrap.adoc b/modules/installation-gcp-user-infra-wait-for-bootstrap.adoc
@@ -14,11 +14,7 @@ installation program.
 
 .Prerequisites
 
-* Configure a GCP account.
-* Generate the Ignition config files for your cluster.
-* Create and configure a VPC and associated subnets in GCP.
-* Create and configure networking and load balancers in GCP.
-* Create control plane and compute roles.
+* Ensure you defined the variables in the _Exporting common variables_ and _Creating load balancers in GCP_ sections.
 * Create the bootstrap machine.
 * Create the control plane machines.
 
diff --git a/modules/installation-initializing.adoc b/modules/installation-initializing.adoc
@@ -239,6 +239,9 @@ endif::azure[]
 ifdef::nutanix[]
 * You have verified that you have met the Nutanix networking requirements. For more information, see "Preparing to install on Nutanix".
 endif::nutanix[]
+ifdef::gcp[]
+* Configure a {gcp-short} account.
+endif::gcp[]
 
 .Procedure
 
diff --git a/modules/installation-user-infra-exporting-common-variables.adoc b/modules/installation-user-infra-exporting-common-variables.adoc
@@ -3,6 +3,12 @@
 // * installing/installing_gcp/installing-gcp-user-infra.adoc
 // * installing/installing_gcp/installing-restricted-networks-gcp.adoc
 
+
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:gcp:
+:user-infra-vpc:
+endif::[]
+
 ifeval::["{context}" == "installing-gcp-user-infra"]
 :cp-first: Google Cloud Platform
 :cp: GCP
@@ -42,12 +48,6 @@ Specific {cp-template} templates can also require additional exported
 variables, which are detailed in their related procedures.
 ====
 
-.Prerequisites
-
-* Obtain the {product-title} installation program and the pull secret for your cluster.
-* Generate the Ignition config files for your cluster.
-* Install the `jq` package.
-
 .Procedure
 
 . Export the following common variables to be used by the provided {cp-template}
@@ -88,6 +88,11 @@ $ export PROJECT_NAME=`jq -r .gcp.projectID <installation_directory>/metadata.js
 <2> For `<installation_directory>`, specify the path to the directory that you stored the installation files in.
 endif::shared-vpc[]
 
+ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
+:!gcp:
+:!user-infra-vpc:
+endif::[]
+
 ifeval::["{context}" == "installing-gcp-user-infra"]
 :!cp-first:
 :!cp:
diff --git a/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc b/modules/installation-user-infra-generate-k8s-manifest-ignition.adoc
@@ -147,13 +147,15 @@ link:https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/latest/[c
 ====
 endif::ibm-power[]
 
+ifndef::gcp[]
 .Prerequisites
 
 * You obtained the {product-title} installation program.
 ifdef::restricted,baremetal-restricted[]
 For a restricted network installation, these files are on your mirror host.
 endif::restricted,baremetal-restricted[]
 * You created the `install-config.yaml` installation configuration file.
+endif::gcp[]
 
 .Procedure
 
