diff --git a/test/images/.permitted-images b/test/images/.permitted-images index 15fa51288dd..522e3a0c1bd 100644 --- a/test/images/.permitted-images +++ b/test/images/.permitted-images @@ -33,9 +33,6 @@ registry.k8s.io/e2e-test-images/volume/iscsi registry.k8s.io/e2e-test-images/volume/nfs registry.k8s.io/etcd registry.k8s.io/pause -registry.k8s.io/prometheus-dummy-exporter -registry.k8s.io/prometheus-to-sd -registry.k8s.io/sd-dummy-exporter registry.k8s.io/sig-storage/csi-attacher registry.k8s.io/sig-storage/csi-external-health-monitor-controller registry.k8s.io/sig-storage/csi-node-driver-registrar diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index b5e375982f3..76067e103bb 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -206,18 +206,12 @@ const ( Pause // Perl image Perl - // PrometheusDummyExporter image - PrometheusDummyExporter - // PrometheusToSd image - PrometheusToSd // Redis image Redis // RegressionIssue74839 image RegressionIssue74839 // ResourceConsumer image ResourceConsumer - // SdDummyExporter image - SdDummyExporter // VolumeNFSServer image VolumeNFSServer // VolumeISCSIServer image @@ -255,12 +249,9 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go configs[Pause] = Config{list.GcRegistry, "pause", "3.10"} configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"} - configs[PrometheusDummyExporter] = Config{list.GcRegistry, "prometheus-dummy-exporter", "v0.1.0"} - configs[PrometheusToSd] = Config{list.GcRegistry, "prometheus-to-sd", "v0.5.0"} configs[Redis] = Config{list.PromoterE2eRegistry, "redis", "5.0.5-3"} configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.2"} configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.13"} - configs[SdDummyExporter] = Config{list.GcRegistry, "sd-dummy-exporter", "v0.2.0"} configs[VolumeNFSServer] = Config{list.PromoterE2eRegistry, "volume/nfs", "1.4"} configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.6"}