github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-08-08 23:37:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133262 from BenTheElder/no-authenticated-image-pulling

Browse Source 
remove broken test that depends on expired credential, remove hardcoded credential, add TODOs
This commit is contained in:
Kubernetes Prow Robot
2025-07-28 17:28:28 -07:00
committed by GitHub
parent 924b324088 8ace0fb89f
commit dd4e4f1dd1
4 changed files with 25 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/utils/image/manifest.go
View File

@@ -129,13 +129,17 @@ func readFromURL(url string, writer io.Writer) error {
var (
initRegistry = RegistryList{
GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling",
PromoterE2eRegistry: "registry.k8s.io/e2e-test-images",
BuildImageRegistry: "registry.k8s.io/build-image",
InvalidRegistry: "invalid.registry.k8s.io/invalid",
GcEtcdRegistry: "registry.k8s.io",
GcRegistry: "registry.k8s.io",
SigStorageRegistry: "registry.k8s.io/sig-storage",
// TODO: https://github.com/kubernetes/kubernetes/issues/130271
// Eliminate GcAuthenticatedRegistry.
GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling",
PromoterE2eRegistry: "registry.k8s.io/e2e-test-images",
BuildImageRegistry: "registry.k8s.io/build-image",
InvalidRegistry: "invalid.registry.k8s.io/invalid",
GcEtcdRegistry: "registry.k8s.io",
GcRegistry: "registry.k8s.io",
SigStorageRegistry: "registry.k8s.io/sig-storage",
// TODO: https://github.com/kubernetes/kubernetes/issues/130271
// Eliminate PrivateRegistry.
PrivateRegistry: "gcr.io/k8s-authenticated-test",
DockerLibraryRegistry: "docker.io/library",
CloudProviderGcpRegistry: "registry.k8s.io/cloud-provider-gcp",
@@ -152,15 +156,17 @@ const (
// Agnhost image
Agnhost
// AgnhostPrivate image
// TODO: https://github.com/kubernetes/kubernetes/issues/130271
// Eliminate this.
AgnhostPrivate
// APIServer image
APIServer
// AppArmorLoader image
AppArmorLoader
// AuthenticatedAlpine image
// TODO: https://github.com/kubernetes/kubernetes/issues/130271
// Eliminate this.
AuthenticatedAlpine
// AuthenticatedWindowsNanoServer image
AuthenticatedWindowsNanoServer
// BusyBox image
BusyBox
// DistrolessIptables Image
@@ -217,7 +223,6 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[Agnhost] = Config{list.PromoterE2eRegistry, "agnhost", "2.56"}
configs[AgnhostPrivate] = Config{list.PrivateRegistry, "agnhost", "2.6"}
configs[AuthenticatedAlpine] = Config{list.GcAuthenticatedRegistry, "alpine", "3.7"}
configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v1"}
configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"}
configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"}
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.37.0-1"}
@@ -267,7 +272,7 @@ func GetMappedImageConfigs(originalImageConfigs map[ImageID]Config, repo string)
for i, config := range originalImageConfigs {
switch i {
case InvalidRegistryImage, AuthenticatedAlpine,
AuthenticatedWindowsNanoServer, AgnhostPrivate:
AgnhostPrivate:
// These images are special and can't be run out of the cloud - some because they
// are authenticated, and others because they are not real images. Tests that depend
// on these images can't be run without access to the public internet.