github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Bump container-vm in 1.2 to container-v1-2-v20160218
This commit is contained in:
Phillip Wittrock 2016-02-18 18:51:40 -08:00
commit 8b05b1585e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

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

2
cluster/gce/config-test.sh
View File

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

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

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