Skip to content

Conversation

@vimauro
Copy link

@vimauro vimauro commented Feb 4, 2026

Summary

  • Add TNA (Two-Node with Arbiter) topology support to kcli deployment method, enabling arbiter-kcli deployments alongside existing fencing-kcli
  • Consolidate four separate deployment scripts (deploy-arbiter-ipi.sh, deploy-arbiter-agent.sh, deploy-fencing-ipi.sh, deploy-fencing-agent.sh) into a single unified deploy-cluster.sh script with --topology and --method arguments
  • Add new Makefile targets arbiter-kcli and fencing-kcli for kcli-based deployments
  • Improved AWS hypervisor creation with duplicate stack detection and retry logic for ssh-keyscan
  • Add Makefile validation for cluster types with helpful error messages for invalid input (made a mistake couple of times and realized 15 minutes later :D )

Note:

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

openshift-ci-robot commented Feb 4, 2026

@vimauro: This pull request references OCPEDGE-2276 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

  • Add TNA (Two-Node with Arbiter) topology support to kcli deployment method, enabling arbiter-kcli deployments alongside existing fencing-kcli
  • Consolidate four separate deployment scripts (deploy-arbiter-ipi.sh, deploy-arbiter-agent.sh, deploy-fencing-ipi.sh, deploy-fencing-agent.sh) into a single unified deploy-cluster.sh script with --topology and --method arguments
  • Add new Makefile targets arbiter-kcli and fencing-kcli for kcli-based deployments
  • Improved AWS hypervisor creation with duplicate stack detection and retry logic for ssh-keyscan
  • Add Makefile validation for cluster types with helpful error messages for invalid input (made a mistake couple of times and realized 15 minutes later :D )

Note:

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 requested review from fonta-rh and jerpeter1 February 4, 2026 09:25
@vimauro
Copy link
Author

vimauro commented Feb 4, 2026

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 4, 2026
Copy link
Contributor

@fonta-rh fonta-rh left a comment

Choose a reason for hiding this comment

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

Great addition! Added a few considerations. Specially the random-suffix for CloudFormation stack seems a bit dangerous to me, I'd like to hear more about the need for that

@echo ""
@echo "Instance Lifecycle Management:"
@echo " deploy - Create, initialize, and update inventory for new EC2 instance"
@echo " deploy <cluster-type>- Deploy EC2 instance AND deploy the specified cluster type"
Copy link
Contributor

Choose a reason for hiding this comment

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

I like where you're going with this, but there is no "cluster-type" explanation in the help. To combine this, I would leave the "OpenShift Cluster Management" section just for cluster handling commands, and move the cluster types into a "OpenShift Cluster Deployment" with all the cluster types. Then you can reference that "OpenShift Cluster Deployment" section here for the valid values

Copy link
Author

Choose a reason for hiding this comment

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

Sounds good. I have changed this section a bit, let me know what you think about it!

Copy link
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 if the "Valid types" echo was there before and I missed it, but it's exactly what was needed. Looking good!

Copy link
Author

Choose a reason for hiding this comment

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

seems it wasn't there 😄
I added also a variable VALID_CLUSTER_TYPES so that we can also check for any inconsistency early on in the deployment process. I made a typo couple of times and got an error 15 minutes later, that's why I added it 😆

Copy link
Contributor

Choose a reason for hiding this comment

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

That's the best reason to do it 🤣

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 5, 2026
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 5, 2026
Copy link
Contributor

@fonta-rh fonta-rh left a comment

Choose a reason for hiding this comment

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

Awesome work cleaning up at the same time new features are added. I think you might need a rebase because a couple PRs merged this morning, I'll re-lgtm after that

@echo ""
@echo "Instance Lifecycle Management:"
@echo " deploy - Create, initialize, and update inventory for new EC2 instance"
@echo " deploy <cluster-type>- Deploy EC2 instance AND deploy the specified cluster type"
Copy link
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 if the "Valid types" echo was there before and I missed it, but it's exactly what was needed. Looking good!

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 5, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fonta-rh, vimauro

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

The pull request process is described here

Details 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 Feb 5, 2026
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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants