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.

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

CRI: general grammar/spelling/consistency cleanup #36448

Merged
merged 1 commit into from
Nov 11, 2016

Conversation

jonboulle
Copy link
Contributor

@jonboulle jonboulle commented Nov 8, 2016

No semantic changes, but a lot of shuffling of docstrings to make things
more consistent. In particular, standardise on the zeroth-article (i.e.
prefer // Version to // The version) and ending all docstrings with
periods.

(This knowingly conflicts with #36446 and intentionally omits changing the
Annotations field - I'll rebase this or that respectively as necessary.)


This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

Can a kubernetes member verify that this patch is reasonable to test? If so, please reply with "@k8s-bot 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 will still work. Regular contributors should join the org to skip this step.

If you have questions or suggestions related to this bot's behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Nov 8, 2016
@yujuhong yujuhong added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Nov 8, 2016
@yujuhong yujuhong added this to the v1.5 milestone Nov 8, 2016
@yujuhong
Copy link
Contributor

yujuhong commented Nov 8, 2016

@k8s-bot ok to test

@yujuhong
Copy link
Contributor

yujuhong commented Nov 8, 2016

LGTM. Thanks for the cleanup!

@yujuhong
Copy link
Contributor

yujuhong commented Nov 8, 2016

@k8s-bot gci gke e2e test thi

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 9, 2016
@jonboulle jonboulle force-pushed the criclean branch 2 times, most recently from 857bc60 to 0dee0ee Compare November 9, 2016 06:21
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 9, 2016
repeated Mount mounts = 14;
}

message ContainerStatusResponse {
// The status of the container
// Status of the container>
Copy link
Member

Choose a reason for hiding this comment

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

nit: s/>/.

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! fixed

optional ContainerMetadata metadata = 3;
// The spec of the image
// Spec of the image
Copy link
Member

Choose a reason for hiding this comment

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

nit: add a . at the end.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

optional string container_id = 1;
// Timeout in seconds to stop the container
// Timeout, in seconds, to stop the container.
Copy link
Member

Choose a reason for hiding this comment

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

nit: remove ,

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's fine IMO and I expect this will be cleaned up when we address the TODO for what the timeout means

Copy link
Contributor

Choose a reason for hiding this comment

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

This is fine.

No semantic changes, but a lot of shuffling of docstrings to make things
more consistent. In particular, standardise on the zeroth-article (i.e.
prefer `// Version` to `// The version`) and ending all docstrings with
periods.
@jonboulle
Copy link
Contributor Author

@k8s-bot unit test this #36473 #36351

@@ -537,45 +538,45 @@ message ContainerConfig {
optional bool stdin_once = 13;
optional bool tty = 14;

// Linux contains configuration specific to Linux containers.
// Configuration specific to Linux containers.
Copy link
Member

Choose a reason for hiding this comment

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

maybe change this to Linux specific configuration (highlight linux instead of containers).

@@ -81,19 +82,19 @@ service ImageService {
}

message VersionRequest {
// The version of kubelet runtime API.
// Version of the kubelet runtime API.
Copy link
Member

Choose a reason for hiding this comment

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

nit: change kubelet runtime API to Container Runtime Interface for keeping consistent with other places (e.g. issues and PRs)

Copy link
Contributor

Choose a reason for hiding this comment

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

I think kubelet runtime API is unclear, but let's not block this PR which focuses on consistency cleanup.

Copy link
Member

Choose a reason for hiding this comment

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

LGTM.

@jonboulle will you draw a following PR for this?

optional string version = 1;
}

message VersionResponse {
// The version of the kubelet runtime API.
// Version of the kubelet runtime API.
Copy link
Member

Choose a reason for hiding this comment

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

Same here.

@jonboulle
Copy link
Contributor Author

@feiskyer re: your last three, I don't quite agree and I'd rather address them in a follow up since this is a pretty big diff as-is.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 857bc602e440b314f56088c96a4a5feeb5e6391c. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 9, 2016
@yujuhong
Copy link
Contributor

yujuhong commented Nov 9, 2016

This PR only changes comments; ok for post-freeze merge.

@saad-ali
Copy link
Member

saad-ali commented Nov 9, 2016

This PR only changes comments; ok for post-freeze merge.

Ack

@jonboulle
Copy link
Contributor Author

@yujuhong thank you :-)

@k8s-ci-robot
Copy link
Contributor

Jenkins unit/integration failed for commit 37150b6. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@jonboulle
Copy link
Contributor Author

@k8s-bot unit test this #36473

1 similar comment
@dims
Copy link
Member

dims commented Nov 11, 2016

@k8s-bot unit test this #36473

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 6ec0239 into kubernetes:master Nov 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants