OSDOCS-15679: Added missing underscore to {context} attributes by dfitzmau · Pull Request #97150 · openshift/openshift-docs

dfitzmau · 2025-08-05T16:00:30Z

Fixed ID tags on numerous files, some links, and some unusual module type typos (maybe an old format).

Version(s):
4.12+

Link to docs preview:

openshift-ci-robot · 2025-08-05T16:00:35Z

@dfitzmau: This pull request references OSDOCS-15679 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

QE has approved this change.

Additional information:

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-08-05T16:07:29Z

@dfitzmau: This pull request references OSDOCS-15679 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Version(s):
4.12+

Issue:
OSDOCS-15679

Link to docs preview:

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-08-05T16:15:23Z

🤖 Wed Aug 06 09:01:01 - Prow CI generated the docs preview:
https://97150--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

modules/logging-rn-5.7.0.adoc

openshift-ci · 2025-08-06T09:02:51Z

@dfitzmau: all tests passed!

Full PR test history. Your PR dashboard.

Details

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

openshift-ci-robot · 2025-08-06T09:19:27Z

@dfitzmau: This pull request references OSDOCS-15679 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Version(s):
4.12+

Issue:
OSDOCS-15679

Link to docs preview:

https://97150--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-disconnected-network-config.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_architecture/osd_policy/osd-service-definition.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_architecture/osd_policy/osd-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_cluster_admin/osd_nodes/osd-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/installing/overriding-kopia-algorithms.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/uninstalling-osus.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_vsphere/installing-vsphere-post-installation-configuration.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/shiftstack-prometheus-configuration.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/installing-operators.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-operator-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-scheduling-resources.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/observing-network-traffic.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/storage/container_storage_interface/persistent-storage-csi-vsphere.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/understanding_updates/understanding-update-channels-release.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/updating_a_cluster/updating-cluster-cli.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/support/virt-troubleshooting.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/vm_networking/virt-connecting-vm-to-linux-bridge.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_architecture/rosa-architecture-models.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_architecture/rosa_policy_service_definition/rosa-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_release_notes/rosa-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/virt/support/virt-troubleshooting.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/architecture/rosa-architecture-models.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_architecture/rosa_policy_service_definition/rosa-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_release_notes/rosa-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/virt/support/virt-troubleshooting.html

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-08-06T09:20:01Z

@dfitzmau: This pull request references OSDOCS-15679 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Fixed ID tags on numerous files and some links.

Version(s):
4.12+

Issue:
OSDOCS-15679

Link to docs preview:

https://97150--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-disconnected-network-config.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_architecture/osd_policy/osd-service-definition.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_architecture/osd_policy/osd-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_cluster_admin/osd_nodes/osd-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/installing/overriding-kopia-algorithms.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/uninstalling-osus.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_vsphere/installing-vsphere-post-installation-configuration.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/shiftstack-prometheus-configuration.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/installing-operators.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-operator-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-scheduling-resources.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/observing-network-traffic.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/storage/container_storage_interface/persistent-storage-csi-vsphere.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/understanding_updates/understanding-update-channels-release.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/updating_a_cluster/updating-cluster-cli.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/support/virt-troubleshooting.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/vm_networking/virt-connecting-vm-to-linux-bridge.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_architecture/rosa-architecture-models.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_architecture/rosa_policy_service_definition/rosa-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_release_notes/rosa-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/virt/support/virt-troubleshooting.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/architecture/rosa-architecture-models.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_architecture/rosa_policy_service_definition/rosa-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_release_notes/rosa-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/virt/support/virt-troubleshooting.html

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-08-07T11:34:44Z

@dfitzmau: This pull request references OSDOCS-15679 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Fixed ID tags on numerous files, some links, and some unusual module type typos (maybe an old format).

Version(s):
4.12+

Issue:
OSDOCS-15679

Link to docs preview:

https://97150--ocpdocs-pr.netlify.app/microshift/latest/microshift_networking/microshift-disconnected-network-config.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_architecture/osd_policy/osd-service-definition.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_architecture/osd_policy/osd-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-dedicated/latest/osd_cluster_admin/osd_nodes/osd-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/application_backup_and_restore/installing/overriding-kopia-algorithms.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/disconnected/updating/uninstalling-osus.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_vsphere/installing-vsphere-post-installation-configuration.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/k8s_nmstate/k8s-nmstate-troubleshooting-node-network.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/shiftstack-prometheus-configuration.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/installing-operators.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-operator-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-scheduling-resources.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/observing-network-traffic.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/storage/container_storage_interface/persistent-storage-csi-vsphere.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/understanding_updates/understanding-update-channels-release.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/updating/updating_a_cluster/updating-cluster-cli.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/support/virt-troubleshooting.html

https://97150--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/vm_networking/virt-connecting-vm-to-linux-bridge.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_architecture/rosa-architecture-models.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_architecture/rosa_policy_service_definition/rosa-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/rosa_release_notes/rosa-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/virt/support/virt-troubleshooting.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/applications/working_with_helm_charts/configuring-custom-helm-chart-repositories.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/architecture/rosa-architecture-models.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_architecture/rosa_policy_service_definition/rosa-sre-access.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_cluster_admin/rosa_nodes/rosa-managing-worker-nodes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/rosa_release_notes/rosa-release-notes.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/virt/managing_vms/virt-managing-vms-openshift-pipelines.html

https://97150--ocpdocs-pr.netlify.app/openshift-rosa/latest/virt/support/virt-troubleshooting.html

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-08-07T13:00:09Z

/cherrypick enterprise-4.20

dfitzmau · 2025-08-07T13:00:13Z

/cherrypick enterprise-4.19

dfitzmau · 2025-08-07T13:00:21Z

/cherrypick enterprise-4.18

dfitzmau · 2025-08-07T13:00:25Z

/cherrypick enterprise-4.17

dfitzmau · 2025-08-07T13:00:29Z

/cherrypick enterprise-4.16

dfitzmau · 2025-08-07T13:00:32Z

/cherrypick enterprise-4.15

dfitzmau · 2025-08-07T13:00:37Z

/cherrypick enterprise-4.14

dfitzmau · 2025-08-07T13:00:41Z

/cherrypick enterprise-4.13

dfitzmau · 2025-08-07T13:00:45Z

/cherrypick enterprise-4.12

openshift-cherrypick-robot · 2025-08-07T13:01:04Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
M	modules/network-observability-configuring-options-trafficflow.adoc
M	modules/network-observability-quickfilter.adoc
M	modules/network-observability-working-with-zones.adoc
M	modules/oadp-usecase-kopia-override-algorithms.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/oadp-usecase-kopia-override-algorithms.adoc
Auto-merging modules/network-observability-working-with-zones.adoc
Auto-merging modules/network-observability-quickfilter.adoc
Auto-merging modules/network-observability-configuring-options-trafficflow.adoc
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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-08-07T13:01:08Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
A	modules/monitoring-shiftstack-metrics.adoc
M	modules/network-observability-configuring-options-trafficflow.adoc
M	modules/network-observability-quickfilter.adoc
M	modules/network-observability-working-with-zones.adoc
M	modules/oadp-usecase-kopia-override-algorithms.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
M	updating/updating_a_cluster/updating-cluster-cli.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating_a_cluster/updating-cluster-cli.adoc
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/oadp-usecase-kopia-override-algorithms.adoc
Auto-merging modules/network-observability-working-with-zones.adoc
Auto-merging modules/network-observability-quickfilter.adoc
Auto-merging modules/network-observability-configuring-options-trafficflow.adoc
CONFLICT (modify/delete): modules/monitoring-shiftstack-metrics.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/monitoring-shiftstack-metrics.adoc left in tree.
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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-08-07T13:01:09Z

@dfitzmau: new pull request created: #97284

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-08-07T13:01:11Z

@dfitzmau: new pull request created: #97285

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-08-07T13:01:12Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	disconnected/updating/uninstalling-osus.adoc
M	modules/configuring-machine-pool-disk-volume-cli.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
M	modules/deleting-machine-pools.adoc
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
M	modules/logging-release-notes-5-8-0.adoc
A	modules/monitoring-shiftstack-metrics.adoc
M	modules/network-observability-configuring-options-trafficflow.adoc
M	modules/network-observability-quickfilter.adoc
A	modules/network-observability-viewing-network-events.adoc
M	modules/network-observability-working-with-zones.adoc
M	modules/oadp-usecase-kopia-override-algorithms.adoc
M	modules/rosa-adding-tags-cli.adoc
M	modules/rosa-adding-taints-cli.adoc
M	modules/rosa-adding-taints-ocm.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sre-cluster-access.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
M	observability/network_observability/network-observability-operator-release-notes.adoc
M	updating/updating_a_cluster/updating-cluster-cli.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating_a_cluster/updating_disconnected_cluster/uninstalling-osus.adoc
CONFLICT (content): Merge conflict in updating/updating_a_cluster/updating_disconnected_cluster/uninstalling-osus.adoc
Auto-merging updating/updating_a_cluster/updating-cluster-cli.adoc
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/sre-cluster-access.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/rosa-adding-taints-ocm.adoc
CONFLICT (content): Merge conflict in modules/rosa-adding-taints-ocm.adoc
Auto-merging modules/rosa-adding-taints-cli.adoc
Auto-merging modules/rosa-adding-tags-cli.adoc
Auto-merging modules/oadp-usecase-kopia-override-algorithms.adoc
Auto-merging modules/network-observability-working-with-zones.adoc
CONFLICT (modify/delete): modules/network-observability-viewing-network-events.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/network-observability-viewing-network-events.adoc left in tree.
Auto-merging modules/network-observability-quickfilter.adoc
Auto-merging modules/network-observability-configuring-options-trafficflow.adoc
CONFLICT (modify/delete): modules/monitoring-shiftstack-metrics.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/monitoring-shiftstack-metrics.adoc left in tree.
Auto-merging modules/logging-release-notes-5-8-0.adoc
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
Auto-merging modules/deleting-machine-pools.adoc
Auto-merging modules/deleting-machine-pools-ocm.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-cli.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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-08-07T13:01:16Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	disconnected/updating/uninstalling-osus.adoc
M	modules/configuring-machine-pool-disk-volume-cli.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
M	modules/deleting-machine-pools.adoc
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
M	modules/logging-release-notes-5-8-0.adoc
A	modules/monitoring-shiftstack-metrics.adoc
A	modules/network-observability-viewing-network-events.adoc
M	modules/oadp-usecase-kopia-override-algorithms.adoc
M	modules/op-installing-tekton-hub-without-login-and-rating.adoc
M	modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
M	modules/rosa-adding-tags-cli.adoc
M	modules/rosa-adding-taints-cli.adoc
M	modules/rosa-adding-taints-ocm.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sre-cluster-access.adoc
M	modules/update-conditional-updates.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
M	observability/network_observability/network-observability-operator-release-notes.adoc
M	updating/updating_a_cluster/updating-cluster-cli.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating_a_cluster/updating_disconnected_cluster/uninstalling-osus.adoc
CONFLICT (content): Merge conflict in updating/updating_a_cluster/updating_disconnected_cluster/uninstalling-osus.adoc
Auto-merging updating/updating_a_cluster/updating-cluster-cli.adoc
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/update-conditional-updates.adoc
Auto-merging modules/sre-cluster-access.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/rosa-adding-taints-ocm.adoc
CONFLICT (content): Merge conflict in modules/rosa-adding-taints-ocm.adoc
Auto-merging modules/rosa-adding-taints-cli.adoc
Auto-merging modules/rosa-adding-tags-cli.adoc
Auto-merging modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
Auto-merging modules/op-installing-tekton-hub-without-login-and-rating.adoc
Auto-merging modules/oadp-usecase-kopia-override-algorithms.adoc
CONFLICT (modify/delete): modules/network-observability-viewing-network-events.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/network-observability-viewing-network-events.adoc left in tree.
CONFLICT (modify/delete): modules/monitoring-shiftstack-metrics.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/monitoring-shiftstack-metrics.adoc left in tree.
Auto-merging modules/logging-release-notes-5-8-0.adoc
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
Auto-merging modules/deleting-machine-pools.adoc
Auto-merging modules/deleting-machine-pools-ocm.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-cli.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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-08-07T13:01:21Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	disconnected/updating/uninstalling-osus.adoc
M	modules/configuring-machine-pool-disk-volume-cli.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
M	modules/deleting-machine-pools.adoc
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
M	modules/logging-release-notes-5-8-0.adoc
A	modules/monitoring-shiftstack-metrics.adoc
M	modules/network-observability-configuring-options-trafficflow.adoc
M	modules/network-observability-quickfilter.adoc
A	modules/network-observability-viewing-network-events.adoc
M	modules/network-observability-working-with-zones.adoc
M	modules/oadp-usecase-kopia-override-algorithms.adoc
M	modules/op-installing-tekton-hub-without-login-and-rating.adoc
M	modules/osd-aws-privatelink-architecture.adoc
M	modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
A	modules/rosa-adding-tags-cli.adoc
M	modules/rosa-adding-taints-cli.adoc
M	modules/rosa-adding-taints-ocm.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sre-cluster-access.adoc
M	modules/update-conditional-updates.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
M	observability/network_observability/network-observability-operator-release-notes.adoc
M	updating/updating_a_cluster/updating-cluster-cli.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating_a_cluster/updating_disconnected_cluster/uninstalling-osus.adoc
CONFLICT (content): Merge conflict in updating/updating_a_cluster/updating_disconnected_cluster/uninstalling-osus.adoc
Auto-merging updating/updating_a_cluster/updating-cluster-cli.adoc
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/update-conditional-updates.adoc
Auto-merging modules/sre-cluster-access.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/rosa-adding-taints-ocm.adoc
CONFLICT (content): Merge conflict in modules/rosa-adding-taints-ocm.adoc
Auto-merging modules/rosa-adding-taints-cli.adoc
CONFLICT (modify/delete): modules/rosa-adding-tags-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/rosa-adding-tags-cli.adoc left in tree.
Auto-merging modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
Auto-merging modules/osd-aws-privatelink-architecture.adoc
Auto-merging modules/op-installing-tekton-hub-without-login-and-rating.adoc
Auto-merging modules/oadp-usecase-kopia-override-algorithms.adoc
Auto-merging modules/network-observability-working-with-zones.adoc
CONFLICT (modify/delete): modules/network-observability-viewing-network-events.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/network-observability-viewing-network-events.adoc left in tree.
Auto-merging modules/network-observability-quickfilter.adoc
Auto-merging modules/network-observability-configuring-options-trafficflow.adoc
CONFLICT (modify/delete): modules/monitoring-shiftstack-metrics.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/monitoring-shiftstack-metrics.adoc left in tree.
Auto-merging modules/logging-release-notes-5-8-0.adoc
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
Auto-merging modules/deleting-machine-pools.adoc
Auto-merging modules/deleting-machine-pools-ocm.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-cli.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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-08-07T13:01:26Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	disconnected/updating/uninstalling-osus.adoc
M	modules/cnf-du-management-pods.adoc
M	modules/configuring-machine-pool-disk-volume-cli.adoc
M	modules/deleting-machine-pools-cli.adoc
M	modules/deleting-machine-pools-ocm.adoc
M	modules/deleting-machine-pools.adoc
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
M	modules/logging-release-notes-5-8-0.adoc
A	modules/microshift-disconnected-host-con.adoc
A	modules/monitoring-shiftstack-metrics.adoc
M	modules/network-observability-nodes-taints-tolerations.adoc
A	modules/network-observability-viewing-network-events.adoc
M	modules/oadp-usecase-kopia-override-algorithms.adoc
M	modules/op-installing-tekton-hub-without-login-and-rating.adoc
M	modules/osd-aws-privatelink-architecture.adoc
M	modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
A	modules/rosa-adding-tags-cli.adoc
M	modules/rosa-adding-taints-cli.adoc
M	modules/rosa-adding-taints-ocm.adoc
M	modules/sdpolicy-networking.adoc
M	modules/sre-cluster-access.adoc
M	modules/update-conditional-updates.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
M	observability/network_observability/network-observability-operator-release-notes.adoc
A	updating/understanding_updates/understanding-update-channels-release.adoc
A	updating/updating_a_cluster/updating-cluster-cli.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): updating/updating_a_cluster/updating-cluster-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of updating/updating_a_cluster/updating-cluster-cli.adoc left in tree.
Auto-merging updating/updating-restricted-network-cluster/uninstalling-osus.adoc
CONFLICT (content): Merge conflict in updating/updating-restricted-network-cluster/uninstalling-osus.adoc
Auto-merging updating/understanding-upgrade-channels-release.adoc
CONFLICT (content): Merge conflict in updating/understanding-upgrade-channels-release.adoc
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/update-conditional-updates.adoc
CONFLICT (content): Merge conflict in modules/update-conditional-updates.adoc
Auto-merging modules/sre-cluster-access.adoc
CONFLICT (content): Merge conflict in modules/sre-cluster-access.adoc
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/rosa-adding-taints-ocm.adoc
CONFLICT (content): Merge conflict in modules/rosa-adding-taints-ocm.adoc
Auto-merging modules/rosa-adding-taints-cli.adoc
CONFLICT (modify/delete): modules/rosa-adding-tags-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/rosa-adding-tags-cli.adoc left in tree.
Auto-merging modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
Auto-merging modules/osd-aws-privatelink-architecture.adoc
Auto-merging modules/op-installing-tekton-hub-without-login-and-rating.adoc
Auto-merging modules/oadp-usecase-kopia-override-algorithms.adoc
CONFLICT (modify/delete): modules/network-observability-viewing-network-events.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/network-observability-viewing-network-events.adoc left in tree.
Auto-merging modules/network-observability-nodes-taints-tolerations.adoc
CONFLICT (content): Merge conflict in modules/network-observability-nodes-taints-tolerations.adoc
CONFLICT (modify/delete): modules/monitoring-shiftstack-metrics.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/monitoring-shiftstack-metrics.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-disconnected-host-con.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/microshift-disconnected-host-con.adoc left in tree.
Auto-merging modules/logging-release-notes-5-8-0.adoc
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
Auto-merging modules/deleting-machine-pools.adoc
Auto-merging modules/deleting-machine-pools-ocm.adoc
CONFLICT (content): Merge conflict in modules/deleting-machine-pools-ocm.adoc
Auto-merging modules/deleting-machine-pools-cli.adoc
Auto-merging modules/configuring-machine-pool-disk-volume-cli.adoc
Auto-merging modules/cnf-du-management-pods.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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-08-07T13:01:28Z

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

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.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.

dfitzmau · 2025-08-07T13:44:57Z

/cherrypick enterprise-4.12

openshift-cherrypick-robot · 2025-08-07T13:45:40Z

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

Applying: OSDOCS-15679: Added missing underscore to {context} attributes
Using index info to reconstruct a base tree...
A	disconnected/updating/uninstalling-osus.adoc
M	modules/cnf-du-management-pods.adoc
A	modules/configuring-machine-pool-disk-volume-cli.adoc
A	modules/configuring-machine-pool-disk-volume-ocm.adoc
A	modules/deleting-machine-pools-cli.adoc
A	modules/deleting-machine-pools-ocm.adoc
A	modules/deleting-machine-pools.adoc
A	modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc
M	modules/logging-release-notes-5-8-0.adoc
A	modules/logging-release-notes-5-9-0.adoc
A	modules/logging-release-notes-5-9-1.adoc
A	modules/microshift-disconnected-host-con.adoc
A	modules/monitoring-shiftstack-metrics.adoc
M	modules/network-observability-configuring-options-trafficflow.adoc
M	modules/network-observability-quickfilter.adoc
A	modules/network-observability-viewing-network-events.adoc
M	modules/network-observability-working-with-zones.adoc
A	modules/oadp-usecase-kopia-override-algorithms.adoc
M	modules/op-installing-tekton-hub-without-login-and-rating.adoc
M	modules/osd-aws-privatelink-architecture.adoc
A	modules/persistent-storage-csi-vsphere-encryption-datastore-url.adoc
A	modules/persistent-storage-csi-vsphere-encryption-tag-based.adoc
A	modules/persistent-storage-csi-vsphere-top-aware-during-install.adoc
A	modules/persistent-storage-csi-vsphere-top-aware-infra-top.adoc
A	modules/persistent-storage-csi-vsphere-top-aware-overview.adoc
A	modules/persistent-storage-csi-vsphere-top-aware-post-install.adoc
A	modules/persistent-storage-csi-vsphere-top-aware-results.adoc
A	modules/rosa-adding-tags-cli.adoc
A	modules/rosa-adding-taints-cli.adoc
A	modules/rosa-adding-taints-ocm.adoc
A	modules/rosa-imds.adoc
M	modules/rosa-update-cli-tool.adoc
M	modules/sdpolicy-networking.adoc
A	modules/sre-cluster-access.adoc
M	modules/update-conditional-updates.adoc
A	modules/virt-about-dv-conditions-and-events.adoc
A	modules/virt-deprecated-tasks-web.adoc
A	modules/virt-linux-bridge-nad-port-isolation.adoc
M	observability/network_observability/network-observability-operator-release-notes.adoc
A	updating/understanding_updates/understanding-update-channels-release.adoc
A	updating/updating_a_cluster/updating-cluster-cli.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): updating/updating_a_cluster/updating-cluster-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of updating/updating_a_cluster/updating-cluster-cli.adoc left in tree.
Auto-merging updating/updating-restricted-network-cluster/uninstalling-osus.adoc
CONFLICT (content): Merge conflict in updating/updating-restricted-network-cluster/uninstalling-osus.adoc
Auto-merging updating/understanding-upgrade-channels-release.adoc
CONFLICT (content): Merge conflict in updating/understanding-upgrade-channels-release.adoc
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (modify/delete): modules/virt-linux-bridge-nad-port-isolation.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-linux-bridge-nad-port-isolation.adoc left in tree.
CONFLICT (modify/delete): modules/virt-deprecated-tasks-web.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/virt-deprecated-tasks-web.adoc left in tree.
Auto-merging modules/virt-about-conditions-and-events.adoc
CONFLICT (content): Merge conflict in modules/virt-about-conditions-and-events.adoc
Auto-merging modules/update-conditional-updates.adoc
CONFLICT (content): Merge conflict in modules/update-conditional-updates.adoc
CONFLICT (modify/delete): modules/sre-cluster-access.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/sre-cluster-access.adoc left in tree.
Auto-merging modules/sdpolicy-networking.adoc
Auto-merging modules/rosa-update-cli-tool.adoc
CONFLICT (modify/delete): modules/rosa-imds.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/rosa-imds.adoc left in tree.
CONFLICT (modify/delete): modules/rosa-adding-taints-ocm.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/rosa-adding-taints-ocm.adoc left in tree.
CONFLICT (modify/delete): modules/rosa-adding-taints-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/rosa-adding-taints-cli.adoc left in tree.
CONFLICT (modify/delete): modules/rosa-adding-tags-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/rosa-adding-tags-cli.adoc left in tree.
Auto-merging modules/persistent-storage-csi-vsphere-top-aware.adoc
CONFLICT (content): Merge conflict in modules/persistent-storage-csi-vsphere-top-aware.adoc
CONFLICT (modify/delete): modules/persistent-storage-csi-vsphere-top-aware-results.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/persistent-storage-csi-vsphere-top-aware-results.adoc left in tree.
CONFLICT (modify/delete): modules/persistent-storage-csi-vsphere-top-aware-post-install.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/persistent-storage-csi-vsphere-top-aware-post-install.adoc left in tree.
CONFLICT (modify/delete): modules/persistent-storage-csi-vsphere-top-aware-overview.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/persistent-storage-csi-vsphere-top-aware-overview.adoc left in tree.
CONFLICT (modify/delete): modules/persistent-storage-csi-vsphere-top-aware-during-install.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/persistent-storage-csi-vsphere-top-aware-during-install.adoc left in tree.
CONFLICT (modify/delete): modules/persistent-storage-csi-vsphere-encryption-tag-based.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/persistent-storage-csi-vsphere-encryption-tag-based.adoc left in tree.
CONFLICT (modify/delete): modules/persistent-storage-csi-vsphere-encryption-datastore-url.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/persistent-storage-csi-vsphere-encryption-datastore-url.adoc left in tree.
Auto-merging modules/osd-aws-privatelink-architecture.adoc
Auto-merging modules/op-installing-tekton-hub-without-login-and-rating.adoc
CONFLICT (modify/delete): modules/oadp-usecase-kopia-override-algorithms.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/oadp-usecase-kopia-override-algorithms.adoc left in tree.
Auto-merging modules/network-observability-working-with-zones.adoc
CONFLICT (modify/delete): modules/network-observability-viewing-network-events.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/network-observability-viewing-network-events.adoc left in tree.
Auto-merging modules/network-observability-quickfilter.adoc
Auto-merging modules/network-observability-configuring-options-trafficflow.adoc
CONFLICT (modify/delete): modules/monitoring-shiftstack-metrics.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/monitoring-shiftstack-metrics.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-disconnected-host-con.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/microshift-disconnected-host-con.adoc left in tree.
CONFLICT (modify/delete): modules/logging-release-notes-5-9-1.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/logging-release-notes-5-9-1.adoc left in tree.
CONFLICT (modify/delete): modules/logging-release-notes-5-9-0.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/logging-release-notes-5-9-0.adoc left in tree.
Auto-merging modules/logging-release-notes-5-8-0.adoc
CONFLICT (modify/delete): modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/k8s-nmstate-troubleshooting-dns-disconnected-env-resolv.adoc left in tree.
CONFLICT (modify/delete): modules/deleting-machine-pools.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/deleting-machine-pools.adoc left in tree.
CONFLICT (modify/delete): modules/deleting-machine-pools-ocm.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/deleting-machine-pools-ocm.adoc left in tree.
CONFLICT (modify/delete): modules/deleting-machine-pools-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/deleting-machine-pools-cli.adoc left in tree.
CONFLICT (modify/delete): modules/configuring-machine-pool-disk-volume-ocm.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/configuring-machine-pool-disk-volume-ocm.adoc left in tree.
CONFLICT (modify/delete): modules/configuring-machine-pool-disk-volume-cli.adoc deleted in HEAD and modified in OSDOCS-15679: Added missing underscore to {context} attributes. Version OSDOCS-15679: Added missing underscore to {context} attributes of modules/configuring-machine-pool-disk-volume-cli.adoc left in tree.
Auto-merging modules/cnf-du-management-pods.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15679: Added missing underscore to {context} attributes

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 the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 5, 2025

openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 5, 2025

dfitzmau added branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 labels Aug 5, 2025

ocpdocs-vale-bot reviewed Aug 5, 2025

View reviewed changes

modules/logging-rn-5.7.0.adoc Show resolved Hide resolved

dfitzmau force-pushed the OSDOCS-15679 branch 5 times, most recently from 6fca3e9 to f1d4740 Compare August 6, 2025 08:40

openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 6, 2025

OSDOCS-15679: Added missing underscore to {context} attributes

5468625

dfitzmau force-pushed the OSDOCS-15679 branch from f1d4740 to 5468625 Compare August 6, 2025 08:47

dfitzmau added the merge-review-needed Signifies that the merge review team needs to review this PR label Aug 6, 2025

mburke5678 added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Aug 6, 2025

dfitzmau merged commit cc87c7a into openshift:main Aug 7, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Aug 7, 2025

[enterprise-4.20] OSDOCS-15679: Added missing underscore to {context} attributes #97284

Merged

openshift-cherrypick-robot mentioned this pull request Aug 7, 2025

[enterprise-4.19] OSDOCS-15679: Added missing underscore to {context} attributes #97285

Merged

Conversation

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

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 5, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 5, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

openshift-ci bot commented Aug 6, 2025

Uh oh!

openshift-ci-robot commented Aug 6, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 6, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 7, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

dfitzmau commented Aug 7, 2025

Uh oh!

openshift-cherrypick-robot commented Aug 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dfitzmau commented Aug 5, 2025 •

edited

Loading

openshift-ci-robot commented Aug 5, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Aug 5, 2025 •

edited by openshift-ci bot

Loading

ocpdocs-previewbot commented Aug 5, 2025 •

edited

Loading

openshift-ci-robot commented Aug 6, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Aug 6, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Aug 7, 2025 •

edited by openshift-ci bot

Loading