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

Automated cherry pick of #95655: Moving docker options to daemon.json #100157

Merged
merged 1 commit into from Apr 6, 2021
Merged

Automated cherry pick of #95655: Moving docker options to daemon.json #100157

merged 1 commit into from Apr 6, 2021

Conversation

vteratipally
Copy link
Contributor

Cherry pick of #95655 on release-1.20.

#95655: Moving docker options to daemon.json

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

@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Mar 12, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/provider/gcp Issues or PRs related to gcp provider sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 12, 2021
@vteratipally
Copy link
Contributor Author

/cc @SergeyKanzhelev

@vteratipally
Moving docker options to daemon.json
0796e6c 
As per the new docker guidelines about customizing the options
like adding registry-mirrors, moving the options to daemon.json
@SergeyKanzhelev
Copy link
Member

/lgtm

this cherry pick will be needed for scripts to work with COS 89. I don't think it is needed to backport to earlier versions as they are less likely to be updated to work on COS 89.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 14, 2021
@SergeyKanzhelev
Copy link
Member

/kind bug
/triage accepted
/priority backlog
/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 14, 2021
@SergeyKanzhelev SergeyKanzhelev moved this from Triage to Needs Approver in SIG Node PR Triage Mar 14, 2021
@SergeyKanzhelev
Copy link
Member

/assign @dchen1107

@dchen1107
Copy link
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, vteratipally

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 Mar 16, 2021
@SergeyKanzhelev
Copy link
Member

SergeyKanzhelev commented Mar 16, 2021 •
edited

@kubernetes/release-managers can you please approve this cherry-pick for 1.20. This will allow script to work with COS 89. We likely wouldn't need it for earlier versions. Thus no cherry-pick to 1.19 and below

@puerco
Copy link
Member

puerco commented Mar 16, 2021

/lgtm

@puerco puerco added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 16, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Mar 16, 2021
hasheddan
hasheddan reviewed Mar 16, 2021
View reviewed changes
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/hold we are past CP deadline

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 16, 2021
@SergeyKanzhelev
Copy link
Member

/hold we are past CP deadline

When was the CP deadline and when is the next wave of CP for 1.20?

@puerco
Copy link
Member

puerco commented Mar 16, 2021

Hey @SergeyKanzhelev my bad, I thought we could approve the cherry-pick based on the date it was filed, but as the leads pointed out to me, it has to be lgtm'ed and approved before the cherry-pick deadline (which was on March 12th). The criteria for inclusion are expressed on the patch release schedule where you can also find the dates for the upcoming releases.

We'll approve and merge the PR for the April releases.

Sorry about that :(

@SergeyKanzhelev
Copy link
Member

We'll approve and merge the PR for the April releases.

thanks!

@vteratipally
Copy link
Contributor Author

gentle reminder for the april release.

@vteratipally
Copy link
Contributor Author

/cc @samkunz

@k8s-ci-robot
Copy link
Contributor

@vteratipally: GitHub didn't allow me to request PR reviews from the following users: samkunz.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @samkunz

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.

@vteratipally
Copy link
Contributor Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 6, 2021
@vteratipally
Copy link
Contributor Author

/test pull-kubernetes-e2e-kind

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 7b6a5f6 into kubernetes:release-1.20 Apr 6, 2021
SIG Node PR Triage automation moved this from Needs Approver to Done Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hasheddan hasheddan hasheddan left review comments

@mml mml Awaiting requested review from mml

@roycaihw roycaihw Awaiting requested review from roycaihw

@SergeyKanzhelev SergeyKanzhelev Awaiting requested review from SergeyKanzhelev

Assignees

@puerco puerco

@dchen1107 dchen1107

@SergeyKanzhelev SergeyKanzhelev

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/gcp Issues or PRs related to gcp provider cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@vteratipally @SergeyKanzhelev @dchen1107 @k8s-ci-robot @puerco @fejta-bot @hasheddan