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

GCE: provide an option to disable docker's live-restore #55260

Merged
merged 2 commits into from
Nov 9, 2017
Merged

GCE: provide an option to disable docker's live-restore #55260

merged 2 commits into from
Nov 9, 2017

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented Nov 7, 2017 •
edited
Loading

What this PR does / why we need it:
Provide an option to disable docker's live-restore for COS/ubuntu images on GCE. Some newer COS images have live-restore enabled by default. This allows users to override the option if needed.

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

Special notes for your reviewer:

Release note:

GCE: provide an option to disable docker's live-restore on COS/ubuntu

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 7, 2017
yguo0905
yguo0905 reviewed Nov 7, 2017
View reviewed changes
Copy link
Contributor

@yguo0905 yguo0905 left a comment

Choose a reason for hiding this comment

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

The gci scripts are used by Ubuntu so we can update the release note to include Ubuntu as well.

cluster/gce/config-default.sh
# Enable GCE Alpha features.
if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} GCE_ALPHA_FEATURES"
fi

# Disable Docker live-restore.
if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

How about checking whether it's true/false so that DISABLE_DOCKER_LIVE_RESTORE=false will work as expected?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. See the latest commit.

@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 7, 2017

/test pull-kubernetes-unit

@yguo0905
Copy link
Contributor

yguo0905 commented Nov 7, 2017

LGTM. We can update the release note to include Ubuntu.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 7, 2017
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 7, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 7, 2017

LGTM. We can update the release note to include Ubuntu.

Sqaushed and done.

@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 7, 2017

/test pull-kubernetes-unit

@yguo0905
Copy link
Contributor

yguo0905 commented Nov 7, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 7, 2017
@abgworrall
Copy link
Contributor

Is there a way we can add a test that shows the env var works as expected ? Maybe tweak the existing e2e tests, so they set the flag, and then fail as expected ?

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 7, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 7, 2017

Is there a way we can add a test that shows the env var works as expected ? Maybe tweak the existing e2e tests, so they set the flag, and then fail as expected ?

I'm not aware of a way to set this env variable without creating a new job for a cluster e2e test. There is also no existing COS/ubuntu, docker-specific test that we can reuse. I think adding a new test job might be an overkill, so I added a log line to dump the docker configuration in the kubelet log for manual checkup. If a test is still preferred, we could set up a separate job.

@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 8, 2017

BTW, we would also need a test job with COS m61 image to actually confirm that this working as intended. I assume the GKE jobs would have that.

@yguo0905
Copy link
Contributor

yguo0905 commented Nov 8, 2017

BTW, we would also need a test job with COS m61 image to actually confirm that this working as intended. I assume the GKE jobs would have that.

The GKE jobs currently use m60, we'd need to update the image mapping with m61.

@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 8, 2017

/test pull-kubernetes-unit

@abgworrall
Copy link
Contributor

Yeah, I guess it would require a dedicated testjob, that could set the ENV and also specify the COS version. That does some overkill. Thanks for looking into it ... lgtm

@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 8, 2017

The GKE jobs currently use m60, we'd need to update the image mapping with m61.

Thanks for checking! These jobs should be used to qualify the images and track the images we roll out on GKE.

@dchen1107
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 Nov 8, 2017
@yujuhong yujuhong added this to the v1.8 milestone Nov 8, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 8, 2017

/test pull-kubernetes-unit

1 similar comment
@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 8, 2017

/test pull-kubernetes-unit

@yujuhong
Copy link
Contributor Author

yujuhong commented Nov 8, 2017

/approve no-issue

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, yguo0905, yujuhong

Associated issue requirement bypassed by: yujuhong

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2017
This was referenced Nov 8, 2017
Merged
Merged
Merged
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 54177, 55203, 55120, 55275, 55260). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 9c904d6 into kubernetes:master Nov 9, 2017
@jpbetz jpbetz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherrypick-candidate labels Nov 9, 2017
k8s-github-robot pushed a commit that referenced this pull request Nov 10, 2017
Merge pull request #55343 from yujuhong/automated-cherry-pick-of-#552…
2c0c09c 
…60-upstream-release-1.6

Automatic merge from submit-queue.

Automated cherry pick of #55260

Cherry pick of #55260 on release-1.6.

#55260: GCE: provide an option to disable docker's live-restore
k8s-github-robot pushed a commit that referenced this pull request Nov 11, 2017
Merge pull request #55341 from yujuhong/automated-cherry-pick-of-#552…
5bd7d59 
…60-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #55260

Cherry pick of #55260 on release-1.8.

#55260: GCE: provide an option to disable docker's live-restore
k8s-github-robot pushed a commit that referenced this pull request Nov 12, 2017
Merge pull request #55342 from yujuhong/automated-cherry-pick-of-#552…
08e0e03 
…60-upstream-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #55260

Cherry pick of #55260 on release-1.7.

#55260: GCE: provide an option to disable docker's live-restore
@cblecker cblecker mentioned this pull request Nov 14, 2017
Merged
@yguo0905 yguo0905 mentioned this pull request Nov 15, 2017
Merged
@yujuhong yujuhong deleted the no-live-restore branch January 26, 2018 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yguo0905 yguo0905 yguo0905 left review comments

Assignees

@dchen1107 dchen1107

@abgworrall abgworrall

@yguo0905 yguo0905

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.
7 participants
@yujuhong @yguo0905 @abgworrall @dchen1107 @k8s-github-robot @jpbetz @k8s-ci-robot