Skip to content

Conversation

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 9, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-17013-bm-upi branch from e2962e9 to ba14d03 Compare December 9, 2025 11:14
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 9, 2025
@dfitzmau dfitzmau force-pushed the OSDOCS-17013-bm-upi branch from ba14d03 to 3c5ceb0 Compare December 9, 2025 11:17
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Dec 9, 2025

🤖 Tue Dec 09 12:54:56 - Prow CI generated the docs preview:
https://103618--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@dfitzmau dfitzmau force-pushed the OSDOCS-17013-bm-upi branch 2 times, most recently from 11cb533 to ee42caa Compare December 9, 2025 11:32
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 9, 2025
. Select the appropriate version from the *Version* drop-down list.
. Click *Download Now* next to the *OpenShift v{product-version} macOS Clients* entry and save the file.
endif::microshift,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
. Unpack and unzip the archive.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 [error] RedHat.TermsErrors: Use 'extract' or 'decompress' rather than 'unzip'. For more information, see RedHat.TermsErrors.

. Select the appropriate version from the *Version* list.
. Click *Download Now* next to the *OpenShift v{product-version} Windows Client* entry and save the file.
endif::microshift,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
. Unzip the archive with a ZIP program.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 [error] RedHat.TermsErrors: Use 'extract' or 'decompress' rather than 'Unzip'. For more information, see RedHat.TermsErrors.

@dfitzmau dfitzmau force-pushed the OSDOCS-17013-bm-upi branch from ee42caa to a3c620d Compare December 9, 2025 11:43
@openshift-ci
Copy link

openshift-ci bot commented Dec 9, 2025

@dfitzmau: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@dfitzmau dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Dec 11, 2025
@jeana-redhat jeana-redhat added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Dec 11, 2025
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really nice work, this is in significantly better shape for migration. Additional gold star for cleaning up additional resources content, thank you! A couple little things i saw in here, but not much given the scope of the changes 🤓

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


You can install the {oc-first} to interact with {product-title} from a command-line interface. You can install `oc` on Linux, Windows, or macOS.
[role="_abstract"]
You can install the {oc-first} binary on Linux by using the following procedure.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this was existing text but might as well nix the self-referential part while you're in here :)

Suggested change
You can install the {oc-first} binary on Linux by using the following procedure.
You can install the {oc-first} binary on Linux.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

= Installing the OpenShift CLI on macOS

[role="_abstract"]
You can install the {oc-first} binary on macOS by using the following procedure.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
You can install the {oc-first} binary on macOS by using the following procedure.
You can install the {oc-first} binary on macOS.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

= Installing the OpenShift CLI on Windows

[role="_abstract"]
You can install the {oc-first} binary on Windows by using the following procedure.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
You can install the {oc-first} binary on Windows by using the following procedure.
You can install the {oc-first} binary on Windows.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a couple discrepancies between the Linux, Mac, and Windows steps:

  • Linux has a step (2. Select the architecture from the Product Variant list.) that is missing from the others. Seems the user needs to pick that regardless of what OS they are going to run oc from.
  • The Mac version of "Select the appropriate version from the Version drop-down list." says "drop-down list" instead of just "list" like the other two.
  • The Mac version has PATH without backticks in one place where the other two always use PATH. I marked both the Mac discrepancies in the module for easy reference.

I assume these result from duplicated content that has become skewed over time. A snippet of common steps might be helpful to make sure things don't become inaccurate or inconsistent across slightly different procedures. I don't know if you want to do that or not while you are here, but either way should probably make sure they are all right and match where appropriate.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll make these changes but the original content is really outside of scope so I'll make low-level changes. I'm only assisting the install team with this work.

endif::[]
ifndef::openshift-origin,microshift,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
. Navigate to the link:https://access.redhat.com/downloads/content/290[Download {product-title}] page on the Red{nbsp}Hat Customer Portal.
. Select the appropriate version from the *Version* drop-down list.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
. Select the appropriate version from the *Version* drop-down list.
. Select the appropriate version from the *Version* list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

. Click *Download Now* next to the *OpenShift v{product-version} macOS Clients* entry and save the file.
endif::microshift,openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
. Unpack and unzip the archive.
. Move the `oc` binary to a directory on your PATH.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
. Move the `oc` binary to a directory on your PATH.
. Move the `oc` binary to a directory on your `PATH`.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

Comment on lines +18 to +24
include::modules/cli-installing-cli-linux.adoc[leveloffset=+1]

// Installing the OpenShift CLI on Windows
include::modules/cli-installing-cli-windows.adoc[leveloffset=+1]

// Installing the OpenShift CLI on macOS
include::modules/cli-installing-cli-macos.adoc[leveloffset=+1]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like these should be [leveloffset=+2] like the module they replaced

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

@openshift-ci openshift-ci bot removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Dec 11, 2025
@dfitzmau dfitzmau merged commit 001a690 into openshift:main Dec 12, 2025
2 checks passed
@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.21

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.19

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.18

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.17

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #103857

Details

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.

@openshift-cherrypick-robot

@dfitzmau: new pull request created: #103858

Details

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-cherrypick-robot

@dfitzmau: new pull request created: #103859

Details

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.

@openshift-cherrypick-robot

@dfitzmau: #103618 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc
Using index info to reconstruct a base tree...
M	cli_reference/openshift_cli/getting-started-cli.adoc
M	cli_reference/openshift_cli/usage-oc-kubectl.adoc
M	disconnected/installing-mirroring-installation-images.adoc
M	installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
M	installing/installing_bare_metal/upi/installing-bare-metal.adoc
M	installing/installing_gcp/installing-gcp-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_ibm_cloud/installing-ibm-cloud-customizations.adoc
M	installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
M	modules/cli-installing-cli.adoc
M	modules/installation-configuration-parameters.adoc
M	openshift_images/samples-operator-alt-registry.adoc
Falling back to patching base and 3-way merge...
Auto-merging openshift_images/samples-operator-alt-registry.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/cli-installing-cli-linux.adoc
CONFLICT (content): Merge conflict in modules/cli-installing-cli-linux.adoc
Auto-merging installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
Auto-merging installing/installing_ibm_cloud/installing-ibm-cloud-customizations.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-customizations.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal.adoc
CONFLICT (content): Merge conflict in installing/installing_bare_metal/upi/installing-bare-metal.adoc
Auto-merging installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
Auto-merging installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc
Auto-merging disconnected/installing-mirroring-installation-images.adoc
Auto-merging cli_reference/openshift_cli/usage-oc-kubectl.adoc
Auto-merging cli_reference/openshift_cli/getting-started-cli.adoc
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 OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc

Details

In response to this:

/cherrypick enterprise-4.18

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-cherrypick-robot

@dfitzmau: #103618 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc
Using index info to reconstruct a base tree...
M	cli_reference/openshift_cli/getting-started-cli.adoc
M	cli_reference/openshift_cli/usage-oc-kubectl.adoc
A	disconnected/installing-mirroring-installation-images.adoc
M	disconnected/updating/mirroring-image-repository.adoc
M	installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
M	installing/installing_aws/upi/upi-aws-preparing-to-install.adoc
M	installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc
M	installing/installing_azure/upi/installing-azure-user-infra.adoc
M	installing/installing_azure/upi/installing-restricted-networks-azure-user-provisioned.adoc
A	installing/installing_bare_metal/upi/installation-config-parameters-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
M	installing/installing_gcp/installing-gcp-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_ibm_cloud/installing-ibm-cloud-customizations.adoc
M	installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
M	installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc
M	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
M	installing/installing_ibm_z/upi/upi-ibm-z-preparing-to-install.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_vsphere/ipi/ipi-vsphere-preparing-to-install.adoc
M	installing/installing_vsphere/upi/upi-vsphere-preparing-to-install.adoc
M	modules/cli-installing-cli.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-machine-requirements.adoc
M	modules/installation-network-user-infra.adoc
M	openshift_images/samples-operator-alt-registry.adoc
M	security/container_security/security-hosts-vms.adoc
Falling back to patching base and 3-way merge...
Auto-merging security/container_security/security-hosts-vms.adoc
CONFLICT (content): Merge conflict in security/container_security/security-hosts-vms.adoc
Auto-merging openshift_images/samples-operator-alt-registry.adoc
Auto-merging modules/installation-network-user-infra.adoc
Auto-merging modules/installation-machine-requirements.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/cli-installing-cli-linux.adoc
CONFLICT (content): Merge conflict in modules/cli-installing-cli-linux.adoc
Auto-merging installing/installing_vsphere/upi/upi-vsphere-preparing-to-install.adoc
Auto-merging installing/installing_vsphere/ipi/ipi-vsphere-preparing-to-install.adoc
Auto-merging installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
Auto-merging installing/installing_ibm_z/upi/upi-ibm-z-preparing-to-install.adoc
Auto-merging installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
Auto-merging installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc
Auto-merging installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
Auto-merging installing/installing_ibm_cloud/installing-ibm-cloud-customizations.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-customizations.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_bare_metal/upi/installing-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
Auto-merging installing/installing_bare_metal/installation-config-parameters-bare-metal.adoc
Auto-merging installing/installing_azure/upi/installing-restricted-networks-azure-user-provisioned.adoc
Auto-merging installing/installing_azure/upi/installing-azure-user-infra.adoc
Auto-merging installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc
Auto-merging installing/installing_aws/upi/upi-aws-preparing-to-install.adoc
Auto-merging installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
Auto-merging disconnected/updating/mirroring-image-repository.adoc
Auto-merging disconnected/mirroring/installing-mirroring-installation-images.adoc
Auto-merging cli_reference/openshift_cli/usage-oc-kubectl.adoc
Auto-merging cli_reference/openshift_cli/getting-started-cli.adoc
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 OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc

Details

In response to this:

/cherrypick enterprise-4.17

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-cherrypick-robot

@dfitzmau: #103618 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc
Using index info to reconstruct a base tree...
M	cli_reference/openshift_cli/getting-started-cli.adoc
M	cli_reference/openshift_cli/usage-oc-kubectl.adoc
A	disconnected/installing-mirroring-installation-images.adoc
A	disconnected/updating/mirroring-image-repository.adoc
M	installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
M	installing/installing_aws/upi/upi-aws-preparing-to-install.adoc
A	installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc
A	installing/installing_azure/upi/installing-azure-preparing-upi.adoc
A	installing/installing_azure/upi/installing-azure-user-infra.adoc
A	installing/installing_azure/upi/installing-restricted-networks-azure-user-provisioned.adoc
A	installing/installing_azure_stack_hub/ipi/ipi-ash-preparing-to-install.adoc
A	installing/installing_azure_stack_hub/upi/upi-ash-preparing-to-install.adoc
A	installing/installing_bare_metal/upi/installation-config-parameters-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
M	installing/installing_gcp/installing-gcp-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
A	installing/installing_ibm_cloud/installing-ibm-cloud-customizations.adoc
A	installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc
A	installing/installing_ibm_cloud/installing-ibm-cloud-private.adoc
A	installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc
A	installing/installing_ibm_cloud/installing-ibm-cloud-vpc.adoc
M	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
A	installing/installing_ibm_z/upi/upi-ibm-z-preparing-to-install.adoc
M	installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_vsphere/ipi/ipi-vsphere-preparing-to-install.adoc
M	installing/installing_vsphere/upi/upi-vsphere-preparing-to-install.adoc
M	microshift_cli_ref/microshift-oc-cli-install.adoc
M	modules/cli-installing-cli.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-machine-requirements.adoc
M	modules/installation-network-user-infra.adoc
M	openshift_images/samples-operator-alt-registry.adoc
M	security/container_security/security-hosts-vms.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating_a_cluster/updating_disconnected_cluster/mirroring-image-repository.adoc
Auto-merging security/container_security/security-hosts-vms.adoc
CONFLICT (content): Merge conflict in security/container_security/security-hosts-vms.adoc
Auto-merging openshift_images/samples-operator-alt-registry.adoc
Auto-merging modules/installation-network-user-infra.adoc
Auto-merging modules/installation-machine-requirements.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/cli-installing-cli-linux.adoc
CONFLICT (content): Merge conflict in modules/cli-installing-cli-linux.adoc
Auto-merging microshift_cli_ref/microshift-oc-cli-install.adoc
Auto-merging installing/installing_vsphere/upi/upi-vsphere-preparing-to-install.adoc
Auto-merging installing/installing_vsphere/ipi/ipi-vsphere-preparing-to-install.adoc
Auto-merging installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
Auto-merging installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
CONFLICT (modify/delete): installing/installing_ibm_z/upi/upi-ibm-z-preparing-to-install.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_ibm_z/upi/upi-ibm-z-preparing-to-install.adoc left in tree.
Auto-merging installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-restricted.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-private.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-customizations.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-customizations.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_bare_metal/upi/installing-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
Auto-merging installing/installing_bare_metal/installation-config-parameters-bare-metal.adoc
CONFLICT (modify/delete): installing/installing_azure_stack_hub/upi/upi-ash-preparing-to-install.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_azure_stack_hub/upi/upi-ash-preparing-to-install.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/ipi-ash-preparing-to-install.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_azure_stack_hub/ipi/ipi-ash-preparing-to-install.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/upi/installing-azure-preparing-upi.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_azure/upi/installing-azure-preparing-upi.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc deleted in HEAD and modified in OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc. Version OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc of installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc left in tree.
Auto-merging installing/installing_azure/installing-restricted-networks-azure-user-provisioned.adoc
Auto-merging installing/installing_azure/installing-azure-user-infra.adoc
Auto-merging installing/installing_aws/upi/upi-aws-preparing-to-install.adoc
Auto-merging installing/installing_aws/ipi/ipi-aws-preparing-to-install.adoc
Auto-merging installing/disconnected_install/installing-mirroring-installation-images.adoc
Auto-merging cli_reference/openshift_cli/usage-oc-kubectl.adoc
Auto-merging cli_reference/openshift_cli/getting-started-cli.adoc
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 OSDOCS-17013-bm-upi: CQA2.0 complete for BM UPI doc

Details

In response to this:

/cherrypick enterprise-4.16

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants