Merge pull request #106287 from Dragoncell/update_cadvisor_version

update cadvisor version in test
This commit is contained in:
Kubernetes Prow Robot 2022-01-08 15:50:19 -08:00 committed by GitHub
commit d2c9456963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions

View File

@ -226,3 +226,12 @@ dependencies:
refPaths: refPaths:
- path: test/utils/image/manifest.go - path: test/utils/image/manifest.go
match: configs\[CheckMetadataConcealment\] = Config{list\.PromoterE2eRegistry, "metadata-concealment", "\d+\.\d+"} match: configs\[CheckMetadataConcealment\] = Config{list\.PromoterE2eRegistry, "metadata-concealment", "\d+\.\d+"}
# cadvisor
- name: "gcr.io/cadvisor/cadvisor: dependents"
version: "v0.43.0"
refPaths:
- path: test/e2e_node/resource_collector.go
match: gcr.io\/cadvisor\/cadvisor:v\d+\.\d+\.\d+
- path: test/e2e_node/image_list.go
mathc: gcr.io\/cadvisor\/cadvisor:v\d+\.\d+\.\d+

View File

@ -54,7 +54,7 @@ const (
// before test running so that the image pulling won't fail in actual test. // before test running so that the image pulling won't fail in actual test.
var NodePrePullImageList = sets.NewString( var NodePrePullImageList = sets.NewString(
imageutils.GetE2EImage(imageutils.Agnhost), imageutils.GetE2EImage(imageutils.Agnhost),
"google/cadvisor:latest", "gcr.io/cadvisor/cadvisor:v0.43.0",
"k8s.gcr.io/stress:v1", "k8s.gcr.io/stress:v1",
busyboxImage, busyboxImage,
"k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff", "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",

View File

@ -56,7 +56,7 @@ import (
const ( const (
// resource monitoring // resource monitoring
cadvisorImageName = "google/cadvisor:latest" cadvisorImageName = "gcr.io/cadvisor/cadvisor:v0.43.0"
cadvisorPodName = "cadvisor" cadvisorPodName = "cadvisor"
cadvisorPort = 8090 cadvisorPort = 8090
// housekeeping interval of Cadvisor (second) // housekeeping interval of Cadvisor (second)