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

cri-dockerd: add restart of docker.service #9205

Merged
merged 2 commits into from
Aug 24, 2022
Merged

cri-dockerd: add restart of docker.service #9205

merged 2 commits into from
Aug 24, 2022

Conversation

krystianmlynek
Copy link
Contributor

@krystianmlynek krystianmlynek commented Aug 22, 2022 •
edited by floryut
Loading

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug

/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
With this change docker will be restarted which will allow docker to pick up proxy/registry mirrors settings.
Which issue(s) this PR fixes:

Fixes #9142

Special notes for your reviewer:
Clone of PR #9174 since I got tired of trying to fix CI/merge conflicts
Does this PR introduce a user-facing change?:

[Docker] Add restart of docker.service during install

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 22, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @krystianmlynek. 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 added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 22, 2022
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 22, 2022
@cristicalin
Copy link
Contributor

#9201 should have addressed this problem already, did you try the latest master and experienced the same issue?

@krystianmlynek
Copy link
Contributor Author

#9201 should have addressed this problem already, did you try the latest master and experienced the same issue?

It fixes only kubelet failure after reboot, so I'll remove enabling of cri-dockerd.socket from this PR. It does not fix the issue with docker settings. I explained background of the issue here: #9174 (comment)

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 23, 2022
@cristicalin
Copy link
Contributor

Thanks for the explanation @krystianmlynek

/approve
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 24, 2022
floryut
floryut approved these changes Aug 24, 2022
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/lgtm
Thanks for the explanation in the other PR

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, floryut, krystianmlynek

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:
  • OWNERS [cristicalin,floryut]

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 merged commit 64daaf1 into kubernetes-sigs:master Aug 24, 2022
TinLe added a commit to TinLe/kubespray that referenced this pull request Aug 27, 2022
@TinLe
Merge remote-tracking branch 'upstream/master'
3fa0d59 
* upstream/master: (832 commits)
  add pre-commit hook to facilitate local testing (kubernetes-sigs#9158)
  cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
  do not run etcd role in scale.yml playbook when etcd installed by kubeadm (kubernetes-sigs#9210)
  optimize the format of evictionHard in kubelet-config.yaml template (kubernetes-sigs#9204)
  Update vars.md (kubernetes-sigs#9172)
  fix one bug in docs/nodes (kubernetes-sigs#9203)
  Fix containerd (<1.7) configuration for insecure registries (kubernetes-sigs#9207)
  🌱 Enable cri-dockerd service (kubernetes-sigs#9201)
  Update vsphere-csi.md (kubernetes-sigs#9170)
  9035: Make Cilium rolling-restart delay/timeout configurable (kubernetes-sigs#9176)
  [kubernetes] Add hashes for 1.24.4, 1.22.13, 1.23.10 and make v1.24.4 default (kubernetes-sigs#9191)
  Add 'avoid-buggy-ips' support of MetalLB (kubernetes-sigs#9166)
  Add the option to enable default Pod Security Configuration (kubernetes-sigs#9017)
  Add 'flush ip6tables' task in reset role (kubernetes-sigs#9168)
  add list nodes rules to cilium-operator clusterrole (kubernetes-sigs#9178)
  docs(kube-vip): fix broken links (kubernetes-sigs#9165)
  Disable DNSStubListener for Flatcar Linux (kubernetes-sigs#9160)
  Subnet setup order fix & Number of master nodes syntax fix (kubernetes-sigs#9159)
  Fix CSI drivers issues on Azure (kubernetes-sigs#9153)
  [calico] calico rr supports multiple groups (kubernetes-sigs#9134)
  ...
unai-ttxu pushed a commit to Stratio/kubespray that referenced this pull request Aug 29, 2022
@krystianmlynek @unai-ttxu
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
5a33d10 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
alegrey91 pushed a commit to alegrey91/kubespray that referenced this pull request Aug 29, 2022
@krystianmlynek @alegrey91
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
b410afe 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
unai-ttxu pushed a commit to Stratio/kubespray that referenced this pull request Aug 30, 2022
@krystianmlynek @unai-ttxu
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
37734a6 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
rptaylor pushed a commit to rptaylor/kubespray that referenced this pull request Aug 30, 2022
@krystianmlynek @rptaylor
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
549565b 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
unai-ttxu pushed a commit to unai-ttxu/kubespray that referenced this pull request Sep 1, 2022
@krystianmlynek @unai-ttxu
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
a5b28a7 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
@floryut floryut mentioned this pull request Sep 19, 2022
Closed
nolimitkun pushed a commit to nolimitkun/kubespray that referenced this pull request Mar 19, 2023
@krystianmlynek @nolimitkun
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
bee3b4e 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jul 7, 2023
@krystianmlynek @LuckySB
cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
5060d59 
* cri-dockerd: add restart of docker.service

* remove enabling of cri-dockerd.socket
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@EppO EppO Awaiting requested review from EppO

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@floryut floryut

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

Docker/CRI-Dockerd does not pick up proxy/registry mirrors
4 participants
@krystianmlynek @k8s-ci-robot @cristicalin @floryut