Skip to content

Commit 88313a4

Browse files
authored
Merge pull request kubernetes#125875 from BenTheElder/shrink-image-list
remove unused prometheus exporter images from e2e image list
2 parents 9ec91e6 + df83363 commit 88313a4

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

test/images/.permitted-images

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ registry.k8s.io/e2e-test-images/volume/iscsi
3333
registry.k8s.io/e2e-test-images/volume/nfs
3434
registry.k8s.io/etcd
3535
registry.k8s.io/pause
36-
registry.k8s.io/prometheus-dummy-exporter
37-
registry.k8s.io/prometheus-to-sd
38-
registry.k8s.io/sd-dummy-exporter
3936
registry.k8s.io/sig-storage/csi-attacher
4037
registry.k8s.io/sig-storage/csi-external-health-monitor-controller
4138
registry.k8s.io/sig-storage/csi-node-driver-registrar

test/utils/image/manifest.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,18 +206,12 @@ const (
206206
Pause
207207
// Perl image
208208
Perl
209-
// PrometheusDummyExporter image
210-
PrometheusDummyExporter
211-
// PrometheusToSd image
212-
PrometheusToSd
213209
// Redis image
214210
Redis
215211
// RegressionIssue74839 image
216212
RegressionIssue74839
217213
// ResourceConsumer image
218214
ResourceConsumer
219-
// SdDummyExporter image
220-
SdDummyExporter
221215
// VolumeNFSServer image
222216
VolumeNFSServer
223217
// VolumeISCSIServer image
@@ -255,12 +249,9 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
255249
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
256250
configs[Pause] = Config{list.GcRegistry, "pause", "3.10"}
257251
configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"}
258-
configs[PrometheusDummyExporter] = Config{list.GcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
259-
configs[PrometheusToSd] = Config{list.GcRegistry, "prometheus-to-sd", "v0.5.0"}
260252
configs[Redis] = Config{list.PromoterE2eRegistry, "redis", "5.0.5-3"}
261253
configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.2"}
262254
configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.13"}
263-
configs[SdDummyExporter] = Config{list.GcRegistry, "sd-dummy-exporter", "v0.2.0"}
264255
configs[VolumeNFSServer] = Config{list.PromoterE2eRegistry, "volume/nfs", "1.4"}
265256
configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.6"}
266257

0 commit comments

Comments
 (0)