Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct ignitionHost for vSphere UPI #2956

Merged
merged 1 commit into from Jan 25, 2020
Merged

Correct ignitionHost for vSphere UPI #2956

merged 1 commit into from Jan 25, 2020

Conversation

mtnbikenc
Copy link
Member

Does not set vSphere specific ignitionHost if APIVIP is not provided.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 21, 2020
@mtnbikenc mtnbikenc mentioned this pull request Jan 21, 2020
Merged
1 task
@jcpowermac
Copy link
Contributor

/test e2e-vsphere

jcpowermac
jcpowermac reviewed Jan 21, 2020
View reviewed changes
pkg/asset/ignition/machine/node.go
ignitionHost = fmt.Sprintf("%s:22623", installConfig.VSphere.APIVIP)
if installConfig.VSphere.APIVIP != "" {
ignitionHost = fmt.Sprintf("%s:22623", installConfig.VSphere.APIVIP)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

else {
ignitionHost = fmt.Sprintf("api-int.%s:22623", installConfig.ClusterDomain())
}

Copy link
Member Author

Choose a reason for hiding this comment

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

How about fallthrough?

Copy link
Member Author

Choose a reason for hiding this comment

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

Opted against fallthrough and set default to reduce duplicating code with more else.

Copy link
Contributor

Choose a reason for hiding this comment

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

If VIP is an IP, need to future-proof for IPV6? net.JoinHostPort() per #2916

Copy link
Member Author

Choose a reason for hiding this comment

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

Rebased and updated.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 21, 2020
@mtnbikenc mtnbikenc changed the title Correct ignitionHost for UPI Correct ignitionHost for vSphere UPI Jan 21, 2020
@jcpowermac
Copy link
Contributor

/test e2e-vsphere

@jstuever jstuever mentioned this pull request Jan 21, 2020
Closed
3 tasks
@mtnbikenc
Correct ignitionHost for vSphere UPI
33c84ec 
Does not set vSphere specific ignitionHost if APIVIP is not provided.
@jcpowermac
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020
@jcpowermac
Copy link
Contributor

The vsphere failure is not related to this. As far as I can tell.

@mtnbikenc
Copy link
Member Author

@wking @sdodson Approve?
This fixes a bug in UPI due to my incomplete implementation of IPI #2930.

@sdodson
Copy link
Member

sdodson commented Jan 24, 2020

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sdodson

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 7934dd5 into openshift:master Jan 25, 2020
@openshift-ci-robot
Copy link
Contributor

@mtnbikenc: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-vsphere 1ce61da link /test e2e-vsphere
ci/prow/e2e-aws-scaleup-rhel7 33c84ec link /test e2e-aws-scaleup-rhel7
ci/prow/e2e-libvirt 33c84ec link /test e2e-libvirt

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@mtnbikenc mtnbikenc deleted the fix-ignitionHost branch January 28, 2020 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcpowermac jcpowermac jcpowermac left review comments

@jstuever jstuever jstuever left review comments

@jhixson74 jhixson74 Awaiting requested review from jhixson74

Assignees

@jcpowermac jcpowermac

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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@mtnbikenc @jcpowermac @sdodson @openshift-ci-robot @openshift-bot @jstuever @openshift-merge-robot