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

Merge pull request #123288 from AkihiroSuda/agnhost

Browse Source 
e2e_node: replace `registry.k8s.io/stress:v1` with agnhost
This commit is contained in:
Kubernetes Prow Robot
2024-02-14 18:08:41 -08:00
committed by GitHub
parent 72c3c7c924 e8b08cd056
commit d76d7a1e7a
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/eviction_test.go
View File

@@ -1077,13 +1077,13 @@ func getMemhogPod(podName string, ctnName string, res v1.ResourceRequirements) *
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: ctnName, Name: ctnName,
Image: "registry.k8s.io/stress:v1", Image: imageutils.GetE2EImage(imageutils.Agnhost),
ImagePullPolicy: "Always", ImagePullPolicy: "Always",
Env: env, Env: env,
// 60 min timeout * 60s / tick per 10s = 360 ticks before timeout => ~11.11Mi/tick // 60 min timeout * 60s / tick per 10s = 360 ticks before timeout => ~11.11Mi/tick
// to fill ~4Gi of memory, so initial ballpark 12Mi/tick. // to fill ~4Gi of memory, so initial ballpark 12Mi/tick.
// We might see flakes due to timeout if the total memory on the nodes increases. // We might see flakes due to timeout if the total memory on the nodes increases.
Args: []string{"-mem-alloc-size", "12Mi", "-mem-alloc-sleep", "10s", "-mem-total", memLimit}, Args: []string{"stress", "--mem-alloc-size", "12Mi", "--mem-alloc-sleep", "10s", "--mem-total", memLimit},
Resources: res, Resources: res,
}, },
}, },

1
test/e2e_node/image_list.go
View File

@@ -53,7 +53,6 @@ const (
var NodePrePullImageList = sets.NewString( var NodePrePullImageList = sets.NewString(
imageutils.GetE2EImage(imageutils.Agnhost), imageutils.GetE2EImage(imageutils.Agnhost),
"gcr.io/cadvisor/cadvisor:v0.47.2", "gcr.io/cadvisor/cadvisor:v0.47.2",
"registry.k8s.io/stress:v1",
busyboxImage, busyboxImage,
"registry.k8s.io/e2e-test-images/busybox@sha256:a9155b13325b2abef48e71de77bb8ac015412a566829f621d06bfae5c699b1b9", "registry.k8s.io/e2e-test-images/busybox@sha256:a9155b13325b2abef48e71de77bb8ac015412a566829f621d06bfae5c699b1b9",
imageutils.GetE2EImage(imageutils.Nginx), imageutils.GetE2EImage(imageutils.Nginx),

2
test/utils/image/manifest.go
View File

@@ -228,7 +228,7 @@ const (
func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config) { func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config) {
configs := map[ImageID]Config{} configs := map[ImageID]Config{}
configs[Agnhost] = Config{list.PromoterE2eRegistry, "agnhost", "2.45"} configs[Agnhost] = Config{list.PromoterE2eRegistry, "agnhost", "2.47"}
configs[AgnhostPrivate] = Config{list.PrivateRegistry, "agnhost", "2.6"} configs[AgnhostPrivate] = Config{list.PrivateRegistry, "agnhost", "2.6"}
configs[AuthenticatedAlpine] = Config{list.GcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedAlpine] = Config{list.GcAuthenticatedRegistry, "alpine", "3.7"}
configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v1"} configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v1"}