Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1842922b
Commit
1842922b
authored
Oct 27, 2017
by
Yu-Ju Hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GCE: provide an option to disable docker's live-restore
parent
18402f6c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
config-default.sh
cluster/gce/config-default.sh
+5
-1
config-test.sh
cluster/gce/config-test.sh
+5
-0
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+6
-0
No files found.
cluster/gce/config-default.sh
View file @
1842922b
...
...
@@ -254,12 +254,16 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
ENABLE_IP_ALIASES"
fi
# 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
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
DISABLE_DOCKER_LIVE_RESTORE"
fi
# Override default GLBC image
if
[[
-n
"
${
GCE_GLBC_IMAGE
:-}
"
]]
;
then
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
GCE_GLBC_IMAGE"
...
...
cluster/gce/config-test.sh
View file @
1842922b
...
...
@@ -302,6 +302,11 @@ 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
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
DISABLE_DOCKER_LIVE_RESTORE"
fi
# Override default GLBC image
if
[[
-n
"
${
GCE_GLBC_IMAGE
:-}
"
]]
;
then
PROVIDER_VARS
=
"
${
PROVIDER_VARS
:-}
GCE_GLBC_IMAGE"
...
...
cluster/gce/gci/configure-helper.sh
View file @
1842922b
...
...
@@ -855,6 +855,12 @@ function assemble-docker-flags {
docker_opts+
=
" --log-opt=max-size=
${
DOCKER_LOG_MAX_SIZE
:-
10m
}
"
docker_opts+
=
" --log-opt=max-file=
${
DOCKER_LOG_MAX_FILE
:-
5
}
"
# Disable live-restore if the environment variable is set.
if
[[
"
${
DISABLE_DOCKER_LIVE_RESTORE
:-
false
}
"
==
"true"
]]
;
then
docker_opts+
=
" --live-restore=false"
fi
echo
"DOCKER_OPTS=
\"
${
docker_opts
}
${
EXTRA_DOCKER_OPTS
:-}
\"
"
>
/etc/default/docker
if
[[
"
${
use_net_plugin
}
"
==
"true"
]]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment