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

Don't allow profile names that conflict with a multi-node name #10119

Merged
merged 1 commit into from
Feb 2, 2021
Merged

Don't allow profile names that conflict with a multi-node name #10119

merged 1 commit into from
Feb 2, 2021

Conversation

daehyeok
Copy link
Contributor

@daehyeok daehyeok commented Jan 9, 2021

Check profile and node name before add to prevent conflict with
machine name on multinode cluster.

Fixes #10061

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 9, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @daehyeok. Thanks for your PR.

I'm waiting for a kubernetes 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 9, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jan 9, 2021
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@daehyeok daehyeok force-pushed the profile_name branch 3 times, most recently from 2efb040 to dda0b26 Compare January 13, 2021 23:37
medyagh
medyagh requested changes Jan 14, 2021
View reviewed changes
cmd/minikube/cmd/start.go Outdated Show resolved Hide resolved
@medyagh medyagh changed the title Check profile, node name to prevent duplication Don't allow profile names that conflict with a multi-node name Jan 14, 2021
@daehyeok daehyeok force-pushed the profile_name branch 5 times, most recently from 54ed12a to 7df059e Compare January 14, 2021 23:41
@daehyeok daehyeok requested a review from medyagh January 14, 2021 23:41
medyagh
medyagh approved these changes Jan 15, 2021
View reviewed changes
Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

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

looks good, I would like to see example of it in the PR description

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 15, 2021
medyagh
medyagh reviewed Jan 15, 2021
View reviewed changes
Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

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

can we add integration test for this here ? https://github.com/medyagh/minikube/blob/89a8cdc794098f9ba0550fbb5eeb19bc3dd8774d/test/integration/multinode_test.go#L46

@daehyeok daehyeok mentioned this pull request Jan 15, 2021
Closed
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 18, 2021
@medyagh
Copy link
Member

medyagh commented Jan 19, 2021

/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 Jan 19, 2021
@medyagh
Copy link
Member

medyagh commented Jan 21, 2021

TestMultiNode/serial/RestartMultiNode fails on both Docker and KVM i wonder if it is related?

@daehyeok
Copy link
Contributor Author

TestMultiNode/serial/RestartMultiNode fails on both Docker and KVM i wonder if it is related?

Fixed it.

minikube/pkg/minikube/node/node.go

Lines 48 to 50 in fb0658c

if p.Config.Name == cc.Name {
continue
}

@medyagh
Copy link
Member

medyagh commented Jan 26, 2021

@daehyeok do u mind pulling upstream master on this PR ?

@daehyeok
Copy link
Contributor Author

@daehyeok do u mind pulling upstream master on this PR ?

rebased with upstream master branch

priyawadhwa
priyawadhwa reviewed Jan 27, 2021
View reviewed changes
cmd/minikube/cmd/start.go Outdated Show resolved Hide resolved
pkg/minikube/config/profile.go Outdated Show resolved Hide resolved
test/integration/multinode_test.go Outdated Show resolved Hide resolved
@daehyeok daehyeok requested a review from priyawadhwa January 27, 2021 21:58
@daehyeok
Check profile, node name to prevent duplication
a00d632 
Check profile and node name before add to prevent conflict with
machine name on multinode cluster.
@sharifelgamal
Copy link
Collaborator

/ok-to-test

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: daehyeok, medyagh, sharifelgamal

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:
  • OWNERS [medyagh,sharifelgamal]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@medyagh medyagh merged commit d974188 into kubernetes:master Feb 2, 2021
@daehyeok daehyeok mentioned this pull request Feb 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sharifelgamal sharifelgamal sharifelgamal approved these changes

@medyagh medyagh medyagh approved these changes

@tstromberg tstromberg Awaiting requested review from tstromberg

@priyawadhwa priyawadhwa Awaiting requested review from priyawadhwa

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/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.

Potential profile naming conflict with multi-node cluster.
6 participants
@daehyeok @k8s-ci-robot @minikube-bot @medyagh @sharifelgamal @priyawadhwa