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

Remove hacks added for mesos #56754

Merged
merged 1 commit into from
Dec 17, 2017
Merged

Remove hacks added for mesos #56754

merged 1 commit into from
Dec 17, 2017

Conversation

dims
Copy link
Member

@dims dims commented Dec 3, 2017 •
edited
Loading

What this PR does / why we need it:

Since Mesos is no longer in your main repository and since we have
things like dynamic kubelet configuration in progress, we should
drop these undocumented, untested, private hooks.

cmd/kubelet/app/server.go::CreateAPIServerClientConfig
CreateAPIServerClientConfig::getRuntime
pkg/kubelet/kubelet_pods.go::getPhase

Also remove stuff from Dependencies struct that were specific to
the Mesos integration (ContainerRuntimeOptions and Options)

Also remove stale references in test/e2e and and test owners file

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

Drop hacks used for Mesos integration that was already removed from main kubernetes repository

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 3, 2017
@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Dec 3, 2017
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 3, 2017
@dims dims force-pushed the remove-hacks-for-mesos branch from 84881b5 to 5926a6a Compare December 3, 2017 11:42
@dims
Copy link
Member Author

dims commented Dec 3, 2017

/test pull-kubernetes-e2e-gce

@dims
Remove hacks added for mesos
7568462 
Since Mesos is no longer in your main repository and since we have
things like dynamic kubelet configuration in progress, we should
drop these undocumented, untested, private hooks.

cmd/kubelet/app/server.go::CreateAPIServerClientConfig
CreateAPIServerClientConfig::getRuntime
pkg/kubelet/kubelet_pods.go::getPhase

Also remove stuff from Dependencies struct that were specific to
the Mesos integration (ContainerRuntimeOptions and Options)

Also remove stale references in test/e2e and and test owners file
@dims dims force-pushed the remove-hacks-for-mesos branch from 5926a6a to 7568462 Compare December 3, 2017 18:56
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Dec 3, 2017
@dims
Copy link
Member Author

dims commented Dec 3, 2017

/hold cancel

@dims dims changed the title [WIP] Remove hacks added for mesos Remove hacks added for mesos Dec 3, 2017
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 3, 2017
@dims
Copy link
Member Author

dims commented Dec 3, 2017

/test pull-kubernetes-unit

@dims
Copy link
Member Author

dims commented Dec 4, 2017

/assign @mtaufen

@ncdc
Copy link
Member

ncdc commented Dec 4, 2017

@smarterclayton @deads2k @liggitt @sttts are you using any of these funcs in origin that are no longer exported in this PR?

@liggitt
Copy link
Member

liggitt commented Dec 4, 2017

@smarterclayton @deads2k @liggitt @sttts are you using any of these funcs in origin that are no longer exported in this PR?

no

@mtaufen
Copy link
Contributor

mtaufen commented Dec 4, 2017

Other than mesos, what else uses pkg/kubelet/kubelet.go:Builder? I'd like to get rid of that if possible.

@dims
Copy link
Member Author

dims commented Dec 8, 2017

@mtaufen @ncdc @liggitt can we please merge this early for 1.10 so there's opportunity to spot any uses in the wild

Thanks,
Dims

@mtaufen
Copy link
Contributor

mtaufen commented Dec 8, 2017

SGTM

@ncdc
Copy link
Member

ncdc commented Dec 11, 2017

@dims wfm, although you'll likely only find out about issues if people update their vendored copy of kube against master after this merges. I'm not sure how likely that will be.

@dims
Copy link
Member Author

dims commented Dec 14, 2017

/assign @thockin @vishh

Can i get some approvals/lgtm please? ripping out code left over from mesos stuff and have consensus from @ncdc @mtaufen @liggitt

@thockin
Copy link
Member

thockin commented Dec 15, 2017

nice cleanup! Thanks.

/lgtm
/approve no-issue

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 15, 2017
@kubernetes kubernetes deleted a comment from k8s-github-robot Dec 15, 2017
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue requirement bypassed by: thockin

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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 Dec 15, 2017
@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.

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 57127, 57011, 56754, 56601, 56483). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 94327c5 into kubernetes:master Dec 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ncdc ncdc

@mtaufen mtaufen

@thockin thockin

@vishh vishh

@tallclair tallclair

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.
10 participants
@dims @ncdc @liggitt @mtaufen @thockin @k8s-ci-robot @fejta-bot @k8s-github-robot @vishh @tallclair