diff --git a/test/images/.permitted-images b/test/images/.permitted-images index 522e3a0c1bd..ec7dac61ab5 100644 --- a/test/images/.permitted-images +++ b/test/images/.permitted-images @@ -12,7 +12,6 @@ registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver registry.k8s.io/e2e-test-images/agnhost registry.k8s.io/e2e-test-images/apparmor-loader registry.k8s.io/e2e-test-images/busybox -registry.k8s.io/e2e-test-images/cuda-vector-add registry.k8s.io/e2e-test-images/httpd registry.k8s.io/e2e-test-images/ipc-utils registry.k8s.io/e2e-test-images/jessie-dnsutils diff --git a/test/images/cuda-vector-add-old/ALIAS b/test/images/cuda-vector-add-old/ALIAS deleted file mode 100644 index a3cf7cef8ba..00000000000 --- a/test/images/cuda-vector-add-old/ALIAS +++ /dev/null @@ -1 +0,0 @@ -cuda-vector-add diff --git a/test/images/cuda-vector-add-old/BASEIMAGE b/test/images/cuda-vector-add-old/BASEIMAGE deleted file mode 100644 index 9d644953239..00000000000 --- a/test/images/cuda-vector-add-old/BASEIMAGE +++ /dev/null @@ -1,2 +0,0 @@ -linux/amd64=nvidia/cuda:8.0-devel-ubuntu16.04 -linux/ppc64le=nvidia/cuda-ppc64le:8.0-devel-ubuntu16.04 diff --git a/test/images/cuda-vector-add-old/Dockerfile b/test/images/cuda-vector-add-old/Dockerfile deleted file mode 100644 index 0b952190c62..00000000000 --- a/test/images/cuda-vector-add-old/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2021 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG BASEIMAGE -FROM $BASEIMAGE - -CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ - -RUN apt-get update && apt-get install -y --no-install-recommends \ - cuda-samples-$CUDA_PKG_VERSION && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /usr/local/cuda/samples/0_Simple/vectorAdd -RUN make - -CMD ./vectorAdd diff --git a/test/images/cuda-vector-add-old/OWNERS b/test/images/cuda-vector-add-old/OWNERS deleted file mode 100644 index ef15d6d0829..00000000000 --- a/test/images/cuda-vector-add-old/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: - - mkumatag -emeritus_approvers: - - jiayingz diff --git a/test/images/cuda-vector-add-old/README.md b/test/images/cuda-vector-add-old/README.md deleted file mode 100644 index 679f12e2817..00000000000 --- a/test/images/cuda-vector-add-old/README.md +++ /dev/null @@ -1,17 +0,0 @@ -## cuda_vector_add - -This is a small CUDA application that performs a simple vector addition. Useful for testing CUDA support in Kubernetes. - -## How to release: - -``` -# Build -$ make - -# Push -$ make push -``` - -## Version history: - -1.0: build cuda-vector-add from CUDA 8.0. diff --git a/test/images/cuda-vector-add-old/VERSION b/test/images/cuda-vector-add-old/VERSION deleted file mode 100644 index d3827e75a5c..00000000000 --- a/test/images/cuda-vector-add-old/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/test/images/cuda-vector-add/BASEIMAGE b/test/images/cuda-vector-add/BASEIMAGE deleted file mode 100644 index 135b26d7a21..00000000000 --- a/test/images/cuda-vector-add/BASEIMAGE +++ /dev/null @@ -1,2 +0,0 @@ -linux/amd64=nvidia/cuda:11.4.3-devel-ubuntu20.04 -linux/arm64=nvidia/cuda:11.4.3-devel-ubuntu20.04 diff --git a/test/images/cuda-vector-add/Dockerfile b/test/images/cuda-vector-add/Dockerfile deleted file mode 100644 index 16d40499a06..00000000000 --- a/test/images/cuda-vector-add/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2017 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG BASEIMAGE -FROM $BASEIMAGE - -ENV CUDA_PKG_VERSION=11-4 -CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ -RUN apt-get update && apt-get install -y --no-install-recommends \ - cuda-samples-$CUDA_PKG_VERSION && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /usr/local/cuda/samples/0_Simple/vectorAdd -RUN make - -CMD nvidia-smi && ./vectorAdd diff --git a/test/images/cuda-vector-add/OWNERS b/test/images/cuda-vector-add/OWNERS deleted file mode 100644 index ef15d6d0829..00000000000 --- a/test/images/cuda-vector-add/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: - - mkumatag -emeritus_approvers: - - jiayingz diff --git a/test/images/cuda-vector-add/README.md b/test/images/cuda-vector-add/README.md deleted file mode 100644 index 8fb5d58f878..00000000000 --- a/test/images/cuda-vector-add/README.md +++ /dev/null @@ -1,18 +0,0 @@ -## cuda_vector_add - -This is a small CUDA application that performs a simple vector addition. Useful for testing CUDA support in Kubernetes. - -## How to release: - -``` -# Build -$ make - -# Push -$ make push -``` - -## Version history: - -1.0: build cuda-vector-add from CUDA 8.0. -2.0: build cuda-vector-add from CUDA 10.0 diff --git a/test/images/cuda-vector-add/VERSION b/test/images/cuda-vector-add/VERSION deleted file mode 100644 index 6b4950e3de2..00000000000 --- a/test/images/cuda-vector-add/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.4 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index b52b4a3bbb8..c29329af08a 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -163,10 +163,6 @@ const ( AuthenticatedWindowsNanoServer // BusyBox image BusyBox - // CudaVectorAdd image - CudaVectorAdd - // CudaVectorAdd2 image - CudaVectorAdd2 // DistrolessIptables Image DistrolessIptables // Etcd image @@ -227,8 +223,6 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"} configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} - configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} - configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.2"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.15-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}