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.

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

Handle containerExec hooks when using containerd #11852

Merged
merged 2 commits into from Jun 24, 2021

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 24, 2021

Fixes: #11726

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 24, 2021
@hakman hakman force-pushed the hooks-containerd branch 2 times, most recently from 03a5ccb to 1918153 Compare June 24, 2021 03:58
@hakman hakman changed the title [WIP] Handle containerExec hooks when using containerd Handle containerExec hooks when using containerd Jun 24, 2021
@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 Jun 24, 2021
Copy link
Member

@olemarkus olemarkus left a comment

Choose a reason for hiding this comment

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

Is this one worth backporting? It looks like something that could (should already have) wreaked some havoc.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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 Jun 24, 2021
@k8s-ci-robot k8s-ci-robot merged commit 0e4d766 into kubernetes:master Jun 24, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jun 24, 2021
@hakman hakman deleted the hooks-containerd branch June 24, 2021 06:28
@hakman
Copy link
Member Author

hakman commented Jun 24, 2021

Is this one worth backporting? It looks like something that could (should already have) wreaked some havoc.

I don't think people migrate so fast to containerd and existing clusters have Docker hardcoded in cluster spec.
My feeling is that should at least be part of kOps 1.21 and that it is simple enough to be safe at this stage.

k8s-ci-robot added a commit that referenced this pull request Jun 24, 2021
…-upstream-release-1.21

Automated cherry pick of #11852: Handle containerExec hooks when using containerd
k8s-ci-robot added a commit that referenced this pull request Jun 24, 2021
…-upstream-release-1.20

Automated cherry pick of #11852: Handle containerExec hooks when using containerd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/office-hours lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The containerd runtime breaks execContainer hooks to install software on host/node machine.
3 participants