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

Automated cherry pick of #9465: Update the service manifest for Docker #9484

Conversation

hakman
Copy link
Member

@hakman hakman commented Jul 3, 2020

Cherry pick of #9465 on release-1.18.

#9465: Update the service manifest for Docker

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jul 3, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 3, 2020
@hakman hakman changed the title Automated cherry pick of #9465: Add cgroup related deps Automated cherry pick of #9465: Update the service manifest for Docker Jul 3, 2020
@hakman
Copy link
Member Author

hakman commented Jul 3, 2020

/assign @rifelpet

@johngmyers
Copy link
Member

Does this really need to get into 1.18? It's a fairly big set of changes.

@hakman
Copy link
Member Author

hakman commented Jul 3, 2020

@johngmyers Except for the vendoring of github.com/blang/semver/v4, this change is pretty small and limited to Docker manifest rendering.
Some of it is needed. If there are concerns, I can strip a large part of it.

@hakman hakman force-pushed the automated-cherry-pick-of-#9465-upstream-release-1.18 branch from 499420f to ec17ea1 Compare July 3, 2020 03:38
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 3, 2020
@hakman
Copy link
Member Author

hakman commented Jul 3, 2020

I think that should do it @johngmyers .

@hakman
Copy link
Member Author

hakman commented Jul 3, 2020

/retest

@johngmyers
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 3, 2020
@rifelpet
Copy link
Member

rifelpet commented Jul 3, 2020

can you explain why the semver vendoring wasn't needed? that was to conditionally add containerd as a dependency in the mainfest right? doesn't 1.18 support containerd?

@hakman
Copy link
Member Author

hakman commented Jul 3, 2020

can you explain why the semver vendoring wasn't needed? that was to conditionally add containerd as a dependency in the mainfest right? doesn't 1.18 support containerd?

You are correct. The docker - containerd service dependency is nice to have, but not mandatory. Services will be started independently, but they sync without much trouble.

@rifelpet
Copy link
Member

rifelpet commented Jul 3, 2020

👍
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, rifelpet

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 Jul 3, 2020
@hakman
Copy link
Member Author

hakman commented Jul 3, 2020

Thanks @rifelpet :)

@k8s-ci-robot k8s-ci-robot merged commit 64c9b98 into kubernetes:release-1.18 Jul 3, 2020
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/api area/nodeup 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. 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.

4 participants