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

kubeadm: simply struct of joinOptions by removing joinControlPlane #113320

Merged
merged 1 commit into from Nov 1, 2022
Merged

kubeadm: simply struct of joinOptions by removing joinControlPlane #113320

merged 1 commit into from Nov 1, 2022

Conversation

chendave
Copy link
Member

Signed-off-by: Dave Chen dave.chen@arm.com

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 25, 2022
@k8s-ci-robot
Copy link
Contributor

@chendave: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 25, 2022
neolit123
neolit123 reviewed Oct 25, 2022
View reviewed changes
cmd/kubeadm/app/cmd/join_test.go
"testing"

"k8s.io/apimachinery/pkg/util/sets"

"k8s.io/klog/v2"
Copy link
Member

Choose a reason for hiding this comment

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

should be under the apimachinery line above and have empty line below it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

neolit123
neolit123 reviewed Oct 25, 2022
View reviewed changes
cmd/kubeadm/app/cmd/join_test.go Outdated
msg := "WARNING: --control-plane is also required when passing control-plane"
if tc.expectWarn {
if !strings.Contains(buffer.String(), msg) {
t.Errorf("Haven't detected the warning message, expected: %v, acutal: %v", msg, buffer.String())
Copy link
Member

Choose a reason for hiding this comment

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

typo in actual

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

neolit123
neolit123 reviewed Oct 25, 2022
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment •
edited

Choose a reason for hiding this comment

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

so this SGTM but would expect another reviewer to double check. hopefully we are not breaking anything.

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 25, 2022
neolit123
neolit123 reviewed Oct 25, 2022
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 25, 2022
@chendave
kubeadm: simply struct of joinOptions by removing joinControlPlane
d4fd5b7 
Signed-off-by: Dave Chen <dave.chen@arm.com>
@chendave
Copy link
Member Author

/test pull-kubernetes-unit

@chendave
Copy link
Member Author

/cc @pacoxu @SataQiu could any of you have a double review? thanks in the advance!

pacoxu
pacoxu approved these changes Nov 1, 2022
View reviewed changes
Copy link
Member

@pacoxu pacoxu left a comment •
edited

Choose a reason for hiding this comment

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

/lgtm

cfg.ControlPlane.CertificateKey, is similar to cfg.NodeRegistration.Name that does not needs another joinControlPlane in joinOptions.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 1, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chendave, neolit123, pacoxu

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

@chendave
Copy link
Member Author

chendave commented Nov 1, 2022

assume it's fine to lift the hold label now. :)

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 1, 2022
@chendave
Copy link
Member Author

chendave commented Nov 1, 2022

irrelevant flaky

/test pull-kubernetes-integration

@k8s-ci-robot k8s-ci-robot merged commit 22f3e64 into kubernetes:master Nov 1, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.26 milestone Nov 1, 2022
@chendave chendave deleted the test branch November 1, 2022 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@pacoxu pacoxu pacoxu approved these changes

@SataQiu SataQiu Awaiting requested review from SataQiu

Assignees

@pacoxu pacoxu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.26
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@chendave @k8s-ci-robot @neolit123 @pacoxu