mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	update cadvisor version in test
update NodePrePullImageList fix conflicts fix conflicts remove script add cadvisor as dependency address comments
This commit is contained in:
		@@ -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+
 | 
			
		||||
 
 | 
			
		||||
@@ -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",
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user