upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-11 09:53:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8c41cef0de into e136f39334

Browse source
This commit is contained in:
Osmond James 2026-05-21 18:54:20 -05:00 committed by GitHub
commit e8d7cd9696
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/images/.permitted-images
View file

@ -28,6 +28,7 @@ registry.k8s.io/e2e-test-images/perl
registry.k8s.io/e2e-test-images/regression-issue-74839
registry.k8s.io/e2e-test-images/resource-consumer
registry.k8s.io/e2e-test-images/sample-apiserver
registry.k8s.io/e2e-test-images/sample-device-plugin
registry.k8s.io/e2e-test-images/volume/iscsi
registry.k8s.io/e2e-test-images/volume/nfs
registry.k8s.io/etcd
@ -43,4 +44,4 @@ registry.k8s.io/sig-storage/hello-populator
registry.k8s.io/sig-storage/hostpathplugin
registry.k8s.io/sig-storage/livenessprobe
registry.k8s.io/sig-storage/nfs-provisioner
registry.k8s.io/sig-storage/volume-data-source-validator
registry.k8s.io/sig-storage/volume-data-source-validator

3
test/utils/image/manifest.go
View file

@ -204,6 +204,8 @@ const (
VolumeNFSServer
// VolumeISCSIServer image
VolumeISCSIServer
// SampleDevicePlugin image
SampleDevicePlugin
)
func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config) {
@ -236,6 +238,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.14"}
configs[VolumeNFSServer] = Config{list.PromoterE2eRegistry, "volume/nfs", "1.6.0"}
configs[VolumeISCSIServer] = Config{list.PromoterE2eRegistry, "volume/iscsi", "2.7"}
configs[SampleDevicePlugin] = Config{list.PromoterE2eRegistry, "sample-device-plugin", "1.7"}
// This adds more config entries. Those have no pre-defined ImageID number,
// but will be used via ReplaceRegistryInImageURL when deploying