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

prevent installation of docker from upstream #44681

Merged
merged 1 commit into from
Apr 20, 2017
Merged

prevent installation of docker from upstream #44681

merged 1 commit into from
Apr 20, 2017

Conversation

wwwtyro
Copy link
Contributor

@wwwtyro wwwtyro commented Apr 19, 2017 •
edited
Loading

What this PR does / why we need it: Disallows installation of upstream docker from PPA in the Juju kubernetes-worker charm.

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

Special notes for your reviewer:

Release note:

Disallows installation of upstream docker from PPA in the Juju kubernetes-worker charm.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 19, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

Hi @wwwtyro. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should 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 by org members will still work. Regular contributors should join the org to skip this step.

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 added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 19, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 19, 2017
@marcoceppi
Copy link
Contributor

Could you include release notes or signal that there are none?

@k8s-github-robot k8s-github-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 19, 2017
@marcoceppi
Copy link
Contributor

/approve

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2017
@lazypower
Copy link
Contributor

/unapprove

This PR only handles half of the situation. It does remove the config flag for fresh deployments, but we also need to consider the upgrading users scenario where if they have enabled this, we're heading them down a sad path.

I feel like this shoudl also include some removal code to revert the daemon installation to archive at this juncture so we dont have users upgrading into a broken state.

@lazypower
Copy link
Contributor

Thats a clever way to solve the problem. +1 to this, make layer-docker do the heavy lifting on upgrade.

/approve

@lazypower
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckbutler, marcoceppi, wwwtyro

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-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 44722, 44704, 44681, 44494, 39732)

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

@lazypower lazypower

@j3ffml j3ffml

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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.
7 participants
@wwwtyro @k8s-reviewable @k8s-ci-robot @marcoceppi @lazypower @k8s-github-robot @j3ffml