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

add test for GetAPIServerVirtualIP #111596

Merged
merged 1 commit into from Aug 4, 2022
Merged

add test for GetAPIServerVirtualIP #111596

merged 1 commit into from Aug 4, 2022

Conversation

muyangren2
Copy link
Contributor

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Add UT

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 Aug 1, 2022
@k8s-ci-robot
Copy link
Contributor

@muyangren2: 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 the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Aug 1, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @muyangren2. 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. 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 Aug 1, 2022
yangjunmyfm192085
yangjunmyfm192085 reviewed Aug 1, 2022
View reviewed changes
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 left a comment

Choose a reason for hiding this comment

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

/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 Aug 1, 2022
@249043822
Copy link
Member

/assign @neolit123

neolit123
neolit123 reviewed Aug 2, 2022
View reviewed changes
cmd/kubeadm/app/constants/constants_test.go Outdated
if err == nil {
t.Errorf("failed APIServerVirtualIP:\n\texpected error, but got no error")
}
} else if !rt.expectedErr && err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

these branches can be

if (err != nil) != rt.expectedError {
...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have modified as you suggested, thank you for your review

neolit123
neolit123 reviewed Aug 2, 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.

/approve

code freeze for 1.25 is soon so not sure if this PR will make it.

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 2, 2022
yangjunmyfm192085
yangjunmyfm192085 reviewed Aug 2, 2022
View reviewed changes
Copy link
Contributor

@yangjunmyfm192085 yangjunmyfm192085 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 2, 2022
neolit123
neolit123 reviewed Aug 2, 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

i think you can simplify the branches more.

@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 Aug 2, 2022
neolit123
neolit123 reviewed Aug 2, 2022
View reviewed changes
cmd/kubeadm/app/constants/constants_test.go Outdated
t.Errorf("failed APIServerVirtualIP:\n\texpected error, but got no error")
}
} else if (err != nil) != rt.expectedErr {
t.Errorf("failed APIServerVirtualIP:\n\texpected no error, but got: %v", err)
Copy link
Member

Choose a reason for hiding this comment

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

just have one branch in case err does not match

"expected error x, got y"

249043822
249043822 suggested changes Aug 3, 2022
View reviewed changes
cmd/kubeadm/app/constants/constants_test.go Outdated
Comment on lines 332 to 338
if rt.expectedErr {
if err == nil {
t.Errorf("failed APIServerVirtualIP:\n\texpected error, but got no error")
}
} else if (err != nil) != rt.expectedErr {
t.Errorf("failed APIServerVirtualIP:\n\texpected no error, but got: %v", err)
} else {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if rt.expectedErr {
if err == nil {
t.Errorf("failed APIServerVirtualIP:\n\texpected error, but got no error")
}
} else if (err != nil) != rt.expectedErr {
t.Errorf("failed APIServerVirtualIP:\n\texpected no error, but got: %v", err)
} else {
if (err != nil) != rt.expectedErr {
t.Errorf("failed APIServerVirtualIP:\n\texpectedErr: %v, got: %v", rt.expectedErr, err)
} else {

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 3, 2022
aojea
aojea reviewed Aug 3, 2022
View reviewed changes
cmd/kubeadm/app/constants/constants_test.go

func TestGetAPIServerVirtualIP(t *testing.T) {
var tests = []struct {
name, svcSubnet, expectedIP string
Copy link
Member

Choose a reason for hiding this comment

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

Now I'm curious, what happens if you pass a subnet like?

"10.96.0.12/24", it should give 10.96.0.1, or it fails the subnet parsing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will get 10.96.0.1 ,i will add this case

@muyangren2
add test for GetAPIServerVirtualIP
4af5cc3 
modify

modify

modify

modify

modify
@aojea
Copy link
Member

aojea commented Aug 3, 2022

lgtm

@aojea
Copy link
Member

aojea commented Aug 4, 2022

/hold

i think you can simplify the branches more.

@neolit123 we have test freeze until Aug 10, this can still make it, is just adding tests

neolit123
neolit123 reviewed Aug 4, 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.

/approve
/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 Aug 4, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: muyangren2, neolit123

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

@aojea
Copy link
Member

aojea commented Aug 4, 2022

/assign @dims @BenTheElder
for milestone

@neolit123
Copy link
Member

/milestone v1.25

@aojea i think if you want milestone privs a number of people will +1 that 👍

@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Aug 4, 2022
@aojea
Copy link
Member

aojea commented Aug 4, 2022

@aojea i think if you want milestone privs a number of people will +1 that

didn't know about it, where should I request those privs, is a PR somewhere?

@aojea
Copy link
Member

aojea commented Aug 4, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 4, 2022
@neolit123
Copy link
Member

IIRC it was here
https://github.com/kubernetes/org/blob/67e83b2c3cf1a6e7a3d841a686315ced1cb5cef7/config/kubernetes/sig-release/teams.yaml#L17

@aojea
Copy link
Member

aojea commented Aug 4, 2022

IIRC it was here https://github.com/kubernetes/org/blob/67e83b2c3cf1a6e7a3d841a686315ced1cb5cef7/config/kubernetes/sig-release/teams.yaml#L17

PR sent

@k8s-ci-robot k8s-ci-robot merged commit e539bb5 into kubernetes:master Aug 4, 2022
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

@aojea aojea aojea left review comments

@yangjunmyfm192085 yangjunmyfm192085 yangjunmyfm192085 left review comments

@249043822 249043822 249043822 requested changes

@RA489 RA489 Awaiting requested review from RA489

@SataQiu SataQiu Awaiting requested review from SataQiu

Assignees

@dims dims

@neolit123 neolit123

@BenTheElder BenTheElder

@aojea aojea

@yangjunmyfm192085 yangjunmyfm192085

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.25
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@muyangren2 @k8s-ci-robot @249043822 @aojea @neolit123 @yangjunmyfm192085 @dims @BenTheElder