test images: use recently promoted images

Signed-off-by: Ernest Wong <chuwon@microsoft.com>
This commit is contained in:
Ernest Wong
2021-01-26 11:16:16 -08:00
parent d54e4498fc
commit 40713f7666
9 changed files with 37 additions and 24 deletions

View File

@@ -17,6 +17,7 @@ go_library(
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//test/utils/image:go_default_library",
],
)

View File

@@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager"
imageutils "k8s.io/kubernetes/test/utils/image"
)
// npbEPWorkload defines a workload to run the Embarrassingly Parallel (EP) workload
@@ -43,7 +44,7 @@ func (w npbEPWorkload) PodSpec() v1.PodSpec {
var containers []v1.Container
ctn := v1.Container{
Name: fmt.Sprintf("%s-ctn", w.Name()),
Image: "gcr.io/kubernetes-e2e-test-images/node-perf/npb-ep:1.0",
Image: imageutils.GetE2EImage(imageutils.NodePerfNpbEp),
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"),

View File

@@ -24,6 +24,7 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
imageutils "k8s.io/kubernetes/test/utils/image"
)
// npbISWorkload defines a workload to run the integer sort (IS) workload
@@ -41,7 +42,7 @@ func (w npbISWorkload) PodSpec() v1.PodSpec {
var containers []v1.Container
ctn := v1.Container{
Name: fmt.Sprintf("%s-ctn", w.Name()),
Image: "gcr.io/kubernetes-e2e-test-images/node-perf/npb-is:1.0",
Image: imageutils.GetE2EImage(imageutils.NodePerfNpbIs),
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"),

View File

@@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager"
imageutils "k8s.io/kubernetes/test/utils/image"
)
// tfWideDeepWorkload defines a workload to run
@@ -43,7 +44,7 @@ func (w tfWideDeepWorkload) PodSpec() v1.PodSpec {
var containers []v1.Container
ctn := v1.Container{
Name: fmt.Sprintf("%s-ctn", w.Name()),
Image: "gcr.io/kubernetes-e2e-test-images/node-perf/tf-wide-deep-amd64:1.0",
Image: imageutils.GetE2EImage(imageutils.NodePerfTfWideDeep),
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"),