github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore the logic of disable docker upgrade through salt for gce. 

Currently it is commented out.
pull/6/head
Dawn Chen 2015-08-10 17:30:11 -07:00
parent 3901b225e3
commit 1932b48db3
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/saltbase/salt/docker/init.sls
View File

@ -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 }}