Skip to content

K
k3s
Commit 4b29260b authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Bump ContainerVM to container-vm-v20151103

parent c2487374
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
cluster/gce/config-default.sh
View file @ 4b29260b
...@@ -29,7 +29,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} ...@@ -29,7 +29,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"} MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
......
cluster/gce/config-test.sh
View file @ 4b29260b
...@@ -30,7 +30,7 @@ KUBE_APISERVER_REQUEST_TIMEOUT=300 ...@@ -30,7 +30,7 @@ KUBE_APISERVER_REQUEST_TIMEOUT=300
PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false} PREEMPTIBLE_MINION=${PREEMPTIBLE_MINION:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20150806} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20151103}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"} MINION_IMAGE=${KUBE_GCE_MINION_IMAGE:-"${MASTER_IMAGE}"}
MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"} MINION_IMAGE_PROJECT=${KUBE_GCE_MINION_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
......
cluster/saltbase/salt/docker/init.sls
View file @ 4b29260b
...@@ -99,16 +99,13 @@ net.ipv4.ip_forward: ...@@ -99,16 +99,13 @@ net.ipv4.ip_forward:
{% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %} {% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
# Only upgrade Docker to 1.8.3 for the containerVM image.
# TODO(dchen1107): For release 1.1, we want to update the ContainerVM image to
# include Docker 1.8.3 and comment out the upgrade below.
{% if grains.get('cloud', '') == 'gce' {% if grains.get('cloud', '') == 'gce'
and grains.get('os_family', '') == 'Debian' and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'wheezy' -%} and grains.get('oscodename', '') == 'wheezy' -%}
{% set docker_pkg_name='docker-engine' %} {% set docker_pkg_name='' %}
{% set override_deb='docker-engine_1.8.3-0~wheezy_amd64.deb' %} {% set override_deb='' %}
{% set override_deb_sha1='f812e1134e7375b29886a372a6e24d04e1ee33c9' %} {% set override_deb_sha1='' %}
{% set override_docker_ver='1.8.3-0~wheezy' %} {% set override_docker_ver='' %}
{% else %} {% else %}
{% set docker_pkg_name='lxc-docker-1.7.1' %} {% set docker_pkg_name='lxc-docker-1.7.1' %}
{% set override_docker_ver='1.7.1' %} {% set override_docker_ver='1.7.1' %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment