Skip to content

K
k3s
Commit 8b05b158 authored by Phillip Wittrock's avatar Phillip Wittrock
Browse files
Options

Merge pull request #21514 from zmerlynn/container-v1-2-v20160218

Bump container-vm in 1.2 to container-v1-2-v20160218
parents d792e55e 7f94e3ec
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
cluster/gce/config-default.sh
View file @ 8b05b158
...@@ -31,7 +31,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} ...@@ -31,7 +31,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160217} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
......
cluster/gce/config-test.sh
View file @ 8b05b158
...@@ -32,7 +32,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} ...@@ -32,7 +32,7 @@ PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian} OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-vm-v20160217} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-container-v1-2-v20160218}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"${MASTER_IMAGE}"}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-"${MASTER_IMAGE_PROJECT}"}
......
cluster/saltbase/salt/docker/init.sls
View file @ 8b05b158
...@@ -203,10 +203,10 @@ net.ipv4.ip_forward: ...@@ -203,10 +203,10 @@ net.ipv4.ip_forward:
{% 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.9.1-0~wheezy_amd64.deb' %} {% set override_deb='' %}
{% set override_deb_sha1='d682e2f0545e21f2d7309c2d87826aa566cc4af0' %} {% set override_deb_sha1='' %}
{% set override_docker_ver='1.9.1' %} {% set override_docker_ver='' %}
# Ubuntu presents as os_family=Debian, osfullname=Ubuntu # Ubuntu presents as os_family=Debian, osfullname=Ubuntu
{% elif grains.get('cloud', '') == 'aws' {% elif grains.get('cloud', '') == 'aws'
and grains.get('os_family', '') == 'Debian' and grains.get('os_family', '') == 'Debian'
......
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