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

Assign datacenter only if specified #1274

Closed
wants to merge 1 commit into from
Closed

Assign datacenter only if specified #1274

wants to merge 1 commit into from

Conversation

farodin91
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1266

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

Assign datacenter only if specified

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 20, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @farodin91. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 20, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign frapposelli after the PR has been reviewed.
You can assign the PR to them by writing /assign @frapposelli in a comment when ready.

The full list of commands accepted by this bot can be found 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

@farodin91 farodin91 force-pushed the assign-datacenter-only-if-specified branch 2 times, most recently from 42379e0 to 760f8a1 Compare October 20, 2021 10:35
@farodin91
Copy link
Contributor Author

I have tested this in our staging setup. Works fine.

@gab-satchi
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot 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 Oct 20, 2021
@gab-satchi
Copy link
Member

@farodin91 thanks for the changes. just need to clean up the commit message to remove the Fixes... bit

@farodin91
Copy link
Contributor Author

It looks we need a data center for some stuff such as zone deployments.

@farodin91 farodin91 force-pushed the assign-datacenter-only-if-specified branch from 760f8a1 to b796952 Compare October 21, 2021 12:04
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 21, 2021
@farodin91
Assign datacenter only if specified
9673515 
Signed-off-by: Jan Jansen <jan.jansen@gdata.de>
@farodin91 farodin91 force-pushed the assign-datacenter-only-if-specified branch from b796952 to 9673515 Compare October 21, 2021 12:17
@k8s-ci-robot
Copy link
Contributor

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

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-test 9673515 link true /test pull-cluster-api-provider-vsphere-test

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.

@farodin91
Copy link
Contributor Author

@gab-satchi make test did pass locally now on my machine.

yastij
yastij reviewed Oct 21, 2021
View reviewed changes
pkg/session/session.go
@@ -85,6 +86,11 @@ func (p *Params) WithDatacenter(datacenter string) *Params {
return p
}

func (p *Params) WithDefaultDatacenter() *Params {
p.tryDefaultDatacenter = true
Copy link
Member

Choose a reason for hiding this comment

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

I think we can add defaulting to the VSphereMachine and keep the check bellow

pkg/session/session.go
dc, err := session.Finder.DatacenterOrDefault(ctx, params.datacenter)
if err != nil {
return nil, errors.Wrapf(err, "unable to find datacenter %q", params.datacenter)
if params.datacenter != "" {
Copy link
Member

Choose a reason for hiding this comment

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

I think we can keep this

@yastij yastij self-assigned this Oct 21, 2021
@schrej schrej mentioned this pull request Oct 25, 2021
Merged
@farodin91 farodin91 closed this Nov 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yastij yastij yastij left review comments

@gab-satchi gab-satchi Awaiting requested review from gab-satchi

@randomvariable randomvariable Awaiting requested review from randomvariable

Assignees

@yastij yastij

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

VSphereCluster reconciliation fails for VC with multiple Datacenters
4 participants
@farodin91 @k8s-ci-robot @gab-satchi @yastij