github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-05 15:37:35 +00:00
Code Issues Projects Releases Wiki Activity

test/e2e: move funcs from test/e2e/pod to other folders

Browse Source
This commit is contained in:
hwdef
2019-12-12 14:02:30 +08:00
parent 6dbd521cfa
commit d45107a00d
10 changed files with 127 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e/storage/utils/create.go
View File

@@ -20,6 +20,7 @@ import (
"bytes"
"encoding/json"
"fmt"
imageutils "k8s.io/kubernetes/test/utils/image"
"github.com/pkg/errors"
@@ -35,7 +36,6 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"k8s.io/kubernetes/test/e2e/framework/testfiles"
)
@@ -360,18 +360,18 @@ func patchItemRecursively(f *framework.Framework, item interface{}) error {
PatchNamespace(f, &item.ObjectMeta.Namespace)
case *appsv1.StatefulSet:
PatchNamespace(f, &item.ObjectMeta.Namespace)
if err := e2epod.PatchContainerImages(item.Spec.Template.Spec.Containers); err != nil {
if err := patchContainerImages(item.Spec.Template.Spec.Containers); err != nil {
return err
}
if err := e2epod.PatchContainerImages(item.Spec.Template.Spec.InitContainers); err != nil {
if err := patchContainerImages(item.Spec.Template.Spec.InitContainers); err != nil {
return err
}
case *appsv1.DaemonSet:
PatchNamespace(f, &item.ObjectMeta.Namespace)
if err := e2epod.PatchContainerImages(item.Spec.Template.Spec.Containers); err != nil {
if err := patchContainerImages(item.Spec.Template.Spec.Containers); err != nil {
return err
}
if err := e2epod.PatchContainerImages(item.Spec.Template.Spec.InitContainers); err != nil {
if err := patchContainerImages(item.Spec.Template.Spec.InitContainers); err != nil {
return err
}
default:
@@ -624,3 +624,17 @@ func PrettyPrint(item interface{}) string {
}
return fmt.Sprintf("%+v", item)
}
// patchContainerImages replaces the specified Container Registry with a custom
// one provided via the KUBE_TEST_REPO_LIST env variable
func patchContainerImages(containers []v1.Container) error {
var err error
for _, c := range containers {
c.Image, err = imageutils.ReplaceRegistryInImageURL(c.Image)
if err != nil {
return err
}
}
return nil
}