From d6d63b44fac702ab35ac0dffe3bcc87e28272dac Mon Sep 17 00:00:00 2001
From: Jiaming Xu <jiamingxu@google.com>
Date: Wed, 10 Nov 2021 01:34:05 +0000
Subject: [PATCH] update cadvisor version in test

update NodePrePullImageList

fix conflicts

fix conflicts

remove script

add cadvisor as dependency

address comments
---
 build/dependencies.yaml             | 9 +++++++++
 test/e2e_node/image_list.go         | 2 +-
 test/e2e_node/resource_collector.go | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 8c5708a6000..374619ad461 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -226,3 +226,12 @@ dependencies:
     refPaths:
     - path: test/utils/image/manifest.go
       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+
diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go
index 7c6aaa6002d..892e0ca342d 100644
--- a/test/e2e_node/image_list.go
+++ b/test/e2e_node/image_list.go
@@ -52,7 +52,7 @@ const (
 // before test running so that the image pulling won't fail in actual test.
 var NodePrePullImageList = sets.NewString(
 	imageutils.GetE2EImage(imageutils.Agnhost),
-	"google/cadvisor:latest",
+	"gcr.io/cadvisor/cadvisor:v0.43.0",
 	"k8s.gcr.io/stress:v1",
 	busyboxImage,
 	"k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
diff --git a/test/e2e_node/resource_collector.go b/test/e2e_node/resource_collector.go
index 9837a239c93..effaf1b11c0 100644
--- a/test/e2e_node/resource_collector.go
+++ b/test/e2e_node/resource_collector.go
@@ -56,7 +56,7 @@ import (
 
 const (
 	// resource monitoring
-	cadvisorImageName = "google/cadvisor:latest"
+	cadvisorImageName = "gcr.io/cadvisor/cadvisor:v0.43.0"
 	cadvisorPodName   = "cadvisor"
 	cadvisorPort      = 8090
 	// housekeeping interval of Cadvisor (second)