Add images coming in 1.30

Signed-off-by: Vu Dinh <vudinh@outlook.com>
openshift · May 3, 2024 · c4df30b · c4df30b
1 parent 221cc88
commit c4df30b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/pkg/cmd/openshift-tests/images/images_command.go b/pkg/cmd/openshift-tests/images/images_command.go
@@ -82,6 +82,11 @@ func NewImagesCommand() *cobra.Command {
 			for _, line := range lines {
 				fmt.Fprintln(os.Stdout, line)
 			}
+			// TODO: these should be removed when landing k8s 1.30:
+			newImages := injectNewImages(ref, o.Upstream)
+			for _, line := range newImages {
+				fmt.Fprintln(os.Stdout, line)
+			}
 			return nil
 		},
 	}
@@ -93,6 +98,32 @@ func NewImagesCommand() *cobra.Command {
 	return cmd
 }
 
+func injectNewImages(ref reference.DockerImageReference, upstream bool) []string {
+	lines := []string{}
+	for original, mirror := range map[string]string{
+		"registry.k8s.io/sig-storage/hello-populator:v1.0.1":            "e2e-38-registry-k8s-io-sig-storage-hello-populator-v1-0-1-Ei7libli17J5IWn-",
+		"registry.k8s.io/e2e-test-images/agnhost:2.45":                  "e2e-1-registry-k8s-io-e2e-test-images-agnhost-2-45-0axvGMNNN4BHiZi2",
+		"registry.k8s.io/sig-storage/nfs-provisioner:v3.0.1":            "e2e-19-registry-k8s-io-sig-storage-nfs-provisioner-v3-0-1-eS192wx22gGKMh2M",
+		"registry.k8s.io/e2e-test-images/volume/nfs:1.3":                "e2e-35-registry-k8s-io-e2e-test-images-volume-nfs-1-3-nwYqCusKEqAgWvkm",
+		"registry.k8s.io/sig-storage/csi-provisioner:v4.0.0":            "e2e-52-registry-k8s-io-sig-storage-csi-provisioner-v4-0-0-bqfMcU-y3K8duPWv",
+		"registry.k8s.io/sig-storage/csi-attacher:v4.5.0":               "e2e-51-registry-k8s-io-sig-storage-csi-attacher-v4-5-0-Tz4PNXQMkR5j79UG",
+		"registry.k8s.io/sig-storage/csi-resizer:v1.10.0":               "e2e-53-registry-k8s-io-sig-storage-csi-resizer-v1-10-0-2E9LTXxya28RTTCl",
+		"registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0": "e2e-49-registry-k8s-io-sig-storage-csi-node-driver-registrar-v2-10-0-64M7YwmFVRdi8fm8",
+		"registry.k8s.io/sig-storage/hostpathplugin:v1.13.0":            "e2e-47-registry-k8s-io-sig-storage-hostpathplugin-v1-13-0-_mGV6CNsRSoJ1enp",
+		"registry.k8s.io/sig-storage/livenessprobe:v2.12.0":             "e2e-50-registry-k8s-io-sig-storage-livenessprobe-v2-12-0-wCYz5fsB0ew8MCS0",
+		"registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1":            "e2e-54-registry-k8s-io-sig-storage-csi-snapshotter-v7-0-1-Kl1cpS2Nb1KSl5FX",
+		"registry.k8s.io/e2e-test-images/busybox:1.29-2":                "e2e-55-registry-k8s-io-e2e-test-images-busybox-1-29-2-ZYWRth-o9U_JR2ZE",
+	} {
+		if upstream {
+			lines = append(lines, fmt.Sprintf("%s %s:%s", original, ref.Exact(), mirror))
+		} else {
+			lines = append(lines, fmt.Sprintf("quay.io/openshift/community-e2e-images:%s %s:%s", mirror, ref.Exact(), mirror))
+		}
+	}
+	sort.Strings(lines)
+	return lines
+}
+
 type imagesOptions struct {
 	Repository string
 	Upstream   bool

diff --git a/test/extended/util/image/zz_generated.txt b/test/extended/util/image/zz_generated.txt
@@ -52,3 +52,15 @@ registry.k8s.io/sig-storage/hostpathplugin:v1.9.0 quay.io/openshift/community-e2
 registry.k8s.io/sig-storage/livenessprobe:v2.7.0 quay.io/openshift/community-e2e-images:e2e-50-registry-k8s-io-sig-storage-livenessprobe-v2-7-0-xUaqxY48BuQF81pK
 registry.k8s.io/sig-storage/nfs-provisioner:v3.0.1 quay.io/openshift/community-e2e-images:e2e-19-registry-k8s-io-sig-storage-nfs-provisioner-v3-0-1-eS192wx22gGKMh2M
 registry.k8s.io/sig-storage/volume-data-source-validator:v1.0.0 quay.io/openshift/community-e2e-images:e2e-40-registry-k8s-io-sig-storage-volume-data-source-validator-v1-0-0-pJwTeQGTDmAV8753
+registry.k8s.io/e2e-test-images/agnhost:2.45 quay.io/openshift/community-e2e-images:e2e-1-registry-k8s-io-e2e-test-images-agnhost-2-45-0axvGMNNN4BHiZi2
+registry.k8s.io/e2e-test-images/busybox:1.29-2 quay.io/openshift/community-e2e-images:e2e-55-registry-k8s-io-e2e-test-images-busybox-1-29-2-ZYWRth-o9U_JR2ZE
+registry.k8s.io/e2e-test-images/volume/nfs:1.3 quay.io/openshift/community-e2e-images:e2e-35-registry-k8s-io-e2e-test-images-volume-nfs-1-3-nwYqCusKEqAgWvkm
+registry.k8s.io/sig-storage/csi-attacher:v4.5.0 quay.io/openshift/community-e2e-images:e2e-51-registry-k8s-io-sig-storage-csi-attacher-v4-5-0-Tz4PNXQMkR5j79UG
+registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 quay.io/openshift/community-e2e-images:e2e-49-registry-k8s-io-sig-storage-csi-node-driver-registrar-v2-10-0-64M7YwmFVRdi8fm8
+registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 quay.io/openshift/community-e2e-images:e2e-52-registry-k8s-io-sig-storage-csi-provisioner-v4-0-0-bqfMcU-y3K8duPWv
+registry.k8s.io/sig-storage/csi-resizer:v1.10.0 quay.io/openshift/community-e2e-images:e2e-53-registry-k8s-io-sig-storage-csi-resizer-v1-10-0-2E9LTXxya28RTTCl
+registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 quay.io/openshift/community-e2e-images:e2e-54-registry-k8s-io-sig-storage-csi-snapshotter-v7-0-1-Kl1cpS2Nb1KSl5FX
+registry.k8s.io/sig-storage/hello-populator:v1.0.1 quay.io/openshift/community-e2e-images:e2e-38-registry-k8s-io-sig-storage-hello-populator-v1-0-1-Ei7libli17J5IWn-
+registry.k8s.io/sig-storage/hostpathplugin:v1.13.0 quay.io/openshift/community-e2e-images:e2e-47-registry-k8s-io-sig-storage-hostpathplugin-v1-13-0-_mGV6CNsRSoJ1enp
+registry.k8s.io/sig-storage/livenessprobe:v2.12.0 quay.io/openshift/community-e2e-images:e2e-50-registry-k8s-io-sig-storage-livenessprobe-v2-12-0-wCYz5fsB0ew8MCS0
+registry.k8s.io/sig-storage/nfs-provisioner:v3.0.1 quay.io/openshift/community-e2e-images:e2e-19-registry-k8s-io-sig-storage-nfs-provisioner-v3-0-1-eS192wx22gGKMh2M