OSDOCS-16547 Second attempt at replacing GCP/Google Cloud Platform with attributes #101036

bscott-rh · 2025-10-23T20:41:31Z

Where #100535 replaced all instances with {gcp-full}, this PR instead attempts to contextually replace:

Google Cloud Platform (GCP) with {gcp-first}
Google Cloud Platform with {gcp-full}
Google Cloud with {gcp-full}
GCP with {gcp-short}

4.12+
https://issues.redhat.com/browse/OSDOCS-16547

Preview: https://101036--ocpdocs-pr.netlify.app/openshift-enterprise/latest/welcome/

ocpdocs-previewbot · 2025-10-23T20:52:01Z

🤖 Tue Oct 28 18:02:39 - Prow CI generated the docs preview:
https://101036--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

contributing_to_docs/term_glossary.adoc

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

modules/ccs-gcp-customer-requirements.adoc

modules/cert-manager-acme-dns01-ambient-gcp.adoc

modules/gcp-limits.adoc

modules/installation-gcp-limits.adoc

modules/machineset-creating-non-guaranteed-instances.adoc

modules/machineset-non-guaranteed-instance.adoc

modules/nvidia-gpu-gcp-adding-a-gpu-node.adoc

modules/osd-create-cluster-ccs-gcp.adoc

modules/private-service-connect-create.adoc

osd_whats_new/osd-whats-new.adoc

...iguration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-gcp.adoc

modules/create-wif-cluster-ocm.adoc

modules/deploy-red-hat-openshift-container-storage.adoc

modules/osd-create-cluster-gcp-account.adoc

modules/osd-create-cluster-rhm-gcp-account.adoc

modules/persistent-storage-csi-gcp-hyperdisk-storage-pools-procedure.adoc

modules/recommended-configurable-storage-technology.adoc

modules/wif-overview.adoc

osd_whats_new/osd-whats-new.adoc

jeana-redhat

One stray attribute in the topic map. Machine mgmt content LGTM, also scanned over CCO stuff since I originated a lot of it. Noticed one GUI thing in a nearby file, not sure if there is anything to do about that or others like it.

Thank you SO MUCH for doing this!!!!

_topic_maps/_topic_map.yml

modules/create-wif-cluster-ocm.adoc

modules/cert-manager-acme-dns01-ambient-gcp.adoc

jeana-redhat

Nice work, what a huge 🥙 😅

Scanned through diffs for oddities
Checked the assemblies in the output since those are the place I'd most expect to see issues (because of having to move the include::_attributes/common-attributes.adoc[] line)
Spot-checked text in all impacted distro previewss, but definitely not all files. Looked for any that seemed like more than a straightforward replacement of plain text.

Happy to rereview any subsequent commits
Don't forget to squash
Lmk if you need eyes on the cherrypicks. I wonder if there is a way to show resolved merge conflicts as a separate commit 🤔

/remove-label merge-review-in-progress
/remove-label merge-review-needed

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

installing/installing_gcp/uninstalling-cluster-gcp.adoc

modules/cert-manager-acme-dns01-explicit-gcp.adoc

modules/migration-understanding-data-copy-methods.adoc

modules/nvidia-gpu-csps.adoc

modules/oadp-support-backup-data-immutability.adoc

openshift-ci · 2025-10-28T18:09:12Z

@bscott-rh: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

bscott-rh · 2025-10-28T18:38:48Z

/cherrypick enterprise-4.21

openshift-cherrypick-robot · 2025-10-28T18:39:35Z

@bscott-rh: #101036 failed to apply on top of branch "enterprise-4.21":

Applying: gcp-first replacement
.git/rebase-apply/patch:6956: trailing whitespace.
<7> Specify the {gcp-short} region, such as `us-central1`. 
.git/rebase-apply/patch:7441: trailing whitespace.
To create a {gcp-first} cluster with multi-architecture compute machines, you must first create a single-architecture {gcp-short} installer-provisioned cluster with the multi-architecture installer binary. For more information on AWS installations, see xref:../../installing/installing_gcp/installing-gcp-customizations.adoc[Installing a cluster on {gcp-short} with customizations]. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	installing/overview/installing-preparing.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/installation-configure-proxy.adoc
M	modules/logging-loki-cli-install.adoc
M	modules/logging-loki-gui-install.adoc
M	modules/nw-egress-ips-about.adoc
M	modules/nw-udn-limitations.adoc
M	modules/oadp-s3-compatible-backup-storage-providers.adoc
M	windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc
Falling back to patching base and 3-way merge...
Auto-merging windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc
Auto-merging modules/oadp-s3-compatible-backup-storage-providers.adoc
Auto-merging modules/nw-udn-limitations.adoc
CONFLICT (content): Merge conflict in modules/nw-udn-limitations.adoc
Auto-merging modules/nw-egress-ips-about.adoc
Auto-merging modules/logging-loki-gui-install.adoc
Auto-merging modules/logging-loki-cli-install.adoc
Auto-merging modules/installation-configure-proxy.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging installing/overview/installing-preparing.adoc
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 gcp-first replacement

In response to this:

/cherrypick enterprise-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

bscott-rh · 2025-10-28T19:02:41Z

/cherrypick enterprise-4.19

openshift-cherrypick-robot · 2025-10-28T19:03:26Z

@bscott-rh: #101036 failed to apply on top of branch "enterprise-4.19":

Applying: gcp-first replacement
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-network-customizations.adoc
M	installing/installing_gcp/installing-gcp-private.adoc
M	installing/installing_gcp/installing-gcp-shared-vpc.adoc
M	installing/installing_gcp/installing-gcp-user-infra-vpc.adoc
M	installing/installing_gcp/installing-gcp-user-infra.adoc
M	installing/installing_gcp/installing-gcp-vpc.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.adoc
M	installing/installing_gcp/preparing-to-install-on-gcp.adoc
M	installing/overview/installing-preparing.adoc
M	migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
M	modules/cco-ccoctl-creating-at-once.adoc
M	modules/cco-ccoctl-install-creating-manifests.adoc
M	modules/ccs-gcp-customer-procedure-wif.adoc
M	modules/ccs-gcp-provisioned.adoc
M	modules/create-wif-cluster-cli.adoc
M	modules/create-wif-cluster-ocm.adoc
M	modules/distr-tracing-tempo-install-tempomonolithic-web-console.adoc
M	modules/distr-tracing-tempo-install-tempostack-web-console.adoc
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/gcp-limits.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-configure-proxy.adoc
M	modules/installation-gcp-tested-machine-types-arm.adoc
M	modules/installation-gcp-tested-machine-types.adoc
M	modules/installation-initializing.adoc
M	modules/installation-launching-installer.adoc
M	modules/installation-special-config-rtkernel.adoc
M	modules/log6x-quickstart-opentelemetry.adoc
M	modules/log6x-quickstart-viaq.adoc
M	modules/logging-loki-cli-install.adoc
M	modules/logging-loki-gui-install.adoc
M	modules/machineset-gcp-confidential-vm.adoc
M	modules/manually-create-identity-access-management.adoc
M	modules/minimum-required-permissions-ipi-gcp-xpn.adoc.git/rebase-apply/patch:6956: trailing whitespace.
<7> Specify the {gcp-short} region, such as `us-central1`. 
.git/rebase-apply/patch:7441: trailing whitespace.
To create a {gcp-first} cluster with multi-architecture compute machines, you must first create a single-architecture {gcp-short} installer-provisioned cluster with the multi-architecture installer binary. For more information on AWS installations, see xref:../../installing/installing_gcp/installing-gcp-customizations.adoc[Installing a cluster on {gcp-short} with customizations]. 
warning: 2 lines add whitespace errors.

M	modules/minimum-required-permissions-ipi-gcp.adoc
M	modules/network-observability-loki-install.adoc
M	modules/nodes-nodes-rtkernel-arguments.adoc
M	modules/nvidia-gpu-gcp-adding-a-gpu-node.adoc
M	modules/nw-egress-ips-about.adoc
M	modules/oadp-s3-compatible-backup-storage-providers.adoc
M	modules/osd-create-cluster-ccs.adoc
M	modules/osd-create-cluster-red-hat-account.adoc
M	modules/osd-intro.adoc
M	modules/persistent-storage-csi-manila-dynamic-provisioning.adoc
M	modules/sdpolicy-security.adoc
M	observability/distr_tracing/distr-tracing-tempo-installing.adoc
M	observability/logging/logging-6.0/log6x-about.adoc
M	osd_whats_new/osd-whats-new.adoc
M	post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-configuration.adoc
M	storage/container_storage_interface/persistent-storage-csi-google-cloud-file.adoc
M	updating/updating_a_cluster/migrating-to-multi-payload.adoc
M	windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc
Falling back to patching base and 3-way merge...
Auto-merging windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc
Auto-merging updating/updating_a_cluster/migrating-to-multi-payload.adoc
CONFLICT (content): Merge conflict in updating/updating_a_cluster/migrating-to-multi-payload.adoc
Auto-merging storage/container_storage_interface/persistent-storage-csi-google-cloud-file.adoc
Auto-merging post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-configuration.adoc
Auto-merging osd_whats_new/osd-whats-new.adoc
Auto-merging observability/logging/logging-6.0/log6x-about.adoc
Auto-merging observability/distr_tracing/distr-tracing-tempo-installing.adoc
Auto-merging modules/sdpolicy-security.adoc
Auto-merging modules/persistent-storage-csi-manila-dynamic-provisioning.adoc
Auto-merging modules/osd-intro.adoc
Auto-merging modules/osd-create-cluster-red-hat-account.adoc
Auto-merging modules/osd-create-cluster-ccs.adoc
Auto-merging modules/oadp-s3-compatible-backup-storage-providers.adoc
Auto-merging modules/nw-egress-ips-about.adoc
Auto-merging modules/nvidia-gpu-gcp-adding-a-gpu-node.adoc
Auto-merging modules/nodes-nodes-rtkernel-arguments.adoc
Auto-merging modules/network-observability-loki-install.adoc
Auto-merging modules/minimum-required-permissions-ipi-gcp.adoc
Auto-merging modules/minimum-required-permissions-ipi-gcp-xpn.adoc
Auto-merging modules/manually-create-identity-access-management.adoc
Auto-merging modules/machineset-gcp-confidential-vm.adoc
Auto-merging modules/logging-loki-gui-install.adoc
Auto-merging modules/logging-loki-cli-install.adoc
Auto-merging modules/log6x-quickstart-viaq.adoc
Auto-merging modules/log6x-quickstart-opentelemetry.adoc
Auto-merging modules/installation-special-config-rtkernel.adoc
Auto-merging modules/installation-launching-installer.adoc
Auto-merging modules/installation-initializing.adoc
Auto-merging modules/installation-gcp-tested-machine-types.adoc
Auto-merging modules/installation-gcp-tested-machine-types-arm.adoc
Auto-merging modules/installation-configure-proxy.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/gcp-limits.adoc
CONFLICT (content): Merge conflict in modules/gcp-limits.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-tempostack-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-tempomonolithic-web-console.adoc
Auto-merging modules/create-wif-cluster-ocm.adoc
Auto-merging modules/create-wif-cluster-cli.adoc
CONFLICT (content): Merge conflict in modules/create-wif-cluster-cli.adoc
Auto-merging modules/ccs-gcp-provisioned.adoc
CONFLICT (content): Merge conflict in modules/ccs-gcp-provisioned.adoc
Auto-merging modules/ccs-gcp-customer-procedure-wif.adoc
Auto-merging modules/cco-ccoctl-install-creating-manifests.adoc
Auto-merging modules/cco-ccoctl-creating-at-once.adoc
Auto-merging migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Auto-merging installing/overview/installing-preparing.adoc
CONFLICT (content): Merge conflict in installing/overview/installing-preparing.adoc
Auto-merging installing/installing_gcp/preparing-to-install-on-gcp.adoc
CONFLICT (content): Merge conflict in installing/installing_gcp/preparing-to-install-on-gcp.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_gcp/installing-gcp-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-user-infra.adoc
Auto-merging installing/installing_gcp/installing-gcp-user-infra-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-shared-vpc.adoc
Auto-merging installing/installing_gcp/installing-gcp-private.adoc
Auto-merging installing/installing_gcp/installing-gcp-network-customizations.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
Auto-merging backup_and_restore/application_backup_and_restore/installing/installing-oadp-gcp.adoc
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 gcp-first replacement

In response to this:

/cherrypick enterprise-4.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

bscott-rh · 2025-10-28T19:20:07Z

/cherrypick enterprise-4.20

openshift-cherrypick-robot · 2025-10-28T19:20:58Z

@bscott-rh: new pull request created: #101252

In response to this:

/cherrypick enterprise-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 23, 2025