Skip to content

OSDOCS-17034: two node OCP CQA - #115222

Merged
skopacz1 merged 1 commit into
openshift:mainfrom
skopacz1:OSDOCS-17034
Jul 21, 2026
Merged

OSDOCS-17034: two node OCP CQA#115222
skopacz1 merged 1 commit into
openshift:mainfrom
skopacz1:OSDOCS-17034

Conversation

@skopacz1

@skopacz1 skopacz1 commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

OSDOCS-17034

Version(s): 4.20+

CQA for two node cluster install docs.

QE review: not required IMO but let me know if you see anything that makes you disagree.

Previews:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 13, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 13, 2026

Copy link
Copy Markdown

@skopacz1: This pull request references OSDOCS-17034 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 sub-task to target the "5.0.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 openshift-ci Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 13, 2026
@skopacz1 skopacz1 added this to the Continuous Release milestone Jul 14, 2026
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 17, 2026
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 17, 2026
@lahinson lahinson added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jul 20, 2026

@lahinson lahinson left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@skopacz1 Just a couple questions for you, but nothing that would block merging. Marking as ok-to-merge.

@@ -1,19 +1,21 @@
:_mod-docs-content-type: ASSEMBLY
[id="about-two-node-arbiter-installation"]
= Two-Node with Arbiter

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't know anything about Arbiter, so forgive my ignorance. Should it be capitalized here? Looks like it's lowercase in the body text.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Genuinely unsure of this myself, I think I will just leave it as is and save it for the quality pass of CQAs later

= Minimum resource requirements for installing a two-node OpenShift cluster with fencing

[role="_abstract"]
Each created cluster must meet minimum requirements so that the cluster runs as expected.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
Each created cluster must meet minimum requirements so that the cluster runs as expected.
Each cluster must meet minimum requirements so that the cluster runs as expected.

Just a nit. If there's a good reason to include the "created", feel free to ignore me.

@@ -5,7 +5,7 @@

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should this be a REFERENCE?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah I can see the case for that, I will change it here

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should "none" be none? I know this isn't part of your proposed changes here, but I saw this in the preview, and it caught my attention.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes that should probably be in backticks, good catch!

@lahinson lahinson added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Jul 20, 2026
----

* `platform.baremetal.apiVIPs` and `ingressVIPs`: Specifies virtual IPs for the API and Ingress endpoints. Required for bare-metal platform; not applicable for none.
* `platform.baremetal.apiVIPs` and `ingressVIPs`: Specifies virtual IPs for the API and Ingress endpoints. Required for bare-metal platform; not applicable for `none`.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

🤖 [error] RedHat.TermsErrors: Use 'bare metal' rather than 'bare-metal'. For more information, see RedHat.TermsErrors.

@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown

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

@skopacz1
skopacz1 merged commit 2265c83 into openshift:main Jul 21, 2026
2 checks passed
@skopacz1

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@skopacz1

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@skopacz1

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22
/cherrypick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@skopacz1: #115222 failed to apply on top of branch "enterprise-4.20":

Applying: OSDOCS-17034: two node OCP CQA
Using index info to reconstruct a base tree...
M	installing/installing_two_node_cluster/about-two-node-arbiter-installation.adoc
M	installing/installing_two_node_cluster/installing_tnf/install-post-tnf.adoc
M	installing/installing_two_node_cluster/installing_tnf/installing-two-node-fencing.adoc
M	modules/installation-replacing-control-plane-nodes.adoc
M	modules/installation-two-node-cluster-min-resource-reqs.adoc
A	modules/sample-install-config-two-node-fencing-abi.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_two_node_cluster/about-two-node-arbiter-installation.adoc
CONFLICT (content): Merge conflict in installing/installing_two_node_cluster/about-two-node-arbiter-installation.adoc
Auto-merging installing/installing_two_node_cluster/installing_tnf/install-post-tnf.adoc
Auto-merging installing/installing_two_node_cluster/installing_tnf/installing-two-node-fencing.adoc
Auto-merging modules/installation-replacing-control-plane-nodes.adoc
Auto-merging modules/installation-two-node-cluster-min-resource-reqs.adoc
CONFLICT (modify/delete): modules/sample-install-config-two-node-fencing-abi.adoc deleted in HEAD and modified in OSDOCS-17034: two node OCP CQA.  Version OSDOCS-17034: two node OCP CQA of modules/sample-install-config-two-node-fencing-abi.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-17034: two node OCP CQA

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

Copy link
Copy Markdown

@skopacz1: #115222 failed to apply on top of branch "enterprise-4.21":

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 set advice.mergeConflict false"

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

Copy link
Copy Markdown

@skopacz1: new pull request created: #115972

Details

In response to this:

/cherrypick enterprise-4.22
/cherrypick enterprise-5.0

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.

@skopacz1

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@openshift-cherrypick-robot

Copy link
Copy Markdown

@skopacz1: new pull request created: #115977

Details

In response to this:

/cherrypick enterprise-4.22
/cherrypick enterprise-5.0

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

Copy link
Copy Markdown

@skopacz1: #115222 failed to apply on top of branch "enterprise-4.21":

Applying: OSDOCS-17034: two node OCP CQA
Using index info to reconstruct a base tree...
M	installing/installing_two_node_cluster/about-two-node-arbiter-installation.adoc
M	installing/installing_two_node_cluster/installing_tnf/install-post-tnf.adoc
M	installing/installing_two_node_cluster/installing_tnf/installing-two-node-fencing.adoc
M	modules/installation-replacing-control-plane-nodes.adoc
M	modules/installation-two-node-cluster-min-resource-reqs.adoc
A	modules/sample-install-config-two-node-fencing-abi.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_two_node_cluster/about-two-node-arbiter-installation.adoc
CONFLICT (content): Merge conflict in installing/installing_two_node_cluster/about-two-node-arbiter-installation.adoc
Auto-merging installing/installing_two_node_cluster/installing_tnf/install-post-tnf.adoc
Auto-merging installing/installing_two_node_cluster/installing_tnf/installing-two-node-fencing.adoc
Auto-merging modules/installation-replacing-control-plane-nodes.adoc
Auto-merging modules/installation-two-node-cluster-min-resource-reqs.adoc
CONFLICT (modify/delete): modules/sample-install-config-two-node-fencing-abi.adoc deleted in HEAD and modified in OSDOCS-17034: two node OCP CQA.  Version OSDOCS-17034: two node OCP CQA of modules/sample-install-config-two-node-fencing-abi.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-17034: two node OCP CQA

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.

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

Labels

branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 branch/enterprise-5.0 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. ok-to-merge size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants