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

Limit the number of names per image reported in the node status #32914

Merged
merged 1 commit into from
Sep 19, 2016

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented Sep 16, 2016

Limit the number of names per image reported in the node status.

This fixes #32908

Limit the number of names per image reported in the node status

This change is Reviewable

@yujuhong yujuhong added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. labels Sep 16, 2016
@yujuhong
Copy link
Contributor Author

/cc @dchen1107

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 16, 2016
@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2016
@@ -501,8 +510,13 @@ func (kl *Kubelet) setNodeStatusImages(node *api.Node) {
}

for _, image := range containerImages {
names := append(image.RepoDigests, image.RepoTags...)
Copy link
Member

Choose a reason for hiding this comment

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

Why Digests and Tags? Are they both really legit names?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no actual "name" defined in docker images.. Digest is a content-addressable identifier which users can use to pull an image (which we also support in k8s), so it should be a legit "name" in our definition. I don't think there should be multiple digests per image (since it's sha256 hash based on the content), so I changed the order of the digests and tags to ensure that we always include the digest.

@lavalamp
Copy link
Member

thanks for the quick fix!

@yujuhong
Copy link
Contributor Author

@k8s-bot test this issue: #IGNORE

@yujuhong
Copy link
Contributor Author

@k8s-bot test this issue: #32770

1 similar comment
@yujuhong
Copy link
Contributor Author

yujuhong commented Sep 19, 2016

@k8s-bot test this issue: #32770

@k8s-bot
Copy link

k8s-bot commented Sep 19, 2016

GCE e2e build/test passed for commit 7ada991.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Sep 19, 2016

GCE e2e build/test passed for commit 7ada991.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 30ff1f4 into kubernetes:master Sep 19, 2016
@lavalamp lavalamp added this to the v1.4 milestone Sep 19, 2016
@lavalamp
Copy link
Member

@pwittrock this doesn't need to go into 1.4.0 but it would be good for it to end up in a 1.4.x.

@pwittrock
Copy link
Member

thx

@yujuhong yujuhong deleted the limit_names branch September 21, 2016 00:07
@jessfraz
Copy link
Contributor

jessfraz commented Oct 6, 2016

@yujuhong can you open the pull request to cherry-pick this into release-1.4, thanks!

@jessfraz jessfraz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 6, 2016
@yujuhong yujuhong added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 6, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 6, 2016
#33163-#33227-#33359-#33605-#33967-#33977-#34158-origin-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #32914 #33163 #33227 #33359 #33605 #33967 #33977 #34158 origin release 1.4

Cherry pick of #32914 #33163 #33227 #33359 #33605 #33967 #33977 #34158 on release-1.4.

#32914: Limit the number of names per image reported in the node
#33163: fix the appending bug
#33227: remove cpu limits for dns pod. The current limits are not
#33359: Fix goroutine leak in federation service controller
#33605: Add periodic ingress reconciliations.
#33967: scheduler: cache.delete deletes the pod from node specified
#33977: Heal the namespaceless ingresses in federation e2e.
#34158: Add missing argument to log message in federated ingress
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

k8s-github-robot pushed a commit that referenced this pull request Oct 7, 2016
…14-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #32914

Cherry pick of #32914 on release-1.4.

#32914: Limit the number of names per image reported in the node
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ck-of-#32914-kubernetes#33163-kubernetes#33227-kubernetes#33359-kubernetes#33605-kubernetes#33967-kubernetes#33977-kubernetes#34158-origin-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#32914 kubernetes#33163 kubernetes#33227 kubernetes#33359 kubernetes#33605 kubernetes#33967 kubernetes#33977 kubernetes#34158 origin release 1.4

Cherry pick of kubernetes#32914 kubernetes#33163 kubernetes#33227 kubernetes#33359 kubernetes#33605 kubernetes#33967 kubernetes#33977 kubernetes#34158 on release-1.4.

kubernetes#32914: Limit the number of names per image reported in the node
kubernetes#33163: fix the appending bug
kubernetes#33227: remove cpu limits for dns pod. The current limits are not
kubernetes#33359: Fix goroutine leak in federation service controller
kubernetes#33605: Add periodic ingress reconciliations.
kubernetes#33967: scheduler: cache.delete deletes the pod from node specified
kubernetes#33977: Heal the namespaceless ingresses in federation e2e.
kubernetes#34158: Add missing argument to log message in federated ingress
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ck-of-#32914-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#32914

Cherry pick of kubernetes#32914 on release-1.4.

kubernetes#32914: Limit the number of names per image reported in the node
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kubelet: Limit the number of names reported for an image
9 participants