Skip to content

Commit efa9971

Browse files
authored
Merge pull request #101036 from bscott-rh/replace-gcp-attr-context
OSDOCS-16547 Second attempt at replacing GCP/Google Cloud Platform with attributes
2 parents bdbb3f6 + 330911a commit efa9971

File tree

275 files changed

+951
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+951
-949
lines changed

_attributes/attributes-openshift-dedicated.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
:hybrid-console-second: Hybrid Cloud Console
1717
:hybrid-console-url: link:https://console.redhat.com[Red Hat Hybrid Cloud Console]
1818
:AWS: Amazon Web Services (AWS)
19-
:GCP: Google Cloud Platform (GCP)
19+
:GCP: Google Cloud
20+
:gcp-first: Google Cloud
21+
:gcp-full: Google Cloud
22+
:gcp-short: Google Cloud
2023
:openshift-networking: Red Hat OpenShift Networking
2124
:product-registry: OpenShift image registry
2225
:kebab: image:kebab.png[title="Options menu"]

_topic_maps/_topic_map.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -315,39 +315,39 @@ Topics:
315315
File: installation-config-parameters-ash
316316
- Name: Uninstalling a cluster
317317
File: uninstalling-cluster-azure-stack-hub
318-
- Name: Installing on GCP
318+
- Name: Installing on Google Cloud
319319
Dir: installing_gcp
320320
Distros: openshift-origin,openshift-enterprise
321321
Topics:
322-
- Name: Preparing to install on GCP
322+
- Name: Preparing to install on Google Cloud
323323
File: preparing-to-install-on-gcp
324-
- Name: Configuring a GCP project
324+
- Name: Configuring a Google Cloud project
325325
File: installing-gcp-account
326-
- Name: Installing a cluster quickly on GCP
326+
- Name: Installing a cluster quickly on Google Cloud
327327
File: installing-gcp-default
328-
- Name: Installing a cluster on GCP with customizations
328+
- Name: Installing a cluster on Google Cloud with customizations
329329
File: installing-gcp-customizations
330-
- Name: Installing a cluster on GCP in a disconnected environment
330+
- Name: Installing a cluster on Google Cloud in a disconnected environment
331331
File: installing-restricted-networks-gcp-installer-provisioned
332-
- Name: Installing a cluster on GCP into an existing VPC
332+
- Name: Installing a cluster on Google Cloud into an existing VPC
333333
File: installing-gcp-vpc
334-
- Name: Installing a cluster on GCP into a shared VPC
334+
- Name: Installing a cluster on Google Cloud into a shared VPC
335335
File: installing-gcp-shared-vpc
336-
- Name: Installing a private cluster on GCP
336+
- Name: Installing a private cluster on Google Cloud
337337
File: installing-gcp-private
338-
- Name: Installing a cluster on GCP using Deployment Manager templates
338+
- Name: Installing a cluster on Google Cloud using Deployment Manager templates
339339
File: installing-gcp-user-infra
340-
- Name: Installing a cluster into a shared VPC on GCP using Deployment Manager templates
340+
- Name: Installing a cluster into a shared VPC on Google Cloud using Deployment Manager templates
341341
File: installing-gcp-user-infra-vpc
342-
- Name: Installing a cluster on GCP in a disconnected environment with user-provisioned infrastructure
342+
- Name: Installing a cluster on Google Cloud in a disconnected environment with user-provisioned infrastructure
343343
File: installing-restricted-networks-gcp
344-
- Name: Installing a three-node cluster on GCP
344+
- Name: Installing a three-node cluster on Google Cloud
345345
File: installing-gcp-three-node
346-
- Name: Installation configuration parameters for GCP
346+
- Name: Installation configuration parameters for Google Cloud
347347
File: installation-config-parameters-gcp
348-
- Name: Uninstalling a cluster on GCP
348+
- Name: Uninstalling a cluster on Google Cloud
349349
File: uninstalling-cluster-gcp
350-
- Name: Installing a GCP cluster with the support for configuring multi-architecture compute machines
350+
- Name: Installing a Google Cloud cluster with the support for configuring multi-architecture compute machines
351351
File: installing-gcp-multiarch-support
352352
- Name: Installing on IBM Cloud
353353
Dir: installing_ibm_cloud
@@ -701,7 +701,7 @@ Topics:
701701
File: creating-multi-arch-compute-nodes-azure
702702
- Name: Creating a cluster with multi-architecture compute machines on AWS
703703
File: creating-multi-arch-compute-nodes-aws
704-
- Name: Creating a cluster with multi-architecture compute machines on GCP
704+
- Name: Creating a cluster with multi-architecture compute machines on Google Cloud
705705
File: creating-multi-arch-compute-nodes-gcp
706706
- Name: Creating a cluster with multi-architecture compute machines on bare metal, IBM Power, or IBM Z
707707
File: creating-multi-arch-compute-nodes-bare-metal
@@ -1437,7 +1437,7 @@ Topics:
14371437
File: nw-creating-dns-records-on-aws
14381438
- Name: Creating DNS records on Azure
14391439
File: nw-creating-dns-records-on-azure
1440-
- Name: Creating DNS records on GCP
1440+
- Name: Creating DNS records on Google Cloud
14411441
File: nw-creating-dns-records-on-gcp
14421442
- Name: Creating DNS records on Infoblox
14431443
File: nw-creating-dns-records-on-infoblox
@@ -1920,7 +1920,7 @@ Topics:
19201920
Topics:
19211921
- Name: Configuring the registry for AWS user-provisioned infrastructure
19221922
File: configuring-registry-storage-aws-user-infrastructure
1923-
- Name: Configuring the registry for GCP user-provisioned infrastructure
1923+
- Name: Configuring the registry for Google Cloud user-provisioned infrastructure
19241924
File: configuring-registry-storage-gcp-user-infrastructure
19251925
- Name: Configuring the registry for OpenStack user-provisioned infrastructure
19261926
File: configuring-registry-storage-openstack-user-infrastructure
@@ -2060,7 +2060,7 @@ Topics:
20602060
File: osdk-cco-aws-sts
20612061
- Name: CCO-based workflow for OLM-managed Operators with Microsoft Entra Workload ID
20622062
File: osdk-cco-azure
2063-
- Name: CCO-based workflow for OLM-managed Operators with GCP Workload Identity
2063+
- Name: CCO-based workflow for OLM-managed Operators with Google Cloud Workload Identity
20642064
File: osdk-cco-gcp
20652065
- Name: Cluster Operators reference
20662066
File: operator-reference
@@ -2383,7 +2383,7 @@ Topics:
23832383
File: creating-machineset-azure
23842384
- Name: Creating a compute machine set on Azure Stack Hub
23852385
File: creating-machineset-azure-stack-hub
2386-
- Name: Creating a compute machine set on GCP
2386+
- Name: Creating a compute machine set on Google Cloud
23872387
File: creating-machineset-gcp
23882388
- Name: Creating a compute machine set on IBM Cloud
23892389
File: creating-machineset-ibm-cloud
@@ -2438,7 +2438,7 @@ Topics:
24382438
File: cpmso-config-options-aws
24392439
- Name: Control plane configuration options for Microsoft Azure
24402440
File: cpmso-config-options-azure
2441-
- Name: Control plane configuration options for Google Cloud Platform
2441+
- Name: Control plane configuration options for Google Cloud
24422442
File: cpmso-config-options-gcp
24432443
- Name: Control plane configuration options for Nutanix
24442444
File: cpmso-config-options-nutanix
@@ -2468,7 +2468,7 @@ Topics:
24682468
Topics:
24692469
- Name: Cluster API configuration options for Amazon Web Services
24702470
File: cluster-api-config-options-aws
2471-
- Name: Cluster API configuration options for Google Cloud Platform
2471+
- Name: Cluster API configuration options for Google Cloud
24722472
File: cluster-api-config-options-gcp
24732473
- Name: Cluster API configuration options for Microsoft Azure
24742474
File: cluster-api-config-options-azure
@@ -2916,7 +2916,7 @@ Topics:
29162916
File: creating-windows-machineset-aws
29172917
- Name: Creating a Windows machine set on Azure
29182918
File: creating-windows-machineset-azure
2919-
- Name: Creating a Windows machine set on GCP
2919+
- Name: Creating a Windows machine set on Google Cloud
29202920
File: creating-windows-machineset-gcp
29212921
- Name: Creating a Windows machine set on Nutanix
29222922
File: creating-windows-machineset-nutanix
@@ -3717,10 +3717,10 @@ Topics:
37173717
Topics:
37183718
- Name: Configuring OADP with Azure
37193719
File: installing-oadp-azure
3720-
- Name: Configuring OADP with GCP
3720+
- Name: Configuring OADP with Google Cloud
37213721
Dir: installing
37223722
Topics:
3723-
- Name: Configuring OADP with GCP
3723+
- Name: Configuring OADP with Google Cloud
37243724
File: installing-oadp-gcp
37253725
- Name: Configuring OADP with MCG
37263726
Dir: installing

_topic_maps/_topic_map_osd.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Distros: openshift-dedicated
107107
Topics:
108108
- Name: Limits and scalability
109109
File: osd-limits-scalability
110-
- Name: Customer Cloud Subscriptions on GCP
110+
- Name: Customer Cloud Subscriptions on Google Cloud
111111
File: gcp-ccs
112112
- Name: Customer Cloud Subscriptions on AWS
113113
File: aws-ccs
@@ -121,24 +121,24 @@ Topics:
121121
- Name: Getting started with OpenShift Dedicated
122122
File: osd-getting-started
123123
---
124-
Name: OpenShift Dedicated clusters on GCP
124+
Name: OpenShift Dedicated clusters on Google Cloud
125125
Dir: osd_gcp_clusters
126126
Distros: openshift-dedicated
127127
Topics:
128128
- Name: Private Service Connect overview
129129
File: creating-a-gcp-psc-enabled-private-cluster
130-
- Name: Creating a cluster on GCP with Workload Identity Federation authentication
130+
- Name: Creating a cluster on Google Cloud with Workload Identity Federation authentication
131131
File: creating-a-gcp-cluster-with-workload-identity-federation
132-
- Name: Creating a cluster on GCP with Service Account authentication
132+
- Name: Creating a cluster on Google Cloud with Service Account authentication
133133
File: creating-a-gcp-cluster-sa
134-
- Name: Creating a cluster on GCP with a Red Hat cloud account
134+
- Name: Creating a cluster on Google Cloud with a Red Hat cloud account
135135
File: creating-a-gcp-cluster-redhat-account
136136

137137
#- Name: Configuring your identity providers
138138
# File: config-identity-providers
139139
#- Name: Revoking privileges and access to an OpenShift Dedicated cluster
140140
# File: osd-revoking-cluster-privileges
141-
- Name: Deleting an OpenShift Dedicated cluster on GCP
141+
- Name: Deleting an OpenShift Dedicated cluster on Google Cloud
142142
File: osd-deleting-a-cluster-gcp
143143
---
144144
Name: OpenShift Dedicated clusters on AWS
@@ -197,7 +197,7 @@ Topics:
197197
Topics:
198198
# - Name: Troubleshooting installations
199199
# File: troubleshooting-installations
200-
- Name: Troubleshooting an OSD cluster on GCP deployment
200+
- Name: Troubleshooting an OSD cluster on Google Cloud deployment
201201
File: troubleshooting-osd-gcp-cluster-deployment
202202
- Name: Verifying node health
203203
File: verifying-node-health

architecture/osd-architecture-models-gcp.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ include::modules/osd-public-architecture-model-gcp.adoc[leveloffset=+1]
2121

2222
* xref:../osd_gcp_clusters/creating-a-gcp-psc-enabled-private-cluster.adoc#creating-a-gcp-psc-enabled-private-cluster[Private Service Connect overview]
2323

24-
* xref:../osd_gcp_clusters/creating-a-gcp-cluster-with-workload-identity-federation.adoc#osd-creating-a-cluster-on-gcp-with-workload-identity-federation[Creating a cluster on GCP with Workload Identity Federation authentication]
24+
* xref:../osd_gcp_clusters/creating-a-gcp-cluster-with-workload-identity-federation.adoc#osd-creating-a-cluster-on-gcp-with-workload-identity-federation[Creating a cluster on {gcp-short} with Workload Identity Federation authentication]
2525

26-
* xref:../osd_gcp_clusters/creating-a-gcp-cluster-sa.adoc#osd-creating-a-cluster-on-gcp-sa[Creating a cluster on GCP with Service Account authentication]
26+
* xref:../osd_gcp_clusters/creating-a-gcp-cluster-sa.adoc#osd-creating-a-cluster-on-gcp-sa[Creating a cluster on {gcp-short} with Service Account authentication]

authentication/bound-service-account-tokens.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
You can use bound service account tokens, which improves the ability to integrate with cloud provider identity access management (IAM) services, such as {product-title} on AWS IAM or Google Cloud Platform IAM.
9+
You can use bound service account tokens, which improves the ability to integrate with cloud provider identity access management (IAM) services, such as {product-title} on AWS IAM or {gcp-full} IAM.
1010

1111
// About bound service account tokens
1212
include::modules/bound-sa-tokens-about.adoc[leveloffset=+1]

authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ By setting different values for the `credentialsMode` parameter in the `install-
4646
|X
4747
|
4848

49-
|Google Cloud Platform (GCP)
49+
|{gcp-first}
5050
|X
5151
|X
5252
|X
@@ -98,7 +98,7 @@ include::modules/cco-determine-mode-cli.adoc[leveloffset=+2]
9898

9999
[id="about-cloud-credential-operator-default_{context}"]
100100
== Default behavior
101-
For platforms on which multiple modes are supported (AWS, Azure, and GCP), when the CCO operates in its default mode, it checks the provided credentials dynamically to determine for which mode they are sufficient to process `CredentialsRequest` CRs.
101+
For platforms on which multiple modes are supported (AWS, Azure, and {gcp-short}), when the CCO operates in its default mode, it checks the provided credentials dynamically to determine for which mode they are sufficient to process `CredentialsRequest` CRs.
102102

103103
By default, the CCO determines whether the credentials are sufficient for mint mode, which is the preferred mode of operation, and uses those credentials to create appropriate credentials for components in the cluster. If the credentials are not sufficient for mint mode, it determines whether they are sufficient for passthrough mode. If the credentials are not sufficient for passthrough mode, the CCO cannot adequately process `CredentialsRequest` CRs.
104104

authentication/managing_cloud_provider_credentials/cco-mode-manual.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
Manual mode is supported for Amazon Web Services (AWS), global Microsoft Azure, Microsoft Azure Stack Hub, Google Cloud Platform (GCP), {ibm-cloud-name}, and Nutanix.
9+
Manual mode is supported for Amazon Web Services (AWS), global Microsoft Azure, Microsoft Azure Stack Hub, {gcp-first}, {ibm-cloud-name}, and Nutanix.
1010

1111
[id="manual-mode-classic_{context}"]
1212
== User-managed credentials
@@ -19,7 +19,7 @@ For information about configuring your cloud provider to use manual mode, see th
1919

2020
[NOTE]
2121
====
22-
An AWS, global Azure, or GCP cluster that uses manual mode might be configured to use short-term credentials for different components. For more information, see xref:../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components].
22+
An AWS, global Azure, or {gcp-short} cluster that uses manual mode might be configured to use short-term credentials for different components. For more information, see xref:../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components].
2323
====
2424

2525
[role="_additional-resources"]
@@ -28,7 +28,7 @@ An AWS, global Azure, or GCP cluster that uses manual mode might be configured t
2828

2929
* xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#manually-create-iam_installing-aws-customizations[Manually creating long-term credentials for AWS]
3030
* xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#manually-create-iam_installing-azure-customizations[Manually creating long-term credentials for Azure]
31-
* xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[Manually creating long-term credentials for GCP]
31+
* xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#manually-create-iam_installing-gcp-customizations[Manually creating long-term credentials for {gcp-short}]
3232
* xref:../../installing/installing_ibm_cloud/configuring-iam-ibm-cloud.adoc#configuring-iam-ibm-cloud[Configuring IAM for {ibm-cloud-name}]
3333
* xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#manually-create-iam-nutanix_installing-nutanix-installer-provisioned[Configuring IAM for Nutanix]
3434
* xref:../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components]

authentication/managing_cloud_provider_credentials/cco-mode-mint.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
Mint mode is the default Cloud Credential Operator (CCO) credentials mode for {product-title} on platforms that support it. Mint mode supports Amazon Web Services (AWS) and Google Cloud Platform (GCP) clusters.
9+
Mint mode is the default Cloud Credential Operator (CCO) credentials mode for {product-title} on platforms that support it. Mint mode supports Amazon Web Services (AWS) and {gcp-first} clusters.
1010

1111
[id="mint-mode-about"]
1212
== Mint mode credentials management
@@ -47,9 +47,9 @@ The credential you provide for mint mode in Amazon Web Services (AWS) must have
4747
* `iam:SimulatePrincipalPolicy`
4848
====
4949

50-
The credential you provide for mint mode in Google Cloud Platform (GCP) must have the following permissions:
50+
The credential you provide for mint mode in {gcp-first} must have the following permissions:
5151

52-
.Required GCP permissions
52+
.Required {gcp-short} permissions
5353
[%collapsible]
5454
====
5555
* `resourcemanager.projects.get`

0 commit comments

Comments
 (0)