From b03e27af1bd16838c0707fb62911a5d8f72a1635 Mon Sep 17 00:00:00 2001
From: Paco Xu <paco.xu@daocloud.io>
Date: Tue, 8 Mar 2022 16:42:11 +0800
Subject: [PATCH 1/2] migrate dockerhub image to k8s.gcr.io e2e test image

---
 test/e2e/common/node/podtemplates.go                       | 2 +-
 test/e2e/framework/manifest/manifest.go                    | 7 ++++---
 test/e2e/storage/flexvolume_online_resize.go               | 3 ++-
 .../testing-manifests/statefulset/nginx/statefulset.yaml   | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/e2e/common/node/podtemplates.go b/test/e2e/common/node/podtemplates.go
index 3f5284b86b9..ac9d85ffd4a 100644
--- a/test/e2e/common/node/podtemplates.go
+++ b/test/e2e/common/node/podtemplates.go
@@ -70,7 +70,7 @@ var _ = SIGDescribe("PodTemplates", func() {
 			Template: v1.PodTemplateSpec{
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
-						{Name: "nginx", Image: "nginx"},
+						{Name: "nginx", Image: imageutils.GetE2EImage(imageutils.Nginx)},
 					},
 				},
 			},
diff --git a/test/e2e/framework/manifest/manifest.go b/test/e2e/framework/manifest/manifest.go
index 366c9ed0857..556de474cb2 100644
--- a/test/e2e/framework/manifest/manifest.go
+++ b/test/e2e/framework/manifest/manifest.go
@@ -23,11 +23,12 @@ import (
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/kubernetes/scheme"
+	commonutils "k8s.io/kubernetes/test/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles"
 )
@@ -75,8 +76,8 @@ func StatefulSetFromManifest(fileName, ns string) (*appsv1.StatefulSet, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	json, err := utilyaml.ToJSON(data)
+	statefulsetYaml := commonutils.SubstituteImageName(string(data))
+	json, err := utilyaml.ToJSON([]byte(statefulsetYaml))
 	if err != nil {
 		return nil, err
 	}
diff --git a/test/e2e/storage/flexvolume_online_resize.go b/test/e2e/storage/flexvolume_online_resize.go
index 69f6500f99d..07e3952cc4a 100644
--- a/test/e2e/storage/flexvolume_online_resize.go
+++ b/test/e2e/storage/flexvolume_online_resize.go
@@ -36,6 +36,7 @@ import (
 	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 	"k8s.io/kubernetes/test/e2e/storage/testsuites"
 	"k8s.io/kubernetes/test/e2e/storage/utils"
+	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
 var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:ExpandInUsePersistentVolumes]", func() {
@@ -221,7 +222,7 @@ func makeNginxPod(ns string, nodeSelector map[string]string, pvclaims []*v1.Pers
 			Containers: []v1.Container{
 				{
 					Name:  "write-pod",
-					Image: "nginx",
+					Image: imageutils.GetE2EImage(imageutils.Nginx),
 					Ports: []v1.ContainerPort{
 						{
 							Name:          "http-server",
diff --git a/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml b/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
index 66e949fcf5b..abab8e89b3e 100644
--- a/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: nginx:1.15-alpine
+        image: {{.NginxImageNew}}
         ports:
         - containerPort: 80
           name: web

From f2930ec98b880daf7d260706177653ce457b5577 Mon Sep 17 00:00:00 2001
From: Paco Xu <paco.xu@daocloud.io>
Date: Thu, 10 Mar 2022 10:18:04 +0800
Subject: [PATCH 2/2] revert change in imports: ide auto-change to make
 import-boss verify green

---
 test/e2e/framework/.import-restrictions | 1 +
 test/e2e/framework/manifest/manifest.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions
index d0bfb455e8e..13c7be44b0f 100644
--- a/test/e2e/framework/.import-restrictions
+++ b/test/e2e/framework/.import-restrictions
@@ -242,6 +242,7 @@ rules:
       - k8s.io/kubernetes/pkg/scheduler/internal/cache
   - selectorRegexp: k8s[.]io/kubernetes/test/
     allowedPrefixes:
+      - k8s.io/kubernetes/test/e2e/common
       - k8s.io/kubernetes/test/e2e/framework
       - k8s.io/kubernetes/test/e2e/framework/auth
       - k8s.io/kubernetes/test/e2e/framework/ginkgowrapper
diff --git a/test/e2e/framework/manifest/manifest.go b/test/e2e/framework/manifest/manifest.go
index 556de474cb2..4e694c3aeb6 100644
--- a/test/e2e/framework/manifest/manifest.go
+++ b/test/e2e/framework/manifest/manifest.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"