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
1932b48d
Commit
1932b48d
authored
Aug 10, 2015
by
Dawn Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore the logic of disable docker upgrade through salt for gce.
Currently it is commented out.
parent
3901b225
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
init.sls
cluster/saltbase/salt/docker/init.sls
+12
-0
No files found.
cluster/saltbase/salt/docker/init.sls
View file @
1932b48d
...
@@ -103,7 +103,19 @@ net.ipv4.ip_forward:
...
@@ -103,7 +103,19 @@ net.ipv4.ip_forward:
{% set override_deb_sha1='81abef31dd2c616883a61f85bfb294d743b1c889' %}
{% set override_deb_sha1='81abef31dd2c616883a61f85bfb294d743b1c889' %}
{% set override_docker_ver='1.7.1' %}
{% set override_docker_ver='1.7.1' %}
# Comment out below logic for master branch, so that we can upgrade GCE cluster
# to docker 1.7.1 by default.
#
# TODO(dchen1107): For release 1.1, we want to fall back to
# ContainerVM installed docker by set override_deb, override_deb_sha1 and
# override_docker_ver back to '' for gce cloud provider.
{% if override_docker_ver != '' %}
{% if override_docker_ver != '' %}
purge-old-docker-package:
pkg.removed:
- pkgs:
- lxc-docker-1.6.2
/var/cache/docker-install/{{ override_deb }}:
/var/cache/docker-install/{{ override_deb }}:
file.managed:
file.managed:
- source: {{ storage_base }}{{ override_deb }}
- source: {{ storage_base }}{{ override_deb }}
...
...
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