Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use cos-stable-59-9460-64-0 instead of cos-beta-59-9460-20-0. #47530

Merged
merged 1 commit into from Jun 17, 2017
Merged

Use cos-stable-59-9460-64-0 instead of cos-beta-59-9460-20-0. #47530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions cluster/gce/BUILD
View file
Open in desktop
Expand Up @@ -32,10 +32,7 @@ filegroup(

filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//cluster/gce/gci/nvidia-gpus:all-srcs",
],
srcs = [":package-srcs"],
tags = ["automanaged"],
)

Expand Down
4 changes: 1 addition & 3 deletions cluster/gce/config-default.sh
View file
Open in desktop
Expand Up @@ -68,9 +68,7 @@ fi
# 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=${CVM_VERSION:-container-vm-v20170214}
# NOTE: Update the kernel commit SHA in cluster/addons/nvidia-gpus/cos-installer-daemonset.yaml
# while updating the COS version here.
GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0}
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/config-test.sh
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ fi
# 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=${CVM_VERSION:-container-vm-v20170214}
GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0}
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
Expand Down
24 changes: 0 additions & 24 deletions cluster/gce/gci/nvidia-gpus/BUILD
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions cluster/gce/gci/nvidia-gpus/Dockerfile
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions cluster/gce/gci/nvidia-gpus/Makefile
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions cluster/gce/gci/nvidia-gpus/cos-installer-daemonset.yaml
View file
Open in desktop

This file was deleted.

207 changes: 0 additions & 207 deletions cluster/gce/gci/nvidia-gpus/installer.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cluster/kubemark/gce/config-default.sh
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}

MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-beta-59-9460-20-0}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-stable-59-9460-64-0}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}

NETWORK=${KUBE_GCE_NETWORK:-default}
Expand Down
3 changes: 1 addition & 2 deletions hack/generate-bindata.sh
View file
Open in desktop
Expand Up @@ -48,8 +48,7 @@ go-bindata -nometadata -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
"examples/..." \
"test/e2e/testing-manifests/..." \
"test/images/..." \
"test/fixtures/..." \
"cluster/gce/gci/nvidia-gpus/..."
"test/fixtures/..."

gofmt -s -w "${BINDATA_OUTPUT}.tmp"

Expand Down