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 hard-coded dependance to docker.service in kubelet.service file #5917

Merged
merged 1 commit into from
Apr 9, 2020
Merged

Remove hard-coded dependance to docker.service in kubelet.service file #5917

merged 1 commit into from
Apr 9, 2020

Conversation

floryut
Copy link
Member

@floryut floryut commented Apr 9, 2020 •
edited
Loading

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
Remove dependance to docker when using other container runtime

Which issue(s) this PR fixes:
Fixes #5900

Special notes for your reviewer:
None

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 9, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @floryut. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /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.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot requested review from bozzo and holmsten April 9, 2020 07:31
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 9, 2020
@Miouge1 Miouge1 added this to the 2.13 milestone Apr 9, 2020
@floryut floryut changed the title [WIP] Remove hard-coded dependance to docker.service in kubelet.service file Remove hard-coded dependance to docker.service in kubelet.service file Apr 9, 2020
@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 Apr 9, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Apr 9, 2020

/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 9, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, Miouge1

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 9, 2020
@k8s-ci-robot k8s-ci-robot merged commit 473a8be into kubernetes-sigs:master Apr 9, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Apr 9, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
8b7dc1e 
* 'master' of https://github.com/kubernetes-sigs/kubespray: (21 commits)
  Remove hard-coded dependance to docker.service in kubelet.service file (kubernetes-sigs#5917)
  Update Calico to v3.13.2, Multus to v3.4.1. Add ConfigMap get permission to allow calico-node access to kubeadm config. (kubernetes-sigs#5912)
  Fix idempotence issue in bootstrap-os (kubernetes-sigs#5916)
  Terraform/OpenStack: Fix idempotency bug in module.network.openstack_networking_router_interface_v2.k8s[0] (kubernetes-sigs#5914)
  Add kubernetes 1.18.1 hashes (kubernetes-sigs#5915)
  Proxy fixes (kubernetes-sigs#5869)
  Remove 1.16.x flag for tf-ovh_coreos-calico (now 1.17 ready) (kubernetes-sigs#5853)
  Update docker RHEL/CentOS versions to the latest patch versions available. (kubernetes-sigs#5872)
  Fix conntrack for opensuse and docker support (kubernetes-sigs#5880)
  Add crictl 1.18.0 hashes for k8s 1.18 (kubernetes-sigs#5877)
  fix readonly flexvolume in fcos and coreos (kubernetes-sigs#5885)
  Fix scaling (kubernetes-sigs#5889)
  Fix chicken and egg problem with proxy_env not defined on the first … (kubernetes-sigs#5896)
  make explicit that doc is at kubespray.io (kubernetes-sigs#5878)
  add local-path-provosioner helper image def (kubernetes-sigs#5817)
  remove unused kubelet options (kubernetes-sigs#5903)
  Change docker.io repo to variable and upgrade alb image (kubernetes-sigs#5898)
  Replace latest tags for csi drivers (kubernetes-sigs#5899)
  CentOS 8 CI (kubernetes-sigs#5842)
  Bump requirements.txt versions / remove ansible_python_interpreter hack (kubernetes-sigs#5847)
  ...
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Apr 18, 2020
@floryut @LuckySB
Remove hard-coded dependance to docker.service in kubelet.service file (
69b8508 
kubernetes-sigs#5917)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bozzo bozzo Awaiting requested review from bozzo

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@Miouge1 Miouge1

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. 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
2.13
Development

Successfully merging this pull request may close these issues.

kubelet.service hard-coded dependence to docker.service
3 participants
@floryut @k8s-ci-robot @Miouge1