Merge pull request #2612 from jbeda/docker-upgrade

Upgrade Docker to 1.3.2

cluster/gce/config-test.sh

@@ -36,3 +36,6 @@ MINION_SCOPES="storage-ro,compute-rw"
 POLL_SLEEP_INTERVAL=3
 PORTAL_NET="10.0.0.0/16"
 MONITORING=false
+
+# When set to true, Docker Cache is enabled by default as part of the cluster bring up.
+ENABLE_DOCKER_REGISTRY_CACHE=true

cluster/saltbase/salt/docker/init.sls

@@ -44,6 +44,8 @@ purge-old-docker:
   pkg.removed:
     - pkgs:
       - lxc-docker-1.2.0
+      - lxc-docker-1.3.0
+      - lxc-docker-1.3.1
 
 {{ environment_file }}:
   file.managed:
@@ -70,9 +72,9 @@ purge-old-docker:
 # 7. Add the old version to purge-old-docker above.
 
 {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
-{% set deb='lxc-docker-1.3.0_1.3.0-20141016165047-c78088f_amd64.deb' %}
+{% set deb='lxc-docker-1.3.2_1.3.2_amd64.deb' %}
-{% set deb_hash='sha1=99c2135e4f1f469b771226c3846e0b6accb6056a' %}
+{% set deb_hash='sha1=e271afeba8156fda9c6e7527c21ae237974a8c51' %}
-{% set docker_ver='1.3.0' %}
+{% set docker_ver='1.3.2' %}
 
 /var/cache/docker-install/{{ deb }}:
   file.managed:
@@ -83,7 +85,7 @@ purge-old-docker:
     - mode: 644
     - makedirs: true
 
-# Drop the license file into /usr/share so that everyting is crystal clear.
+# Drop the license file into /usr/share so that everything is crystal clear.
 /usr/share/doc/docker/apache.txt:
   file.managed:
     - source: {{ storage_base }}apache2.txt

cluster/saltbase/salt/kube-apiserver/init.sls

@@ -47,7 +47,11 @@
     - user: kube-apiserver
     - group: kube-apiserver
     - mode: 400
-
+    - watch:
+      - user: kube-apiserver
+      - group: kube-apiserver
+    - watch_in:
+      - service: kube-apiserver
 {% endif %}
 {% endif %}
 

examples/guestbook/redis-slave-controller.json

@@ -20,8 +20,9 @@
       },
       "labels": {
         "name": "redisslave",
-         "uses": "redis-master",
+        "uses": "redis-master"
       }
-      }},
+    }
+  },
   "labels": {"name": "redisslave"}
 }