openshift-docs
openshift-docs copied to clipboard
openshift
OSDOCS#10543: Replace terms with new attributes
per https://github.com/openshift/openshift-docs/pull/75783 adding this PR to replace existing terms with their newly created common attributes.
:hcp-capital: Hosted control planes :hcp: hosted control planes
Version(s): 4.12+
Issue: https://issues.redhat.com/browse/OSDOCS-10543
Link to docs preview:
https://75820--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/
QE review:
- Not required
Additional information:
🤖 Wed May 15 14:51:40 - Prow CI generated the docs preview: https://75820--ocpdocs-pr.netlify.app Complete list of updated preview URLs: artifacts/updated_preview_urls.txt
LGTM.
@xenolinux Great work on incorporating attributes into the documentation! I can see the effort and attention to detail that went into this. I'd like to share a thought on the PR's scope. Given that the changes affect 30+ files and introduce more than one attribute, this was a lot to traverse and it can be a bit overwhelming for reviewers who are not as familiar with these sections of the documentation as you are. To make the review process smoother and more efficient, it might have been helpful if this work had been broken up into 2-3 different stories with smaller, more manageable PRs. This could help facilitate both the implementation and review processes. Just a suggestion for something to think about next time, but overall, I think the changes are very beneficial. Thanks for all your hard work on this!
LGTM.
@xenolinux Great work on incorporating attributes into the documentation! I can see the effort and attention to detail that went into this. I'd like to share a thought on the PR's scope. Given that the changes affect 30+ files and introduce more than one attribute, this was a lot to traverse and it can be a bit overwhelming for reviewers who are not as familiar with these sections of the documentation as you are. To make the review process smoother and more efficient, it might have been helpful if this work had been broken up into 2-3 different stories with smaller, more manageable PRs. This could help facilitate both the implementation and review processes. Just a suggestion for something to think about next time, but overall, I think the changes are very beneficial. Thanks for all your hard work on this!
@rh-tokeefe I totally agree. I will definitely consider for all of the next times!! Thank you :)
@xenolinux: all tests passed!
Full PR test history. Your PR dashboard.
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[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@kcarmichael08: #75820 failed to apply on top of branch "enterprise-4.12":
Applying: OSDOCS#10543: Replace terms with new attributes
Using index info to reconstruct a base tree...
M _attributes/common-attributes.adoc
M architecture/control-plane.adoc
M architecture/mce-overview-ocp.adoc
A hosted_control_planes/hcp-authentication-authorization.adoc
A hosted_control_planes/hcp-backup-restore-dr.adoc
A hosted_control_planes/hcp-getting-started.adoc
A hosted_control_planes/hcp-observability.adoc
A hosted_control_planes/hcp-troubleshooting.adoc
A hosted_control_planes/hcp-updating.adoc
A hosted_control_planes/index.adoc
M installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
M modules/advanced-node-tuning-hosted-cluster.adoc
A modules/configuring-node-pools-for-hcp.adoc
A modules/debug-nodes-hcp.adoc
A modules/hosted-control-planes-concepts-personas.adoc
A modules/hosted-control-planes-metrics-sets.adoc
M modules/hosted-control-planes-overview.adoc
A modules/hosted-control-planes-support-matrix.adoc
A modules/hosted-control-planes-troubleshooting.adoc
M modules/hosted-control-planes-version-support.adoc
M modules/node-tuning-hosted-cluster.adoc
M modules/nodes-descheduler-installing.adoc
A modules/nw-ovn-ipsec-external.adoc
M modules/preparing-an-initial-cluster-deployment-for-mce-connected.adoc
M modules/preparing-an-initial-cluster-deployment-for-mce-disconnected.adoc
M modules/sriov-operator-hosted-control-planes.adoc
A modules/updating-node-pools-for-hcp.adoc
A networking/openshift_network_security/configuring-ipsec-ovn.adoc
M scalability_and_performance/using-node-tuning-operator.adoc
M security/compliance_operator/co-management/compliance-operator-installation.adoc
M security/compliance_operator/compliance-operator-release-notes.adoc
M updating/index.adoc
A updating/updating_a_cluster/updating-hosted-control-planes.adoc
M welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (content): Merge conflict in welcome/index.adoc
CONFLICT (modify/delete): updating/updating_a_cluster/updating-hosted-control-planes.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of updating/updating_a_cluster/updating-hosted-control-planes.adoc left in tree.
Auto-merging updating/index.adoc
CONFLICT (content): Merge conflict in updating/index.adoc
Auto-merging security/compliance_operator/compliance-operator-release-notes.adoc
Auto-merging security/compliance_operator/co-management/compliance-operator-installation.adoc
CONFLICT (content): Merge conflict in security/compliance_operator/co-management/compliance-operator-installation.adoc
Auto-merging scalability_and_performance/using-node-tuning-operator.adoc
CONFLICT (content): Merge conflict in scalability_and_performance/using-node-tuning-operator.adoc
CONFLICT (modify/delete): networking/openshift_network_security/configuring-ipsec-ovn.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of networking/openshift_network_security/configuring-ipsec-ovn.adoc left in tree.
CONFLICT (modify/delete): modules/updating-node-pools-for-hcp.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/updating-node-pools-for-hcp.adoc left in tree.
Auto-merging modules/sriov-operator-hosted-control-planes.adoc
CONFLICT (content): Merge conflict in modules/sriov-operator-hosted-control-planes.adoc
Auto-merging modules/preparing-an-initial-cluster-deployment-for-mce-disconnected.adoc
CONFLICT (content): Merge conflict in modules/preparing-an-initial-cluster-deployment-for-mce-disconnected.adoc
Auto-merging modules/preparing-an-initial-cluster-deployment-for-mce-connected.adoc
CONFLICT (content): Merge conflict in modules/preparing-an-initial-cluster-deployment-for-mce-connected.adoc
CONFLICT (modify/delete): modules/nw-ovn-ipsec-external.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/nw-ovn-ipsec-external.adoc left in tree.
Auto-merging modules/nodes-descheduler-installing.adoc
Auto-merging modules/node-tuning-hosted-cluster.adoc
CONFLICT (content): Merge conflict in modules/node-tuning-hosted-cluster.adoc
Auto-merging modules/hosted-control-planes-version-support.adoc
CONFLICT (modify/delete): modules/hosted-control-planes-troubleshooting.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): modules/hosted-control-planes-support-matrix.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-support-matrix.adoc left in tree.
Auto-merging modules/hosted-control-planes-overview.adoc
CONFLICT (content): Merge conflict in modules/hosted-control-planes-overview.adoc
CONFLICT (modify/delete): modules/hosted-control-planes-metrics-sets.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-metrics-sets.adoc left in tree.
CONFLICT (modify/delete): modules/hosted-control-planes-concepts-personas.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-concepts-personas.adoc left in tree.
CONFLICT (modify/delete): modules/debug-nodes-hcp.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/debug-nodes-hcp.adoc left in tree.
CONFLICT (modify/delete): modules/configuring-node-pools-for-hcp.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/configuring-node-pools-for-hcp.adoc left in tree.
Auto-merging modules/advanced-node-tuning-hosted-cluster.adoc
CONFLICT (content): Merge conflict in modules/advanced-node-tuning-hosted-cluster.adoc
Auto-merging installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
CONFLICT (content): Merge conflict in installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
CONFLICT (modify/delete): hosted_control_planes/index.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/index.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-updating.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-updating.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-troubleshooting.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-observability.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-observability.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-getting-started.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-getting-started.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-authentication-authorization.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-authentication-authorization.adoc left in tree.
Auto-merging backup_and_restore/control_plane_backup_and_restore/disaster_recovery/dr-hosted-cluster-within-aws-region.adoc
CONFLICT (content): Merge conflict in backup_and_restore/control_plane_backup_and_restore/disaster_recovery/dr-hosted-cluster-within-aws-region.adoc
Auto-merging architecture/mce-overview-ocp.adoc
Auto-merging architecture/control-plane.adoc
CONFLICT (content): Merge conflict in architecture/control-plane.adoc
Auto-merging _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS#10543: Replace terms with new attributes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to this:
/cherrypick enterprise-4.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.
@kcarmichael08: #75820 failed to apply on top of branch "enterprise-4.13":
Applying: OSDOCS#10543: Replace terms with new attributes
Using index info to reconstruct a base tree...
M _attributes/common-attributes.adoc
M architecture/control-plane.adoc
M architecture/mce-overview-ocp.adoc
A hosted_control_planes/hcp-authentication-authorization.adoc
M hosted_control_planes/hcp-backup-restore-dr.adoc
A hosted_control_planes/hcp-getting-started.adoc
A hosted_control_planes/hcp-observability.adoc
A hosted_control_planes/hcp-troubleshooting.adoc
A hosted_control_planes/hcp-updating.adoc
M hosted_control_planes/index.adoc
M installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
M modules/advanced-node-tuning-hosted-cluster.adoc
M modules/configuring-node-pools-for-hcp.adoc
A modules/debug-nodes-hcp.adoc
A modules/hosted-control-planes-concepts-personas.adoc
A modules/hosted-control-planes-metrics-sets.adoc
M modules/hosted-control-planes-overview.adoc
A modules/hosted-control-planes-support-matrix.adoc
A modules/hosted-control-planes-troubleshooting.adoc
M modules/hosted-control-planes-version-support.adoc
M modules/node-tuning-hosted-cluster.adoc
M modules/nodes-descheduler-installing.adoc
A modules/nw-ovn-ipsec-external.adoc
M modules/preparing-an-initial-cluster-deployment-for-mce-connected.adoc
M modules/preparing-an-initial-cluster-deployment-for-mce-disconnected.adoc
M modules/sriov-operator-hosted-control-planes.adoc
M modules/updating-node-pools-for-hcp.adoc
A networking/openshift_network_security/configuring-ipsec-ovn.adoc
M scalability_and_performance/using-node-tuning-operator.adoc
M security/compliance_operator/compliance-operator-release-notes.adoc
M updating/index.adoc
A updating/updating_a_cluster/updating-hosted-control-planes.adoc
M welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (content): Merge conflict in welcome/index.adoc
CONFLICT (modify/delete): updating/updating_a_cluster/updating-hosted-control-planes.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of updating/updating_a_cluster/updating-hosted-control-planes.adoc left in tree.
Auto-merging updating/index.adoc
CONFLICT (content): Merge conflict in updating/index.adoc
Auto-merging security/compliance_operator/compliance-operator-release-notes.adoc
Auto-merging scalability_and_performance/using-node-tuning-operator.adoc
CONFLICT (content): Merge conflict in scalability_and_performance/using-node-tuning-operator.adoc
CONFLICT (modify/delete): networking/openshift_network_security/configuring-ipsec-ovn.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of networking/openshift_network_security/configuring-ipsec-ovn.adoc left in tree.
Auto-merging modules/updating-node-pools-for-hcp.adoc
Auto-merging modules/sriov-operator-hosted-control-planes.adoc
CONFLICT (content): Merge conflict in modules/sriov-operator-hosted-control-planes.adoc
Auto-merging modules/preparing-an-initial-cluster-deployment-for-mce-disconnected.adoc
Auto-merging modules/preparing-an-initial-cluster-deployment-for-mce-connected.adoc
CONFLICT (modify/delete): modules/nw-ovn-ipsec-external.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/nw-ovn-ipsec-external.adoc left in tree.
Auto-merging modules/nodes-descheduler-installing.adoc
Auto-merging modules/node-tuning-hosted-cluster.adoc
CONFLICT (content): Merge conflict in modules/node-tuning-hosted-cluster.adoc
Auto-merging modules/hosted-control-planes-version-support.adoc
CONFLICT (modify/delete): modules/hosted-control-planes-troubleshooting.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): modules/hosted-control-planes-support-matrix.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-support-matrix.adoc left in tree.
Auto-merging modules/hosted-control-planes-overview.adoc
CONFLICT (content): Merge conflict in modules/hosted-control-planes-overview.adoc
CONFLICT (modify/delete): modules/hosted-control-planes-metrics-sets.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-metrics-sets.adoc left in tree.
CONFLICT (modify/delete): modules/hosted-control-planes-concepts-personas.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-concepts-personas.adoc left in tree.
CONFLICT (modify/delete): modules/debug-nodes-hcp.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/debug-nodes-hcp.adoc left in tree.
Auto-merging modules/configuring-node-pools-for-hcp.adoc
Auto-merging modules/advanced-node-tuning-hosted-cluster.adoc
CONFLICT (content): Merge conflict in modules/advanced-node-tuning-hosted-cluster.adoc
Auto-merging installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
Auto-merging hosted_control_planes/index.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/index.adoc
CONFLICT (modify/delete): hosted_control_planes/hcp-updating.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-updating.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-troubleshooting.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-observability.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-observability.adoc left in tree.
CONFLICT (modify/delete): hosted_control_planes/hcp-getting-started.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-getting-started.adoc left in tree.
Auto-merging hosted_control_planes/hcp-backup-restore-dr.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-backup-restore-dr.adoc
CONFLICT (modify/delete): hosted_control_planes/hcp-authentication-authorization.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of hosted_control_planes/hcp-authentication-authorization.adoc left in tree.
Auto-merging architecture/mce-overview-ocp.adoc
Auto-merging architecture/control-plane.adoc
CONFLICT (content): Merge conflict in architecture/control-plane.adoc
Auto-merging _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS#10543: Replace terms with new attributes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to this:
/cherrypick enterprise-4.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.
@kcarmichael08: #75820 failed to apply on top of branch "enterprise-4.14":
Applying: OSDOCS#10543: Replace terms with new attributes
Using index info to reconstruct a base tree...
M _attributes/common-attributes.adoc
M architecture/control-plane.adoc
M architecture/mce-overview-ocp.adoc
M hosted_control_planes/hcp-getting-started.adoc
M hosted_control_planes/index.adoc
M installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
A modules/hosted-control-planes-support-matrix.adoc
M modules/hosted-control-planes-version-support.adoc
M modules/nodes-descheduler-installing.adoc
A modules/nw-ovn-ipsec-external.adoc
A networking/openshift_network_security/configuring-ipsec-ovn.adoc
M security/compliance_operator/compliance-operator-release-notes.adoc
M welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
CONFLICT (content): Merge conflict in welcome/index.adoc
Auto-merging security/compliance_operator/compliance-operator-release-notes.adoc
CONFLICT (modify/delete): networking/openshift_network_security/configuring-ipsec-ovn.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of networking/openshift_network_security/configuring-ipsec-ovn.adoc left in tree.
CONFLICT (modify/delete): modules/nw-ovn-ipsec-external.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/nw-ovn-ipsec-external.adoc left in tree.
Auto-merging modules/nodes-descheduler-installing.adoc
Auto-merging modules/hosted-control-planes-version-support.adoc
CONFLICT (modify/delete): modules/hosted-control-planes-support-matrix.adoc deleted in HEAD and modified in OSDOCS#10543: Replace terms with new attributes. Version OSDOCS#10543: Replace terms with new attributes of modules/hosted-control-planes-support-matrix.adoc left in tree.
Auto-merging installing/installing_with_agent_based_installer/preparing-an-agent-based-installed-cluster-for-mce.adoc
Auto-merging hosted_control_planes/index.adoc
Auto-merging hosted_control_planes/hcp-getting-started.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-getting-started.adoc
Auto-merging architecture/mce-overview-ocp.adoc
Auto-merging architecture/control-plane.adoc
Auto-merging _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS#10543: Replace terms with new attributes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to this:
/cherrypick enterprise-4.14
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.
@kcarmichael08: new pull request created: #76009
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.
@kcarmichael08: new pull request created: #76011
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.