mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #33194 from dchen1107/master
Automatic merge from submit-queue Update the containervm image to the latest one (container-v1-3-v20160… Node e2e is running with old containervm image which only has docker 1.9.1. This pr fixed such issue.
This commit is contained in:
commit
03c698ce44
@ -40,7 +40,8 @@ MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gc
|
|||||||
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
|
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
|
||||||
# By default a cluster will be started with the master on GCI and nodes on
|
# By default a cluster will be started with the master on GCI and nodes on
|
||||||
# containervm. If you are updating the containervm version, update this
|
# containervm. If you are updating the containervm version, update this
|
||||||
# variable.
|
# variable. Also please update corresponding image for node e2e at:
|
||||||
|
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
|
||||||
CVM_VERSION=container-v1-3-v20160604
|
CVM_VERSION=container-v1-3-v20160604
|
||||||
GCI_VERSION="gci-dev-55-8820-0-0"
|
GCI_VERSION="gci-dev-55-8820-0-0"
|
||||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
||||||
|
@ -41,7 +41,8 @@ MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gc
|
|||||||
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
|
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
|
||||||
# By default a cluster will be started with the master on GCI and nodes on
|
# By default a cluster will be started with the master on GCI and nodes on
|
||||||
# containervm. If you are updating the containervm version, update this
|
# containervm. If you are updating the containervm version, update this
|
||||||
# variable.
|
# variable. Also please update corresponding image for node e2e at:
|
||||||
|
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
|
||||||
CVM_VERSION=container-v1-3-v20160604
|
CVM_VERSION=container-v1-3-v20160604
|
||||||
GCI_VERSION="gci-dev-55-8820-0-0"
|
GCI_VERSION="gci-dev-55-8820-0-0"
|
||||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
|
||||||
|
@ -13,7 +13,7 @@ images:
|
|||||||
project: coreos-cloud
|
project: coreos-cloud
|
||||||
metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
|
metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
|
||||||
containervm:
|
containervm:
|
||||||
image: e2e-node-containervm-v20160321-image
|
image: e2e-node-containervm-v20160604-image
|
||||||
project: kubernetes-node-e2e-images
|
project: kubernetes-node-e2e-images
|
||||||
gci-family:
|
gci-family:
|
||||||
image_regex: gci-dev-55-8820-0-0
|
image_regex: gci-dev-55-8820-0-0
|
||||||
|
Loading…
Reference in New Issue
Block a user