Skip to content

Conversation

jaypoulz
Copy link
Contributor

@jaypoulz jaypoulz commented Apr 22, 2025

Two Node OpenShift with Fencing (TNF) is a deployment topology with two control-plane nodes that was introduce as a Dev Preview in OpenShift 4.19. This commit updates the logic around TNF to only render fencing credentials in releases 4.19 and up, and also the sslInsecure parameter so that it uses certificateVerification in 4.20 and up, as introduced in openshift/installer#9640.

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 22, 2025
Copy link

openshift-ci bot commented Apr 22, 2025

Hi @jaypoulz. Thanks for your PR.

I'm waiting for a openshift-metal3 member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch from c3b0582 to ae81aba Compare April 22, 2025 12:54
@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch 3 times, most recently from 9c1ec4c to 25dfa10 Compare April 22, 2025 13:10
@jaypoulz jaypoulz changed the title OCPEDGE-1749: [TNF] Reworked TNF logic to render fencing block conditionally. OCPEDGE-1825: [TNF] Reworked TNF logic to render fencing block conditionally. Apr 22, 2025
@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch from 25dfa10 to fad6268 Compare May 7, 2025 18:03
@jaypoulz jaypoulz marked this pull request as ready for review May 7, 2025 18:05
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 7, 2025
@openshift-ci openshift-ci bot requested review from andfasano and dtantsur May 7, 2025 18:06
@bfournie
Copy link
Contributor

bfournie commented May 7, 2025

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 7, 2025
@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch from fad6268 to 6431c84 Compare May 7, 2025 20:10
@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch 2 times, most recently from ed26ae7 to 9976402 Compare May 8, 2025 12:58
@jaypoulz
Copy link
Contributor Author

jaypoulz commented May 8, 2025

/retest

ansible-playbook \
-e @vm_setup_vars.yml \
-e "ironic_prefix=${CLUSTER_NAME}_" \
-e "${ironic_prefix_env_var}" \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This might have problematic implications. Since I've added this line, my clusters don't see to get past the ironic inspection phase. I'm wondering if the ostest_ is used somewhere else to identify the nodes somehow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I decided to avoid messing with the ironic name, since it's also used in the creation of the network bonds. Instead, I just reference the MASTER_HOSTNAME_FORMAT variable in the creation of the secret, which should align the secret name.

@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch from 9976402 to e173077 Compare May 9, 2025 13:29
…ionally.

Two Node OpenShift with Fencing (TNF) is a deployment topology with two
control-plane nodes that was introduce as a Dev Preview in OpenShift
4.19. This commit updates the logic around TNF to only render fencing
credentials in releases 4.19 and up, and also the sslInsecure parameter
so that it uses certificateVerification in 4.20 and up, as introduced
in openshift/installer#9640.
@jaypoulz jaypoulz force-pushed the OCPEDGE-1749-tnf-fencing branch from e173077 to 82ee019 Compare May 9, 2025 13:29
@slintes
Copy link
Contributor

slintes commented May 12, 2025

tested successfully :)

/lgtm

Copy link

openshift-ci bot commented May 12, 2025

@slintes: changing LGTM is restricted to collaborators

In response to this:

tested successfully :)

/lgtm

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.

@elfosardo
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 13, 2025
done
}

function node_map_to_install_config_fencing_credentials() {
Copy link
Member

Choose a reason for hiding this comment

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

Side note: this should be moved outside of utils.sh to some more specific file.

@dtantsur
Copy link
Member

/approve

Copy link

openshift-ci bot commented May 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 13, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 84682f1 into openshift-metal3:master May 13, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants