OCPBUGS-60988: Added update secret step to insights-operator-new-pull… by dfitzmau · Pull Request #98358 · openshift/openshift-docs

dfitzmau · 2025-09-02T14:34:04Z

Version(s):
4.12+

Issue:
OCPBUGS-60988

Link to docs preview:

Remote health reporting

SME has approved this change (Isaac Jimeno/Ondrej Pokorny).
QE has approved this change (baiyang zhou).

openshift-ci-robot · 2025-09-02T14:34:10Z

@dfitzmau: This pull request references Jira Issue OCPBUGS-60988, which is invalid:

expected the bug to target the "4.21.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-60988

Link to docs preview:

SME has approved this change.

QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

ocpdocs-previewbot · 2025-09-02T15:02:47Z

🤖 Wed Sep 24 08:13:08 - Prow CI generated the docs preview:
https://98358--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

openshift-ci-robot · 2025-09-02T15:26:33Z

@dfitzmau: This pull request references Jira Issue OCPBUGS-60988, which is invalid:

expected the bug to target the "4.21.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-60988

Link to docs preview:

Enabling remote health reporting

Changing the global cluster pull secret to disable remote health reporting

SME has approved this change.

QE has approved this change.

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2025-09-24T08:20:46Z

@dfitzmau: Jira Issue OCPBUGS-60988: All pull requests linked via external trackers have merged:

openshift/openshift-docs#98358

Jira Issue OCPBUGS-60988 has been moved to the MODIFIED state.

Details

In response to this:

Version(s):
4.12+

Issue:
OCPBUGS-60988

Link to docs preview:

Remote health reporting

SME has approved this change (Isaac Jimeno/Ondrej Pokorny).

QE has approved this change (baiyang zhou).

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 openshift-eng/jira-lifecycle-plugin repository.

dfitzmau · 2025-09-24T08:20:52Z

/cherrypick enterprise-4.20

dfitzmau · 2025-09-24T08:20:57Z

/cherrypick enterprise-4.19

dfitzmau · 2025-09-24T08:21:02Z

/cherrypick enterprise-4.18

dfitzmau · 2025-09-24T08:21:07Z

/cherrypick enterprise-4.17

dfitzmau · 2025-09-24T08:21:11Z

/cherrypick enterprise-4.16

dfitzmau · 2025-09-24T08:21:15Z

/cherrypick enterprise-4.15

dfitzmau · 2025-09-24T08:21:19Z

/cherrypick enterprise-4.14

dfitzmau · 2025-09-24T08:21:22Z

/cherrypick enterprise-4.13

dfitzmau · 2025-09-24T08:21:26Z

/cherrypick enterprise-4.12

openshift-cherrypick-robot · 2025-09-24T08:21:48Z

@dfitzmau: new pull request created: #99603

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 · 2025-09-24T08:21:53Z

@dfitzmau: new pull request created: #99604

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 · 2025-09-24T08:21:54Z

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

Applying: OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	_topic_maps/_topic_map_rosa_hcp.yml
M	installing/installing_aws/ipi/installing-aws-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-specialized-region.adoc
M	installing/installing_azure/ipi/installing-azure-customizations.adoc
M	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.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_bare_metal/upi/installing-restricted-networks-bare-metal.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-vpc.adoc.git/rebase-apply/patch:1008: trailing whitespace.
You might need to wait several minutes for the secret to update in your cluster. 
.git/rebase-apply/patch:1148: trailing whitespace.
In {product-title}, customers can disable reporting usage information. 
.git/rebase-apply/patch:1155: trailing whitespace.
* Red{nbsp}Hat can better understand how product upgrades impact clusters. 
.git/rebase-apply/patch:872: new blank line at EOF.
+
.git/rebase-apply/patch:1009: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
Falling back to patching base and 3-way merge...
Removing support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
Removing support/remote_health_monitoring/enabling-remote-health-reporting.adoc
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
Auto-merging installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-ibm-z-kvm.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-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 installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
Auto-merging 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_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
Auto-merging installing/installing_azure/ipi/installing-azure-customizations.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-customizations.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-china.adoc
Auto-merging _topic_maps/_topic_map_rosa_hcp.yml
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

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 · 2025-09-24T08:21:59Z

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

Applying: OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	_topic_maps/_topic_map_rosa_hcp.yml
M	installing/installing_aws/ipi/installing-aws-customizations.adoc
M	installing/installing_aws/ipi/installing-aws-network-customizations.adoc
M	installing/installing_aws/ipi/installing-aws-private.adoc
A	installing/installing_aws/ipi/installing-aws-specialized-region.adoc
M	installing/installing_aws/ipi/installing-aws-vpc.adoc
M	installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
M	installing/installing_aws/upi/installing-restricted-networks-aws.adoc
M	installing/installing_azure/ipi/installing-azure-customizations.adoc
M	installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc
M	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.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-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_ibm_cloud/installing-ibm-cloud-restricted.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-ibm-z.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
M	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
M	installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
M	installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
M	installing/installing_vsphere/upi/installing-vsphere.adoc.git/rebase-apply/patch:1008: trailing whitespace.
You might need to wait several minutes for the secret to update in your cluster. 
.git/rebase-apply/patch:1148: trailing whitespace.
In {product-title}, customers can disable reporting usage information. 
.git/rebase-apply/patch:1155: trailing whitespace.
* Red{nbsp}Hat can better understand how product upgrades impact clusters. 
.git/rebase-apply/patch:872: new blank line at EOF.
+
.git/rebase-apply/patch:1009: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
Falling back to patching base and 3-way merge...
Removing support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
Removing support/remote_health_monitoring/enabling-remote-health-reporting.adoc
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging installing/installing_vsphere/upi/installing-vsphere.adoc
Auto-merging installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
Auto-merging installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-custom.adoc
Auto-merging installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-ibm-z.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
Auto-merging installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
CONFLICT (content): Merge conflict in installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
Auto-merging installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_cloud/installing-ibm-cloud-restricted.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-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
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret 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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
Auto-merging installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
Auto-merging installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc
Auto-merging installing/installing_azure/ipi/installing-azure-customizations.adoc
Auto-merging installing/installing_aws/upi/installing-restricted-networks-aws.adoc
Auto-merging installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-vpc.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-private.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-network-customizations.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-customizations.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-china.adoc
Auto-merging _topic_maps/_topic_map_rosa_hcp.yml
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

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 · 2025-09-24T08:22:07Z

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

Applying: OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	_topic_maps/_topic_map_rosa_hcp.yml
A	disconnected/connected-to-disconnected.adoc
M	installing/installing_aws/ipi/installing-aws-customizations.adoc
M	installing/installing_aws/ipi/installing-aws-localzone.adoc
M	installing/installing_aws/ipi/installing-aws-network-customizations.adoc
M	installing/installing_aws/ipi/installing-aws-private.adoc
A	installing/installing_aws/ipi/installing-aws-specialized-region.adoc
M	installing/installing_aws/ipi/installing-aws-vpc.adoc
M	installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc
M	installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
M	installing/installing_aws/upi/installing-restricted-networks-aws.adoc
A	installing/installing_azure/ipi/installing-azure-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-default.adoc
A	installing/installing_azure/ipi/installing-azure-government-region.adoc
A	installing/installing_azure/ipi/installing-azure-network-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-private.adoc
A	installing/installing_azure/ipi/installing-azure-vnet.adoc
A	installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.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-vpc.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.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_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_openstack/installing-openstack-user.adoc
M	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
M	installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
M	installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
M	installing/installing_vsphere/upi/installing-vsphere.adoc
M	modules/images-update-global-pull-secret.adoc.git/rebase-apply/patch:1008: trailing whitespace.
You might need to wait several minutes for the secret to update in your cluster. 
.git/rebase-apply/patch:1148: trailing whitespace.
In {product-title}, customers can disable reporting usage information. 
.git/rebase-apply/patch:1155: trailing whitespace.
* Red{nbsp}Hat can better understand how product upgrades impact clusters. 
.git/rebase-apply/patch:872: new blank line at EOF.
+
.git/rebase-apply/patch:1009: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

M	modules/insights-operator-new-pull-secret-enable.adoc
M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
M	support/remote_health_monitoring/using-insights-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging support/remote_health_monitoring/using-insights-operator.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/using-insights-operator.adoc
Removing support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
Removing support/remote_health_monitoring/enabling-remote-health-reporting.adoc
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging post_installation_configuration/connected-to-disconnected.adoc
Auto-merging modules/insights-operator-new-pull-secret-enable.adoc
Auto-merging modules/images-update-global-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/images-update-global-pull-secret.adoc
Auto-merging installing/installing_vsphere/upi/installing-vsphere.adoc
Auto-merging installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
Auto-merging installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_openstack/installing-openstack-user.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-custom.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer-custom.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/installing-restricted-networks-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc left in tree.
Auto-merging installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.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.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-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
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret 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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-government-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-government-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-customizations.adoc left in tree.
Auto-merging installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc
Auto-merging installing/installing_azure/installing-azure-vnet.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-azure-vnet.adoc
Auto-merging installing/installing_azure/installing-azure-private.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-azure-private.adoc
Auto-merging installing/installing_azure/installing-azure-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-azure-network-customizations.adoc
Auto-merging installing/installing_aws/upi/installing-restricted-networks-aws.adoc
Auto-merging installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-vpc.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-private.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-network-customizations.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-localzone.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-customizations.adoc
Auto-merging installing/installing_aws/ipi/installing-aws-china.adoc
Auto-merging _topic_maps/_topic_map_rosa_hcp.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa_hcp.yml
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

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.

openshift-cherrypick-robot · 2025-09-24T08:22:10Z

@dfitzmau: #98358 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	_topic_maps/_topic_map_rosa_hcp.yml
A	disconnected/connected-to-disconnected.adoc
A	installing/installing_aws/ipi/installing-aws-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-default.adoc
A	installing/installing_aws/ipi/installing-aws-localzone.adoc
A	installing/installing_aws/ipi/installing-aws-network-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-private.adoc
A	installing/installing_aws/ipi/installing-aws-specialized-region.adoc
A	installing/installing_aws/ipi/installing-aws-vpc.adoc
A	installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc
A	installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
A	installing/installing_aws/upi/installing-aws-user-infra.adoc
A	installing/installing_aws/upi/installing-restricted-networks-aws.adoc
A	installing/installing_azure/ipi/installing-azure-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-default.adoc
A	installing/installing_azure/ipi/installing-azure-government-region.adoc
A	installing/installing_azure/ipi/installing-azure-network-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-private.adoc
A	installing/installing_azure/ipi/installing-azure-vnet.adoc
A	installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.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
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_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_openstack/installing-openstack-user.adoc
M	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
M	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc.git/rebase-apply/patch:1008: trailing whitespace.
You might need to wait several minutes for the secret to update in your cluster. 
.git/rebase-apply/patch:1148: trailing whitespace.
In {product-title}, customers can disable reporting usage information. 
.git/rebase-apply/patch:1155: trailing whitespace.
* Red{nbsp}Hat can better understand how product upgrades impact clusters. 
.git/rebase-apply/patch:872: new blank line at EOF.
+
.git/rebase-apply/patch:1009: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

M	installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
M	installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
M	installing/installing_vsphere/upi/installing-vsphere.adoc
M	modules/images-update-global-pull-secret.adoc
M	modules/insights-operator-new-pull-secret-enable.adoc
M	modules/insights-operator-register-disconnected-cluster.adoc
M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
M	support/remote_health_monitoring/using-insights-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging support/remote_health_monitoring/using-insights-operator.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/using-insights-operator.adoc
Removing support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
Removing support/remote_health_monitoring/enabling-remote-health-reporting.adoc
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging post_installation_configuration/connected-to-disconnected.adoc
Auto-merging modules/insights-operator-register-disconnected-cluster.adoc
Auto-merging modules/insights-operator-new-pull-secret-enable.adoc
Auto-merging modules/images-update-global-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/images-update-global-pull-secret.adoc
Auto-merging installing/installing_vsphere/upi/installing-vsphere.adoc
Auto-merging installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
Auto-merging installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
Auto-merging installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
Auto-merging installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_openstack/installing-openstack-user.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-custom.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer-custom.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/installing-restricted-networks-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc left in tree.
Auto-merging installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.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.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
CONFLICT (content): Merge conflict in 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
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret 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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-government-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-government-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-customizations.adoc left in tree.
Auto-merging installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc
Auto-merging installing/installing_azure/installing-azure-vnet.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-azure-vnet.adoc
Auto-merging installing/installing_azure/installing-azure-private.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-azure-private.adoc
Auto-merging installing/installing_azure/installing-azure-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_azure/installing-azure-network-customizations.adoc
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-specialized-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-specialized-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-customizations.adoc left in tree.
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-restricted-networks-aws.adoc
Auto-merging installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc
Auto-merging installing/installing_aws/installing-aws-wavelength-zone.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-wavelength-zone.adoc
Auto-merging installing/installing_aws/installing-aws-vpc.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-vpc.adoc
Auto-merging installing/installing_aws/installing-aws-user-infra.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-user-infra.adoc
Auto-merging installing/installing_aws/installing-aws-private.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-private.adoc
Auto-merging installing/installing_aws/installing-aws-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-network-customizations.adoc
Auto-merging installing/installing_aws/installing-aws-localzone.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-localzone.adoc
Auto-merging _topic_maps/_topic_map_rosa_hcp.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa_hcp.yml
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

Details

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-sigs/prow repository.

openshift-cherrypick-robot · 2025-09-24T08:22:13Z

@dfitzmau: #98358 failed to apply on top of branch "enterprise-4.14":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Details

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-sigs/prow repository.

openshift-cherrypick-robot · 2025-09-24T08:22:19Z

@dfitzmau: #98358 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
A	_topic_maps/_topic_map_rosa_hcp.yml
A	disconnected/connected-to-disconnected.adoc
A	installing/installing_aws/ipi/installing-aws-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-default.adoc
A	installing/installing_aws/ipi/installing-aws-localzone.adoc
A	installing/installing_aws/ipi/installing-aws-network-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-private.adoc
A	installing/installing_aws/ipi/installing-aws-specialized-region.adoc
A	installing/installing_aws/ipi/installing-aws-vpc.adoc
A	installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc
A	installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
A	installing/installing_aws/upi/installing-aws-user-infra.adoc
A	installing/installing_aws/upi/installing-restricted-networks-aws.adoc
A	installing/installing_azure/ipi/installing-azure-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-default.adoc
A	installing/installing_azure/ipi/installing-azure-government-region.adoc
A	installing/installing_azure/ipi/installing-azure-network-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-private.adoc
A	installing/installing_azure/ipi/installing-azure-vnet.adoc
A	installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-default.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
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_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
M	installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc
M	installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
M	installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
M	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_openstack/installing-openstack-user.adoc.git/rebase-apply/patch:1008: trailing whitespace.
You might need to wait several minutes for the secret to update in your cluster. 
.git/rebase-apply/patch:1148: trailing whitespace.
In {product-title}, customers can disable reporting usage information. 
.git/rebase-apply/patch:1155: trailing whitespace.
* Red{nbsp}Hat can better understand how product upgrades impact clusters. 
.git/rebase-apply/patch:872: new blank line at EOF.
+
.git/rebase-apply/patch:1009: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

A	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
A	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
A	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
A	installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
A	installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
A	installing/installing_vsphere/upi/installing-vsphere.adoc
M	modules/images-update-global-pull-secret.adoc
M	modules/insights-operator-new-pull-secret-enable.adoc
M	modules/insights-operator-register-disconnected-cluster.adoc
M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
M	support/remote_health_monitoring/using-insights-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging support/remote_health_monitoring/using-insights-operator.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/using-insights-operator.adoc
Removing support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
Removing support/remote_health_monitoring/enabling-remote-health-reporting.adoc
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging post_installation_configuration/connected-to-disconnected.adoc
Auto-merging modules/insights-operator-register-disconnected-cluster.adoc
Auto-merging modules/insights-operator-new-pull-secret-enable.adoc
Auto-merging modules/images-update-global-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/images-update-global-pull-secret.adoc
CONFLICT (modify/delete): installing/installing_vsphere/upi/installing-vsphere.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/upi/installing-vsphere.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc left in tree.
Auto-merging installing/installing_openstack/installing-openstack-user.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-custom.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer-custom.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/installing-restricted-networks-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc left in tree.
Auto-merging installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
Auto-merging installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
Auto-merging installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
Auto-merging installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.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
CONFLICT (modify/delete): installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc left in tree.
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
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in 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-default.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret 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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc left in tree.
Auto-merging installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-vnet.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-vnet.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-private.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-private.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-government-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-government-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-vpc.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-vpc.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-specialized-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-specialized-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-private.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-private.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-localzone.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-localzone.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-customizations.adoc left in tree.
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-restricted-networks-aws.adoc
Auto-merging installing/installing_aws/installing-aws-user-infra.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-user-infra.adoc
CONFLICT (modify/delete): _topic_maps/_topic_map_rosa_hcp.yml deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of _topic_maps/_topic_map_rosa_hcp.yml left in tree.
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

Details

In response to this:

/cherrypick enterprise-4.13

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 · 2025-09-24T08:22:24Z

@dfitzmau: #98358 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
A	_topic_maps/_topic_map_rosa_hcp.yml
A	disconnected/connected-to-disconnected.adoc
A	installing/installing_aws/ipi/installing-aws-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-default.adoc
A	installing/installing_aws/ipi/installing-aws-localzone.adoc
A	installing/installing_aws/ipi/installing-aws-network-customizations.adoc
A	installing/installing_aws/ipi/installing-aws-private.adoc
A	installing/installing_aws/ipi/installing-aws-specialized-region.adoc
A	installing/installing_aws/ipi/installing-aws-vpc.adoc
A	installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc
A	installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc
A	installing/installing_aws/upi/installing-aws-user-infra.adoc
A	installing/installing_aws/upi/installing-restricted-networks-aws.adoc
A	installing/installing_azure/ipi/installing-azure-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-default.adoc
A	installing/installing_azure/ipi/installing-azure-government-region.adoc
A	installing/installing_azure/ipi/installing-azure-network-customizations.adoc
A	installing/installing_azure/ipi/installing-azure-private.adoc
A	installing/installing_azure/ipi/installing-azure-vnet.adoc
A	installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc
A	installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc
A	installing/installing_bare_metal/upi/installing-bare-metal.adoc
A	installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc
M	installing/installing_gcp/installing-gcp-customizations.adoc
M	installing/installing_gcp/installing-gcp-default.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
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_power/installing-ibm-power.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc
A	installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
A	installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
A	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-ibm-z.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc
A	installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc
M	installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
M	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-custom.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_openstack/installing-openstack-user.adoc
A	installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc
A	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc
A	installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc
A	installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc
A	installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc
A	installing/installing_vsphere/upi/installing-vsphere.adoc
M	modules/images-update-global-pull-secret.adoc
M	modules/insights-operator-new-pull-secret-disabled.adoc
M	modules/insights-operator-new-pull-secret-enable.adoc
M	modules/insights-operator-register-disconnected-cluster.adoc
M	modules/telemetry-consequences-of-disabling-telemetry.adoc
M	support/remote_health_monitoring/about-remote-health-monitoring.adoc
M	support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
M	support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc.git/rebase-apply/patch:1008: trailing whitespace.
You might need to wait several minutes for the secret to update in your cluster. 
.git/rebase-apply/patch:1148: trailing whitespace.
In {product-title}, customers can disable reporting usage information. 
.git/rebase-apply/patch:1155: trailing whitespace.
* Red{nbsp}Hat can better understand how product upgrades impact clusters. 
.git/rebase-apply/patch:872: new blank line at EOF.
+
.git/rebase-apply/patch:1009: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

M	support/remote_health_monitoring/using-insights-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging support/remote_health_monitoring/using-insights-operator.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/using-insights-operator.adoc
Auto-merging support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
CONFLICT (modify/delete): support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc deleted in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret and modified in HEAD. Version HEAD of support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc left in tree.
Removing support/remote_health_monitoring/enabling-remote-health-reporting.adoc
Auto-merging support/remote_health_monitoring/about-remote-health-monitoring.adoc
CONFLICT (content): Merge conflict in support/remote_health_monitoring/about-remote-health-monitoring.adoc
Auto-merging post_installation_configuration/connected-to-disconnected.adoc
Auto-merging modules/telemetry-consequences-of-disabling-telemetry.adoc
CONFLICT (content): Merge conflict in modules/telemetry-consequences-of-disabling-telemetry.adoc
Auto-merging modules/insights-operator-register-disconnected-cluster.adoc
CONFLICT (content): Merge conflict in modules/insights-operator-register-disconnected-cluster.adoc
Auto-merging modules/insights-operator-new-pull-secret-enable.adoc
CONFLICT (content): Merge conflict in modules/insights-operator-new-pull-secret-enable.adoc
Auto-merging modules/insights-operator-new-pull-secret-disabled.adoc
CONFLICT (content): Merge conflict in modules/insights-operator-new-pull-secret-disabled.adoc
Auto-merging modules/images-update-global-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/images-update-global-pull-secret.adoc
CONFLICT (modify/delete): installing/installing_vsphere/upi/installing-vsphere.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/upi/installing-vsphere.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/upi/installing-vsphere-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/upi/installing-restricted-networks-vsphere.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_vsphere/ipi/installing-restricted-networks-installer-provisioned-vsphere.adoc left in tree.
Auto-merging installing/installing_openstack/installing-openstack-user.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-user.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-custom.adoc
CONFLICT (content): Merge conflict in installing/installing_openstack/installing-openstack-installer-custom.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/installing-restricted-networks-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-restricted-networks-ibm-z-kvm.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-lpar.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_z/upi/installing-ibm-z-kvm.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc left in tree.
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_ibm_power/installing-ibm-power.adoc
Auto-merging installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.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
CONFLICT (modify/delete): installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_ibm_cloud/installing-ibm-cloud-restricted.adoc left in tree.
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
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in 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-default.adoc
Auto-merging installing/installing_gcp/installing-gcp-customizations.adoc
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-restricted-networks-bare-metal.adoc left in tree.
CONFLICT (modify/delete): installing/installing_bare_metal/upi/installing-bare-metal.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret 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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-default.adoc left in tree.
Auto-merging installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
CONFLICT (content): Merge conflict in installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-vnet.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-vnet.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-private.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-private.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-government-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-government-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_azure/ipi/installing-azure-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_azure/ipi/installing-azure-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-restricted-networks-aws-installer-provisioned.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-wavelength-zone.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-vpc.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-vpc.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-specialized-region.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-specialized-region.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-private.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-private.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-network-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-network-customizations.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-localzone.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-localzone.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-default.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-default.adoc left in tree.
CONFLICT (modify/delete): installing/installing_aws/ipi/installing-aws-customizations.adoc deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of installing/installing_aws/ipi/installing-aws-customizations.adoc left in tree.
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-restricted-networks-aws.adoc
Auto-merging installing/installing_aws/installing-aws-user-infra.adoc
CONFLICT (content): Merge conflict in installing/installing_aws/installing-aws-user-infra.adoc
CONFLICT (modify/delete): _topic_maps/_topic_map_rosa_hcp.yml deleted in HEAD and modified in OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret. Version OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret of _topic_maps/_topic_map_rosa_hcp.yml left in tree.
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_osd.yml
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 OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

Details

In response to this:

/cherrypick enterprise-4.12

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-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 2, 2025

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

dfitzmau force-pushed the OCPBUGS-60988 branch 2 times, most recently from 41e0887 to 89e9d4a Compare September 2, 2025 14:39

openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 2, 2025

dfitzmau force-pushed the OCPBUGS-60988 branch 3 times, most recently from 66b46aa to 202d5e9 Compare September 2, 2025 14:50

dfitzmau force-pushed the OCPBUGS-60988 branch from 202d5e9 to fcb5d8b Compare September 2, 2025 15:02

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 2, 2025

dfitzmau force-pushed the OCPBUGS-60988 branch 3 times, most recently from b0aeb07 to d4e20f4 Compare September 2, 2025 15:42

openshift-cherrypick-robot mentioned this pull request Sep 24, 2025

[enterprise-4.20] : Added update secret step to insights-operator-new-pull… #99603

Merged

openshift-cherrypick-robot mentioned this pull request Sep 24, 2025

[enterprise-4.19] : Added update secret step to insights-operator-new-pull… #99604

Closed

dfitzmau mentioned this pull request Jan 23, 2026

OSDOCS-17013-bm-upi-8: CQA BM UPI doc #105295

Merged

Conversation

dfitzmau commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 2, 2025

Uh oh!

ocpdocs-previewbot commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 2, 2025

Uh oh!

openshift-ci-robot commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

dfitzmau commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

openshift-cherrypick-robot commented Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

dfitzmau commented Sep 2, 2025 •

edited

Loading

ocpdocs-previewbot commented Sep 2, 2025 •

edited

Loading