[OSDOCS-19109]: Moving HCP certificate procedure by lahinson · Pull Request #110078 · openshift/openshift-docs

lahinson · 2026-04-14T18:46:01Z

Version(s): 4.17+

Issue: https://redhat.atlassian.net/browse/OSDOCS-19109

Link to docs preview:

QE review:
N/A no technical changes

Additional information: This PR replaces several includes to a module about certificate configuration with an additional resource xref to that module. It also rearranges a few additional resources to be placed in more logical locations in the HCP docs. No new content was added.

ocpdocs-previewbot · 2026-04-14T18:54:42Z

🤖 Tue Apr 14 19:32:26 - Prow CI generated the docs preview:

https://110078--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp-deploy/hcp-deploy-aws.html
https://110078--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp-deploy/hcp-deploy-bm.html
https://110078--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.html
https://110078--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hosted_control_planes/hcp-deploy/hcp-deploy-virt.html

openshift-ci · 2026-04-14T19:33:26Z

@lahinson: 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.

ShaunaDiaz

/lgtm

lahinson · 2026-04-16T14:42:25Z

/cherrypick enterprise-4.17

lahinson · 2026-04-16T14:42:31Z

/cherrypick enterprise-4.18

lahinson · 2026-04-16T14:42:38Z

/cherrypick enterprise-4.19

lahinson · 2026-04-16T14:42:45Z

/cherrypick enterprise-4.20

lahinson · 2026-04-16T14:42:52Z

/cherrypick enterprise-4.21

lahinson · 2026-04-16T14:42:58Z

/cherrypick enterprise-4.22

openshift-cherrypick-robot · 2026-04-16T14:43:10Z

@lahinson: #110078 failed to apply on top of branch "enterprise-4.17":

Applying: Moving HCP certificate procedure
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-aws.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-aws.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 set advice.mergeConflict false"
Patch failed at 0001 Moving HCP certificate procedure

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 · 2026-04-16T14:43:15Z

@lahinson: #110078 failed to apply on top of branch "enterprise-4.18":

Applying: Moving HCP certificate procedure
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-aws.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-aws.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 set advice.mergeConflict false"
Patch failed at 0001 Moving HCP certificate procedure

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 · 2026-04-16T14:43:21Z

@lahinson: #110078 failed to apply on top of branch "enterprise-4.19":

Applying: Moving HCP certificate procedure
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-aws.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-aws.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 set advice.mergeConflict false"
Patch failed at 0001 Moving HCP certificate procedure

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 · 2026-04-16T14:43:28Z

@lahinson: #110078 failed to apply on top of branch "enterprise-4.20":

Applying: Moving HCP certificate procedure
Using index info to reconstruct a base tree...
M	hosted_control_planes/hcp-deploy/hcp-deploy-aws.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
M	hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Falling back to patching base and 3-way merge...
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-non-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
CONFLICT (content): Merge conflict in hosted_control_planes/hcp-deploy/hcp-deploy-bm.adoc
Auto-merging hosted_control_planes/hcp-deploy/hcp-deploy-aws.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 set advice.mergeConflict false"
Patch failed at 0001 Moving HCP certificate procedure

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 · 2026-04-16T14:43:52Z

@lahinson: new pull request created: #110247

Details

In response to this:

/cherrypick enterprise-4.21

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

openshift-cherrypick-robot · 2026-04-16T14:43:58Z

@lahinson: new pull request created: #110248

Details

In response to this:

/cherrypick enterprise-4.22

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.

lahinson added branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 labels Apr 14, 2026

openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 14, 2026

lahinson force-pushed the osdocs-19109-hcp-move-cert-proc branch from 81d62c9 to d71f69e Compare April 14, 2026 19:13

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 Apr 14, 2026

[OSDOCS-19109]: Moving HCP certificate procedure

8304cf7

lahinson force-pushed the osdocs-19109-hcp-move-cert-proc branch from d71f69e to 8304cf7 Compare April 14, 2026 19:26

lahinson added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. merge-review-needed Signifies that the merge review team needs to review this PR labels Apr 14, 2026

ShaunaDiaz added ok-to-merge and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Apr 16, 2026

ShaunaDiaz reviewed Apr 16, 2026

View reviewed changes

openshift-ci bot assigned ShaunaDiaz Apr 16, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2026

lahinson merged commit 4f9e933 into openshift:main Apr 16, 2026
2 checks passed

openshift-cherrypick-robot mentioned this pull request Apr 16, 2026

[enterprise-4.21] [OSDOCS-19109]: Moving HCP certificate procedure #110247

Merged

openshift-cherrypick-robot mentioned this pull request Apr 16, 2026

[enterprise-4.22] [OSDOCS-19109]: Moving HCP certificate procedure #110248

Merged

Conversation

lahinson commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Apr 14, 2026

Uh oh!

ShaunaDiaz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lahinson commented Apr 16, 2026

Uh oh!

lahinson commented Apr 16, 2026

Uh oh!

lahinson commented Apr 16, 2026

Uh oh!

lahinson commented Apr 16, 2026

Uh oh!

lahinson commented Apr 16, 2026

Uh oh!

lahinson commented Apr 16, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 16, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 16, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 16, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 16, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 16, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lahinson commented Apr 14, 2026 •

edited

Loading

ocpdocs-previewbot commented Apr 14, 2026 •

edited

Loading