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

Update to latest cadvisor - cleanup mesos/rkt #76291

Merged
merged 2 commits into from Apr 12, 2019
Merged

Update to latest cadvisor - cleanup mesos/rkt #76291

merged 2 commits into from Apr 12, 2019

Conversation

dims
Copy link
Member

@dims dims commented Apr 8, 2019 •
edited by tallclair

Change-Id: I2aa91b4dd1f421fdf72623e5dc94d4f304d9b76b

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

Mainly to bring in the code from the following PRs:

This cleans up rkt/mesos and their dependencies

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 8, 2019
@k8s-ci-robot k8s-ci-robot requested review from cheftako, dchen1107 and a team April 8, 2019 21:07
@k8s-ci-robot k8s-ci-robot added area/apiserver area/code-generation area/dependency Issues or PRs related to dependency changes area/kubelet sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. 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 Apr 8, 2019
@dims
Copy link
Member Author

dims commented Apr 8, 2019

/sig node
/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 8, 2019
@dims dims force-pushed the update-to-latest-cadvisor-remove-mesos-rkt branch from 21c3968 to c2ceccb Compare April 8, 2019 21:18
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 8, 2019
@liggitt liggitt mentioned this pull request Apr 8, 2019
Closed
@dims dims force-pushed the update-to-latest-cadvisor-remove-mesos-rkt branch from c2ceccb to bd62e8e Compare April 9, 2019 14:39
@dims dims changed the title [WIP] Update to latest cadvisor - cleanup mesos/rkt Update to latest cadvisor - cleanup mesos/rkt Apr 9, 2019
liggitt
liggitt reviewed Apr 9, 2019
View reviewed changes
pkg/kubelet/cadvisor/cadvisor_linux.go Outdated
@@ -89,7 +103,7 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, usingLegacySt
// collect metrics for all cgroups
rawContainerCgroupPathPrefixWhiteList := []string{"/"}
// Create and start the cAdvisor container manager.
m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, maxHousekeepingInterval, allowDynamicHousekeeping, includedMetrics, http.DefaultClient, rawContainerCgroupPathPrefixWhiteList)
m, err := newCadvisor(memory.New(statsCacheDuration, nil), sysFs, maxHousekeepingInterval, allowDynamicHousekeeping, includedMetrics, http.DefaultClient, rawContainerCgroupPathPrefixWhiteList)
Copy link
Member

Choose a reason for hiding this comment

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

talked with @dims about an approach that would avoid needing to change this signature and keep us (and all callers) from having to copy out initialization code

will open a PR to cadvisor and sync up there

Copy link
Member

Choose a reason for hiding this comment

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

opened google/cadvisor#2217, keeping all the collector initialization contained to manager.New() ... testing with CI in #76355

@liggitt
Copy link
Member

liggitt commented Apr 9, 2019 •
edited

/hold

per #76291 (comment)

@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 Apr 9, 2019
@dims
Copy link
Member Author

dims commented Apr 9, 2019

Thanks @liggitt

@liggitt liggitt mentioned this pull request Apr 10, 2019
Closed
@dims dims force-pushed the update-to-latest-cadvisor-remove-mesos-rkt branch from 694047f to 41eb2ea Compare April 11, 2019 17:42
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 11, 2019
@dims dims force-pushed the update-to-latest-cadvisor-remove-mesos-rkt branch from 41eb2ea to 94f3e46 Compare April 11, 2019 17:57
@dims
Update to latest cadvisor - cleanup mesos/rkt
70d562a 
Change-Id: Ib5ae0cb13b93f8c87bb74e3ba33040df5f3d6a6f
@dims dims force-pushed the update-to-latest-cadvisor-remove-mesos-rkt branch from 94f3e46 to 6993654 Compare April 11, 2019 18:52
@dims
Adjust our use of cadvisor to pull in just runtimes we need
1707144 
- We drop mesos and rkt support in cadvisor

Change-Id: Id4dcafdecc97802b2def95a572e67842e7507f7b
@dims dims force-pushed the update-to-latest-cadvisor-remove-mesos-rkt branch from 6993654 to 1707144 Compare April 11, 2019 19:00
@dims
Copy link
Member Author

dims commented Apr 11, 2019

/test pull-kubernetes-dependencies

@fedebongio
Copy link
Contributor

/remove-sig api-machinery

@k8s-ci-robot k8s-ci-robot removed the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Apr 11, 2019
@liggitt
Copy link
Member

liggitt commented Apr 11, 2019

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt

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 Apr 11, 2019
@liggitt
Copy link
Member

liggitt commented Apr 11, 2019

/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 Apr 11, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Apr 12, 2019 •
edited

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

Test name Commit Details Rerun command
pull-kubernetes-godeps 94f3e46ec9ade6f226bd1af79aa8960fbd23894c link /test pull-kubernetes-godeps

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.

@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.

@dims dims added the area/code-organization Issues or PRs related to kubernetes code organization label Apr 12, 2019
@k8s-ci-robot k8s-ci-robot merged commit 78f571d into kubernetes:master Apr 12, 2019
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Apr 22, 2019
@haircommander haircommander mentioned this pull request Dec 18, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@dashpole dashpole dashpole left review comments

@tallclair tallclair tallclair left review comments

@cblecker cblecker cblecker approved these changes

@cheftako cheftako Awaiting requested review from cheftako

@dchen1107 dchen1107 Awaiting requested review from dchen1107

Assignees

@liggitt liggitt

@cblecker cblecker

@dashpole dashpole

@derekwaynecarr derekwaynecarr

@tallclair tallclair

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/code-organization Issues or PRs related to kubernetes code organization area/dependency Issues or PRs related to dependency changes 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/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/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@dims @liggitt @tallclair @dashpole @fedebongio @k8s-ci-robot @fejta-bot @cblecker @derekwaynecarr