Skip to content

Commit 3a86c97

Browse files
Use cos-stable-59-9460-64-0 instead of cos-beta-59-9460-20-0.
- It contains a fix for ipaliasing. - It contains a fix which decouples GPU driver installation from kernel version. Remove dead code that has now moved to another repo as part of kubernetes#47467
1 parent dd9e822 commit 3a86c97

File tree

14 files changed

+10
-360
lines changed

14 files changed

+10
-360
lines changed

cluster/gce/BUILD

+1-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ filegroup(
3232

3333
filegroup(
3434
name = "all-srcs",
35-
srcs = [
36-
":package-srcs",
37-
"//cluster/gce/gci/nvidia-gpus:all-srcs",
38-
],
35+
srcs = [":package-srcs"],
3936
tags = ["automanaged"],
4037
)
4138

cluster/gce/config-default.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ fi
6868
# variable. Also please update corresponding image for node e2e at:
6969
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
7070
CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
71-
# NOTE: Update the kernel commit SHA in cluster/addons/nvidia-gpus/cos-installer-daemonset.yaml
72-
# while updating the COS version here.
73-
GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0}
71+
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0}
7472
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
7573
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
7674
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

cluster/gce/config-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767
# variable. Also please update corresponding image for node e2e at:
6868
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
6969
CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
70-
GCI_VERSION=${KUBE_GCI_VERSION:-cos-beta-59-9460-20-0}
70+
GCI_VERSION=${KUBE_GCI_VERSION:-cos-stable-59-9460-64-0}
7171
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
7272
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
7373
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

cluster/gce/gci/nvidia-gpus/BUILD

-24
This file was deleted.

cluster/gce/gci/nvidia-gpus/Dockerfile

-28
This file was deleted.

cluster/gce/gci/nvidia-gpus/Makefile

-27
This file was deleted.

cluster/gce/gci/nvidia-gpus/cos-installer-daemonset.yaml

-57
This file was deleted.

cluster/gce/gci/nvidia-gpus/installer.sh

-207
This file was deleted.

cluster/kubemark/gce/config-default.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
3636

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

4242
NETWORK=${KUBE_GCE_NETWORK:-default}

hack/generate-bindata.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ go-bindata -nometadata -o "${BINDATA_OUTPUT}.tmp" -pkg generated \
4848
"examples/..." \
4949
"test/e2e/testing-manifests/..." \
5050
"test/images/..." \
51-
"test/fixtures/..." \
52-
"cluster/gce/gci/nvidia-gpus/..."
51+
"test/fixtures/..."
5352

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

0 commit comments

Comments
 (0)