Merge pull request #108581 from pacoxu/image-docker-hub-fix

migrate nginx to k8s.gcr.io image
This commit is contained in:
Kubernetes Prow Robot 2022-03-10 16:19:07 -08:00 committed by GitHub
commit c5f7ceb26c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions

View File

@ -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)},
},
},
},

View File

@ -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

View File

@ -28,6 +28,7 @@ import (
"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
}

View File

@ -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",

View File

@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: nginx
image: nginx:1.15-alpine
image: {{.NginxImageNew}}
ports:
- containerPort: 80
name: web