github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update COS version to m59

Browse Source 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan 2017-05-20 05:23:39 -07:00
parent 1e77594958
commit 86b5edb79a
8 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ fi
CVM_VERSION=${CVM_VERSION:-container-vm-v20170214} CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
# NOTE: Update the kernel commit SHA in cluster/addons/nvidia-gpus/cos-installer-daemonset.yaml # NOTE: Update the kernel commit SHA in cluster/addons/nvidia-gpus/cos-installer-daemonset.yaml
# while updating the COS version here. # while updating the COS version here.
GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2} GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

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

@ -67,7 +67,7 @@ fi
# variable. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
CVM_VERSION=${CVM_VERSION:-container-vm-v20170214} CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2} GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

39
cluster/gce/util.sh
View File

@ -38,27 +38,36 @@ else
fi fi
if [[ "${MASTER_OS_DISTRIBUTION}" == "gci" ]]; then if [[ "${MASTER_OS_DISTRIBUTION}" == "gci" ]]; then
# If the master image is not set, we use the latest GCI image. DEFAULT_GCI_PROJECT=google-containers
# Otherwise, we respect whatever is set by the user. if [[ "${GCI_VERSION}" == "cos"* ]]; then
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${GCI_VERSION}} DEFAULT_GCI_PROJECT=cos-cloud
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} fi
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-${DEFAULT_GCI_PROJECT}}
# If the master image is not set, we use the latest GCI image.
# Otherwise, we respect whatever is set by the user.
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${GCI_VERSION}}
elif [[ "${MASTER_OS_DISTRIBUTION}" == "debian" ]]; then elif [[ "${MASTER_OS_DISTRIBUTION}" == "debian" ]]; then
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${CVM_VERSION}} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${CVM_VERSION}}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
fi fi
# Sets node image based on the specified os distro. Currently this function only # Sets node image based on the specified os distro. Currently this function only
# supports gci and debian. # supports gci and debian.
function set-node-image() { function set-node-image() {
if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then
# If the node image is not set, we use the latest GCI image. DEFAULT_GCI_PROJECT=google-containers
# Otherwise, we respect whatever is set by the user. if [[ "${GCI_VERSION}" == "cos"* ]]; then
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}} DEFAULT_GCI_PROJECT=cos-cloud
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} fi
elif [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} # If the node image is not set, we use the latest GCI image.
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} # Otherwise, we respect whatever is set by the user.
fi NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${GCI_VERSION}}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-${DEFAULT_GCI_PROJECT}}
elif [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
fi
} }
set-node-image set-node-image

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

@ -36,7 +36,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian} NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-gci-stable-56-9000-84-2} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-beta-59-9460-20-0}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NETWORK=${KUBE_GCE_NETWORK:-default} NETWORK=${KUBE_GCE_NETWORK:-default}

6
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View File

@ -49,21 +49,21 @@ images:
tests: tests:
- 'resource tracking for 105 pods per node \[Benchmark\]' - 'resource tracking for 105 pods per node \[Benchmark\]'
gci-resource1: gci-resource1:
image: gci-stable-56-9000-84-2 image: cos-beta-59-9460-20-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 0 pods per node \[Benchmark\]' - 'resource tracking for 0 pods per node \[Benchmark\]'
gci-resource2: gci-resource2:
image: gci-stable-56-9000-84-2 image: cos-beta-59-9460-20-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests: tests:
- 'resource tracking for 35 pods per node \[Benchmark\]' - 'resource tracking for 35 pods per node \[Benchmark\]'
gci-resource3: gci-resource3:
image: gci-stable-56-9000-84-2 image: cos-beta-59-9460-20-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

4
test/e2e_node/jenkins/image-config-serial.yaml
View File

@ -23,8 +23,8 @@ images:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci: gci:
image_regex: gci-stable-56-9000-84-2 # docker 1.11.2 image_regex: cos-beta-59-9460-20-0 # docker 1.11.2
project: google-containers project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/gci-init-gpu.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init-gpu.yaml,gci-update-strategy=update_disabled"
resources: resources:
accelerators: accelerators:

2
test/e2e_node/jenkins/image-config.yaml
View File

@ -16,6 +16,6 @@ images:
image: e2e-node-containervm-v20161208-image # docker 1.11.2 image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci: gci:
image_regex: gci-stable-56-9000-84-2 # docker 1.11.2 image_regex: cos-beta-59-9460-20-0 # docker 1.11.2
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

9
test/kubemark/gce/util.sh
View File

@ -66,7 +66,14 @@ function create-master-instance-with-resources {
MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \ MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)') --project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
# Override the master image project to cos-cloud for COS images staring with `cos` string prefix.
DEFAULT_GCI_PROJECT=google-containers
if [[ "${GCI_VERSION}" == "cos"* ]]; then
DEFAULT_GCI_PROJECT=cos-cloud
fi
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-${DEFAULT_GCI_PROJECT}}
run-gcloud-compute-with-retries instances create "${MASTER_NAME}" \ run-gcloud-compute-with-retries instances create "${MASTER_NAME}" \
${GCLOUD_COMMON_ARGS} \ ${GCLOUD_COMMON_ARGS} \
--address "${MASTER_IP}" \ --address "${MASTER_IP}" \