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

Fix function comment to consistent with its name #73949

Merged
merged 1 commit into from
Feb 12, 2019
Merged

Fix function comment to consistent with its name #73949

merged 1 commit into from
Feb 12, 2019

Conversation

xichengliudui
Copy link
Contributor

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Fix function comment to consistent with its name

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@xichengliudui
Fix function comment to consistent with its name
5dd26ec 
update pull request

update pull request
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 12, 2019
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 12, 2019
@xichengliudui
Copy link
Contributor Author

/assign @yujuhong

@xichengliudui
Copy link
Contributor Author

/assign @mkumatag

mkumatag
mkumatag suggested changes Feb 12, 2019
View reviewed changes
pkg/kubelet/network/dns/dns.go Outdated
@@ -280,7 +280,7 @@ func getPodDNSType(pod *v1.Pod) (podDNSType, error) {
return podDNSCluster, fmt.Errorf(fmt.Sprintf("invalid DNSPolicy=%v", dnsPolicy))
}

// Merge DNS options. If duplicated, entries given by PodDNSConfigOption will
// mergeDNSOptions merge DNS options. If duplicated, entries given by PodDNSConfigOption will
Copy link
Member

Choose a reason for hiding this comment

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

s/merge/merges/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you very much. I have modified it, is that right?

Copy link
Member

Choose a reason for hiding this comment

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

👍

pkg/kubelet/pleg/generic.go Outdated
@@ -337,7 +337,7 @@ func (g *GenericPLEG) cacheEnabled() bool {
return g.cache != nil
}

// Preserve an older cached status' pod IP if the new status has no pod IP
// getPodIP preserve an older cached status' pod IP if the new status has no pod IP
Copy link
Member

Choose a reason for hiding this comment

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

s/preserve/preserves/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks!

@xichengliudui xichengliudui force-pushed the fixerrornote branch 2 times, most recently from 654a46c to 5dd26ec Compare February 12, 2019 09:16
@mkumatag
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 12, 2019
@xichengliudui
Copy link
Contributor Author

@mkumatag thanks.

@mkumatag
Copy link
Member

@mkumatag thanks.

@xichengliudui Now you need to chase the maintainers to get approved tag ;) all the best :)

@xichengliudui
Copy link
Contributor Author

/retest

1 similar comment
@xichengliudui
Copy link
Contributor Author

/retest

@yujuhong
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xichengliudui, yujuhong

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 12, 2019
neolit123
neolit123 reviewed Feb 12, 2019
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.

/kind cleanup
/priority backlog
/retest

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 12, 2019
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot
Copy link
Contributor

@xichengliudui: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-local-e2e-containerized 5dd26ec link /test pull-kubernetes-local-e2e-containerized

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.

@k8s-ci-robot k8s-ci-robot merged commit 727dd66 into kubernetes:master Feb 12, 2019
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

@mkumatag mkumatag mkumatag requested changes

@bowei bowei Awaiting requested review from bowei

@tallclair tallclair Awaiting requested review from tallclair

Assignees

@yujuhong yujuhong

@mkumatag mkumatag

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet 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. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@xichengliudui @mkumatag @yujuhong @k8s-ci-robot @fejta-bot @neolit123