[INTERNAL FIX] ibm-name-clean-up #67323

@@ -331,7 +331,7 @@ Available Commands:
  azure        Manage credentials objects for Azure
  gcp          Manage credentials objects for Google cloud
  help         Help about any command
-  ibmcloud     Manage credentials objects for IBM Cloud
+  ibmcloud     Manage credentials objects for {ibm-cloud-name}


This looks like CLI output that you have put a variable in, and it's not displaying IBM Cloud (I guess because you can't have variables in an example output?). But probably the CLI just has "IBM Cloud" and I think the example should just reflect what is displayed to the user.

Reverted. Good catch!

kcarmichael08 · 2023-11-13T21:33:56Z

welcome/index.adoc

@@ -81,17 +81,17 @@ You can also deploy a cluster on AWS infrastructure that you provisioned yoursel
 ifndef::openshift-origin[]
 - **xref:../installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[Install a cluster on IBM Cloud VPC]**: You can install {product-title} on IBM Cloud VPC on installer-provisioned infrastructure.


I might not understand all the nuances but should this be "IBM Cloud(R)" by using the new variable {ibm-cloud-name} and not "IBM Cloud VPC"?

Excellent catch. I missed this. Updated.

kcarmichael08 · 2023-11-13T21:37:36Z

Does IBM need the (R) here?

kcarmichael08 · 2023-11-13T21:41:34Z

Nice job! I think I managed to look at all the files and skim/search to see if the replacements were correct. Had a few questions/comments, tried to mark inline and/or provide screen caps.

kcarmichael08 · 2023-11-13T21:43:40Z

And, sorry, some of my comments are showing up multiple times - I guess because of the way that I commented on files. :( Please disregard multiple comments for the same thing....

dfitzmau · 2023-11-14T09:40:26Z

I think this one got missed? I don't see this file in the PR as being changed either.

https://67323--docspreview.netlify.app/openshift-enterprise/latest/storage/understanding-persistent-storage#types-of-persistent-volumes_understanding-persistent-storage

Yeah, it gets confusing here as "IBM VPC Block" is OK to keep but any references to "IBM Cloud VPC" need to change to "IBM Cloud". I updated any "IBM" references in this file to "{IBM-name}.

dfitzmau · 2023-11-14T09:51:21Z

Thanks, @kcarmichael08 , for the excellent review.

dfitzmau · 2023-11-14T09:56:23Z

/label merge-review-needed

sheriff-rh

One question for now!

modules/installation-bare-metal-config-yaml.adoc

sheriff-rh

Once again, this is overall great work, Darragh! My suggestions primarily focus on plain-text IBM Power, IBM Z systems, IBM LinuxONE, etc as opportunities for improvement with attributes.

modules/op-release-notes-1-2.adoc

modules/op-release-notes-1-4.adoc

modules/op-release-notes-1-6.adoc

modules/op-release-notes-1-7.adoc

modules/op-release-notes-1-8.adoc

modules/ossm-rn-new-features.adoc

modules/serverless-rn-1-28-0.adoc

sheriff-rh

Changes LGTM! Merging.

sheriff-rh · 2023-11-14T17:23:54Z

/cherrypick enterprise-4.15

sheriff-rh · 2023-11-14T17:24:07Z

/cherrypick enterprise-4.14

openshift-cherrypick-robot · 2023-11-14T17:24:37Z

@sheriff-rh: #67323 failed to apply on top of branch "enterprise-4.15":

Applying: ibm-name-clean-up
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/installation-obtaining-installer.adoc
M	modules/nw-egress-ips-about.adoc
M	security/file_integrity_operator/file-integrity-operator-release-notes.adoc
M	storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (content): Merge conflict in welcome/index.adoc
Auto-merging storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc
Auto-merging security/file_integrity_operator/file-integrity-operator-release-notes.adoc
Auto-merging modules/nw-egress-ips-about.adoc
Auto-merging modules/installation-obtaining-installer.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ibm-name-clean-up
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.15

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/test-infra repository.

openshift-cherrypick-robot · 2023-11-14T17:24:49Z

@sheriff-rh: #67323 failed to apply on top of branch "enterprise-4.14":

Applying: ibm-name-clean-up
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/installation-obtaining-installer.adoc
M	modules/nw-egress-ips-about.adoc
M	security/compliance_operator/compliance-operator-release-notes.adoc
M	security/file_integrity_operator/file-integrity-operator-release-notes.adoc
M	storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (content): Merge conflict in welcome/index.adoc
Auto-merging storage/container_storage_interface/persistent-storage-csi-ibm-vpc-block.adoc
Auto-merging security/file_integrity_operator/file-integrity-operator-release-notes.adoc
Auto-merging security/compliance_operator/compliance-operator-release-notes.adoc
Auto-merging modules/nw-egress-ips-about.adoc
Auto-merging modules/installation-obtaining-installer.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ibm-name-clean-up
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.14

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/test-infra repository.

sheriff-rh · 2023-11-15T12:05:09Z

Manual cherrypicks complete. Thanks @dfitzmau !

#67916
#67914

openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 2, 2023

dfitzmau force-pushed the ibm-name-clean-up branch 2 times, most recently from c800c8e to 090bd78 Compare November 2, 2023 16:51

openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 2, 2023

dfitzmau force-pushed the ibm-name-clean-up branch 9 times, most recently from 1cc548f to acc0b7f Compare November 3, 2023 10:11

openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 3, 2023

dfitzmau force-pushed the ibm-name-clean-up branch 7 times, most recently from def660a to c23a93b Compare November 3, 2023 15:06

lahinson mentioned this pull request Nov 6, 2023

[No Jira]: Adding registered symbol attributes for IBM Power and IBM Z #64680

Closed

SNiemann15 reviewed Nov 7, 2023

View reviewed changes

_attributes/common-attributes.adoc Outdated Show resolved Hide resolved

alishaIBM suggested changes Nov 7, 2023

View reviewed changes

_attributes/common-attributes.adoc Outdated Show resolved Hide resolved

dfitzmau force-pushed the ibm-name-clean-up branch 2 times, most recently from 7229920 to 160962b Compare November 7, 2023 17:06

kcarmichael08 reviewed Nov 13, 2023

View reviewed changes

kcarmichael08 added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Nov 13, 2023

dfitzmau force-pushed the ibm-name-clean-up branch 2 times, most recently from 418b9c8 to 5666ccf Compare November 14, 2023 09:50

openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 14, 2023

sheriff-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Nov 14, 2023

dfitzmau force-pushed the ibm-name-clean-up branch from 5666ccf to 3aea679 Compare November 14, 2023 15:20

sheriff-rh reviewed Nov 14, 2023

View reviewed changes

modules/installation-bare-metal-config-yaml.adoc Outdated Show resolved Hide resolved

sheriff-rh reviewed Nov 14, 2023

View reviewed changes

ibm-name-clean-up

8cd70ad

dfitzmau force-pushed the ibm-name-clean-up branch from 3aea679 to 8cd70ad Compare November 14, 2023 17:16

sheriff-rh approved these changes Nov 14, 2023

View reviewed changes

sheriff-rh merged commit 30a7fc7 into openshift:main Nov 14, 2023

sheriff-rh added this to the Continuous Release milestone Nov 14, 2023

dfitzmau mentioned this pull request Nov 15, 2023

[enterprise-4.14] ibm-name-clean-up-14 #67914

Merged

This was referenced Nov 23, 2023

Update IBM name/attribute rules redhat-documentation/vale-at-red-hat#695

Open

Add additional IBM product names to SSG redhat-documentation/supplementary-style-guide#424

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[INTERNAL FIX] ibm-name-clean-up #67323

[INTERNAL FIX] ibm-name-clean-up #67323

dfitzmau commented Nov 2, 2023 •

edited

Loading

ocpdocs-previewbot commented Nov 2, 2023 •

edited

Loading

SNiemann15 commented Nov 6, 2023

kcarmichael08 Nov 13, 2023

dfitzmau Nov 14, 2023

kcarmichael08 Nov 13, 2023

dfitzmau Nov 14, 2023

kcarmichael08 commented Nov 13, 2023

kcarmichael08 commented Nov 13, 2023

kcarmichael08 commented Nov 13, 2023

dfitzmau commented Nov 14, 2023

dfitzmau commented Nov 14, 2023

dfitzmau commented Nov 14, 2023

sheriff-rh left a comment

sheriff-rh left a comment

sheriff-rh left a comment

sheriff-rh commented Nov 14, 2023

sheriff-rh commented Nov 14, 2023

openshift-cherrypick-robot commented Nov 14, 2023

openshift-cherrypick-robot commented Nov 14, 2023

sheriff-rh commented Nov 15, 2023

		@@ -81,17 +81,17 @@ You can also deploy a cluster on AWS infrastructure that you provisioned yoursel
		ifndef::openshift-origin[]
		- xref:../installing/installing_ibm_cloud_public/preparing-to-install-on-ibm-cloud.adoc#preparing-to-install-on-ibm-cloud[Install a cluster on IBM Cloud VPC]: You can install {product-title} on IBM Cloud VPC on installer-provisioned infrastructure.

[INTERNAL FIX] ibm-name-clean-up #67323

[INTERNAL FIX] ibm-name-clean-up #67323

Conversation

dfitzmau commented Nov 2, 2023 • edited Loading

Building applications

Authentication and authorization

Backup and restore

Distributed tracing

Installing (IBM Cloud)

Installing (IBM Power)

Installing (IBM Power VS)

Installing (IBM Z and LinuxOne)

Installing (single-node)

Machine management

Networking

Post install

Registry

Scalability and performance

Security and compliance

Service mesh

Storage

Virt

Welcome page

Additional information:

ocpdocs-previewbot commented Nov 2, 2023 • edited Loading

SNiemann15 commented Nov 6, 2023

kcarmichael08 Nov 13, 2023

Choose a reason for hiding this comment

dfitzmau Nov 14, 2023

Choose a reason for hiding this comment

kcarmichael08 Nov 13, 2023

Choose a reason for hiding this comment

dfitzmau Nov 14, 2023

Choose a reason for hiding this comment

kcarmichael08 commented Nov 13, 2023

kcarmichael08 commented Nov 13, 2023

kcarmichael08 commented Nov 13, 2023

dfitzmau commented Nov 14, 2023

dfitzmau commented Nov 14, 2023

dfitzmau commented Nov 14, 2023

sheriff-rh left a comment

Choose a reason for hiding this comment

sheriff-rh left a comment

Choose a reason for hiding this comment

sheriff-rh left a comment

Choose a reason for hiding this comment

sheriff-rh commented Nov 14, 2023

sheriff-rh commented Nov 14, 2023

openshift-cherrypick-robot commented Nov 14, 2023

openshift-cherrypick-robot commented Nov 14, 2023

sheriff-rh commented Nov 15, 2023

dfitzmau commented Nov 2, 2023 •

edited

Loading

ocpdocs-previewbot commented Nov 2, 2023 •

edited

Loading