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

Only provide dockershim flags with docker below 1.24 #783

Merged
merged 1 commit into from
Jan 21, 2022
Merged

Only provide dockershim flags with docker below 1.24 #783

merged 1 commit into from
Jan 21, 2022

Conversation

jsturtevant
Copy link
Contributor

What this PR does / why we need it:

The removal of dockershim kubelet flags is causing kubelet to fail to start in the 1.24.alpha e2e tests:

https://testgrid.k8s.io/sig-windows-master-release#capz-windows-containerd-master

https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/ci-kubernetes-e2e-capz-master-containerd-windows/1484222566431199232

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

Additional context
Add any other context for the reviewers

/sig windows
/assign @perithompson

@k8s-ci-robot k8s-ci-robot added sig/windows Categorizes an issue or PR as relevant to SIG Windows. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 20, 2022
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2022
@jsturtevant
Copy link
Contributor Author

/cc @knabben

@k8s-ci-robot k8s-ci-robot requested a review from knabben January 20, 2022 20:06
@knabben
Copy link
Member

knabben commented Jan 20, 2022

Thanks! I will need to rebuild sig-windows-dev-tool box with this change. It will not run for ==1.24, failing kubeadm join from first StartKubelet.ps1 service install.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 20, 2022
@jsturtevant jsturtevant force-pushed the windows-dockershim-removal branch from 3ab4244 to 3c6c9d7 Compare January 20, 2022 20:35
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 20, 2022
@jsturtevant
Copy link
Contributor Author

OVA is a known failure and is not blocking.

I tested these changes in a capz cluster.

/assign @CecileRobertMichon @marosset

CecileRobertMichon
CecileRobertMichon reviewed Jan 21, 2022
View reviewed changes
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/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 Jan 21, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, jsturtevant

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

@jsturtevant
Copy link
Contributor Author

failure was #766

/retest

@jsturtevant jsturtevant mentioned this pull request Jan 21, 2022
Merged
3 tasks
@jsturtevant
Copy link
Contributor Author

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jan 21, 2022 •
edited
Loading

@jsturtevant: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-ova-all 3c6c9d7 link false /test pull-ova-all

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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 merged commit 08e2c63 into kubernetes-sigs:master Jan 21, 2022
ionutbalutoiu pushed a commit to e2e-win/k8s-e2e-runner that referenced this pull request Jan 25, 2022
Add temp kubelet fix
33b5f60 
The K8s master jobs with containerd fail due to some kubelet flags
being completely removed.

This was fixed in the image-builder via:
kubernetes-sigs/image-builder#783

This temporary fix will be removed once new images are released
with the image-builder fix included.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@justinsb justinsb Awaiting requested review from justinsb

@moshloop moshloop Awaiting requested review from moshloop

@knabben knabben Awaiting requested review from knabben

Assignees

@knabben knabben

@CecileRobertMichon CecileRobertMichon

@perithompson perithompson

@marosset marosset

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. sig/windows Categorizes an issue or PR as relevant to SIG Windows. 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.
6 participants
@jsturtevant @knabben @k8s-ci-robot @CecileRobertMichon @perithompson @marosset