Skip to content

SPLAT-1423: Added static ip support to CAPI installer.#8081

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
vr4manta:SPLAT-1423
Mar 5, 2024
Merged

SPLAT-1423: Added static ip support to CAPI installer.#8081
openshift-merge-bot[bot] merged 2 commits intoopenshift:masterfrom
vr4manta:SPLAT-1423

Conversation

@vr4manta
Copy link
Contributor

@vr4manta vr4manta commented Feb 28, 2024 •
edited
Loading

SPLAT-1423

Changes

  • Added logic to inject static IP of masters and bootstrap when installing using CAPI instead of Terraform

Prerequisites

Blocking

@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 28, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 28, 2024 •
edited by openshift-ci bot
Loading

@vr4manta: This pull request references SPLAT-1423 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 task to target the "4.16.0" version, but no target version was set.

Details

In response to this:

SPLAT-1423

Changes

  • Added logic to inject static IP of masters and bootstrap when installing using CAPI instead of Terraform

Prerequisites

Blocking

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 28, 2024
@vr4manta vr4manta mentioned this pull request Feb 28, 2024
Merged
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 28, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@vr4manta
Copy link
Contributor Author

vr4manta commented Feb 28, 2024

/label capi

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 28, 2024

@vr4manta: The label(s) /label capi cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label capi

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/test-infra repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 28, 2024 •
edited by openshift-ci bot
Loading

@vr4manta: This pull request references SPLAT-1423 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 task to target the "4.16.0" version, but no target version was set.

Details

In response to this:

SPLAT-1423

Changes

  • Added logic to inject static IP of masters and bootstrap when installing using CAPI instead of Terraform

Prerequisites

Blocking

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-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 28, 2024
@vr4manta vr4manta force-pushed the SPLAT-1423 branch 2 times, most recently from 13b2282 to 3679589 Compare February 29, 2024 17:23
@vr4manta vr4manta marked this pull request as ready for review February 29, 2024 17:23
@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 Feb 29, 2024
rvanderp3
rvanderp3 reviewed Feb 29, 2024
View reviewed changes
Copy link
Contributor

@rvanderp3 rvanderp3 left a comment

Choose a reason for hiding this comment

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

other than a nit, LGTM

pkg/asset/machines/vsphere/capimachines.go Outdated
Copy link
Contributor

@rvanderp3 rvanderp3 Feb 29, 2024

Choose a reason for hiding this comment

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

Suggested change
fmt.Printf("Extra Properties %v\n", customVMXKeys)
logrus.Debugf("Extra Properties %v\n", customVMXKeys)

Copy link
Contributor Author

@vr4manta vr4manta Feb 29, 2024

Choose a reason for hiding this comment

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

sorry, meant to remove that. fixed.

@rvanderp3
Copy link
Contributor

rvanderp3 commented Feb 29, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 29, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 29, 2024
@vr4manta
Copy link
Contributor Author

vr4manta commented Feb 29, 2024

/assign @patrickdillon
Ready for review. Thanks!

@vr4manta
Copy link
Contributor Author

vr4manta commented Mar 1, 2024

/retest-required

@vr4manta
Copy link
Contributor Author

vr4manta commented Mar 1, 2024

/test e2e-vsphere-ovn

@vr4manta
Copy link
Contributor Author

vr4manta commented Mar 1, 2024

/label capi

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 1, 2024

@vr4manta: The label(s) /label capi cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label capi

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/test-infra repository.

@jcpowermac
Copy link
Contributor

jcpowermac commented Mar 1, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 1, 2024
@patrickdillon
Copy link
Contributor

patrickdillon commented Mar 2, 2024 •
edited
Loading

/label capi

I looked into adding the label in prow config but labels like

/label platform/vsphere

seem to be defined as additional_labels at the top level and don’t seem configurable at the repo level. Need to follow up with dptp

anyway this looks good!
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 2, 2024

@patrickdillon: The label(s) `/label platform/vsphere

cannot be applied. These labels are supported:acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labelsorlabels -> restricted_labelsinplugin.yaml`?

Details

In response to this:

/label capi

I looked into adding the label in prow config but labels like
/label platform/vsphere

seem to be defined as additional_labels and don’t seem configurable at the repo level. Need to follow up with dptp

anyway this looks good!
/approve

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/test-infra repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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-robot
Copy link
Contributor

openshift-ci-robot commented Mar 2, 2024

/retest-required

Remaining retests: 0 against base HEAD bc0cd0a and 2 for PR HEAD ca8a7b3 in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 2, 2024

/retest-required

Remaining retests: 0 against base HEAD 3d78a22 and 1 for PR HEAD ca8a7b3 in total

@vr4manta
Copy link
Contributor Author

vr4manta commented Mar 4, 2024

/retest-required

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 4, 2024

/retest-required

Remaining retests: 0 against base HEAD 7e4d988 and 0 for PR HEAD ca8a7b3 in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 4, 2024

/hold

Revision ca8a7b3 was retested 3 times: holding

@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 Mar 4, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 4, 2024 •
edited
Loading

@vr4manta: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-e2e-aws-ovn-upgrade ca8a7b3 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/e2e-vsphere-zones ca8a7b3 link false /test e2e-vsphere-zones
ci/prow/e2e-vsphere-zones-techpreview ca8a7b3 link false /test e2e-vsphere-zones-techpreview

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/test-infra repository. I understand the commands that are listed here.

@vr4manta
Copy link
Contributor Author

vr4manta commented Mar 5, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 5, 2024

/retest-required

Remaining retests: 0 against base HEAD e527352 and 2 for PR HEAD ca8a7b3 in total

@openshift-merge-bot openshift-merge-bot bot merged commit 06813db into openshift:master Mar 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@patrickdillon patrickdillon patrickdillon approved these changes

@jcpowermac jcpowermac Awaiting requested review from jcpowermac

+1 more reviewer

@rvanderp3 rvanderp3 rvanderp3 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@patrickdillon patrickdillon

@jcpowermac jcpowermac

@rvanderp3 rvanderp3

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@vr4manta @openshift-ci-robot @rvanderp3 @jcpowermac @patrickdillon @openshift-merge-robot