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

prevent installation of docker from upstream #44681

Merged
merged 1 commit into from Apr 20, 2017

Conversation

Projects
None yet
7 participants
@wwwtyro
Contributor

wwwtyro commented Apr 19, 2017

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-reviewable

This comment has been minimized.

Show comment
Hide comment
@k8s-reviewable

k8s-reviewable Apr 19, 2017

This change is Reviewable

k8s-reviewable commented Apr 19, 2017

This change is Reviewable

@k8s-ci-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-ci-robot

k8s-ci-robot Apr 19, 2017

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.

Contributor

k8s-ci-robot commented Apr 19, 2017

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.

@marcoceppi

This comment has been minimized.

Show comment
Hide comment
@marcoceppi

marcoceppi Apr 19, 2017

Member

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

Member

marcoceppi commented Apr 19, 2017

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

@marcoceppi

This comment has been minimized.

Show comment
Hide comment
@marcoceppi

marcoceppi Apr 20, 2017

Member

/approve

Member

marcoceppi commented Apr 20, 2017

/approve

@lazypower

This comment has been minimized.

Show comment
Hide comment
@lazypower

lazypower Apr 20, 2017

Member

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

Member

lazypower commented Apr 20, 2017

/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

This comment has been minimized.

Show comment
Hide comment
@lazypower

lazypower Apr 20, 2017

Member

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

/approve

Member

lazypower commented Apr 20, 2017

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

/approve

@lazypower

This comment has been minimized.

Show comment
Hide comment
@lazypower

lazypower Apr 20, 2017

Member

/lgtm

Member

lazypower commented Apr 20, 2017

/lgtm

@k8s-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Apr 20, 2017

Contributor

[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

Contributor

k8s-merge-robot commented Apr 20, 2017

[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-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Apr 20, 2017

Contributor

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

Contributor

k8s-merge-robot commented Apr 20, 2017

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

@k8s-merge-robot k8s-merge-robot merged commit 5cbe7b6 into kubernetes:master Apr 20, 2017

13 of 14 checks passed

code-review/reviewable 2 files left
Details
Jenkins Bazel Build Job succeeded.
Details
Jenkins GCE Node e2e Jenkins job succeeded.
Details
Jenkins GCE e2e Jenkins job succeeded.
Details
Jenkins GCE etcd3 e2e Jenkins job succeeded.
Details
Jenkins GCI GCE e2e Jenkins job succeeded.
Details
Jenkins Kubemark GCE e2e Jenkins job succeeded.
Details
Jenkins kops AWS e2e Jenkins job succeeded.
Details
Jenkins non-CRI GCE Node e2e Jenkins job succeeded.
Details
Jenkins non-CRI GCE e2e Jenkins job succeeded.
Details
Jenkins unit/integration Jenkins job succeeded.
Details
Jenkins verification Jenkins job succeeded.
Details
Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation wwwtyro authorized
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment