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

vsphere: set providerID #459

Merged
merged 1 commit into from Jan 13, 2020
Merged

vsphere: set providerID #459

merged 1 commit into from Jan 13, 2020

Conversation

enxebre
Copy link
Member

@enxebre enxebre commented Jan 9, 2020

Introduce support to set the providerID on the machine spec based on the biosUUID consistently with https://github.com/kubernetes/cloud-provider-vsphere/

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 9, 2020
@enxebre
Copy link
Member Author

enxebre commented Jan 9, 2020

/test unit

bison
bison reviewed Jan 9, 2020
View reviewed changes
pkg/controller/vsphere/machine_scope.go Outdated
s.machine.Status.ProviderStatus = providerStatus
if err := s.client.Status().Patch(context.Background(), s.machine, s.machineToBePatched); err != nil {
klog.Errorf("Failed to update machine %q: %v", s.machine.GetName(), err)
if err := s.client.Status().Patch(context.Background(), s.machine.DeepCopy(), s.machineToBePatched); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure I understand the design of the machineScope. Why do we deep copy the machine here? That means we discard the results of the update, and now both the machine and machineToBePatched fields are out of date.

pkg/controller/vsphere/reconciler.go Outdated
// If the supplied UUID is empty or invalid an error is returned.
// A valid UUID should adhere to the format specified by UUIDPattern.
func convertUUIDToProviderID(UUID string) (string, error) {
pattern := regexp.MustCompile(UUIDPattern)
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 really have an objection to this, but we could also just uuid.Parse() the UUID and then parsedUUID.String() to make sure its in a known format for the provider ID. Might be a little more forgiving, and does away with the big regex.

@enxebre enxebre force-pushed the providerID branch 5 times, most recently from 9b3025c to ca9022d Compare January 9, 2020 19:02
@enxebre
Copy link
Member Author

enxebre commented Jan 10, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 10, 2020
@enxebre
Copy link
Member Author

enxebre commented Jan 10, 2020

/retest

bison
bison approved these changes Jan 10, 2020
View reviewed changes
Copy link
Contributor

@bison bison left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2020
@enxebre
Copy link
Member Author

enxebre commented Jan 10, 2020

/retest

2 similar comments
@enxebre
Copy link
Member Author

enxebre commented Jan 10, 2020

/retest

@enxebre
Copy link
Member Author

enxebre commented Jan 13, 2020

/retest

bison
bison approved these changes Jan 13, 2020
View reviewed changes
Copy link
Contributor

@bison bison left a comment

Choose a reason for hiding this comment

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

/lgtm

bison
bison approved these changes Jan 13, 2020
View reviewed changes
Copy link
Contributor

@bison bison left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bison

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 13, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 13, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 13, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 13, 2020
bison
bison approved these changes Jan 13, 2020
View reviewed changes
Copy link
Contributor

@bison bison left a comment

Choose a reason for hiding this comment

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

/lgtm

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

/retest

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

6 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-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 aa06b9e into openshift:master Jan 13, 2020
@openshift-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
ci/prow/e2e-azure 3621cc0 link /test e2e-azure
ci/prow/e2e-azure-operator 3621cc0 link /test e2e-azure-operator
ci/prow/e2e-gcp-operator 3621cc0 link /test e2e-gcp-operator

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.

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

@bison bison bison approved these changes

@michaelgugino michaelgugino Awaiting requested review from michaelgugino

Assignees

@bison bison

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@enxebre @openshift-ci-robot @openshift-bot @bison @openshift-merge-robot