github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate to k8s.io/utils/strings

Browse Source
This commit is contained in:
danielqsj
2019-01-29 17:50:53 +08:00
parent df7e4f3d49
commit 093328e57f
75 changed files with 164 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/.import-restrictions
View File

@@ -286,7 +286,6 @@
"k8s.io/kubernetes/pkg/util/node",
"k8s.io/kubernetes/pkg/util/reflector/prometheus",
"k8s.io/kubernetes/pkg/util/slice",
"k8s.io/kubernetes/pkg/util/strings",
"k8s.io/kubernetes/pkg/util/system",
"k8s.io/kubernetes/pkg/util/taints",
"k8s.io/kubernetes/pkg/util/workqueue/prometheus",
@@ -341,7 +340,8 @@
"k8s.io/utils/integer",
"k8s.io/utils/io",
"k8s.io/utils/pointer",
"k8s.io/utils/exec"
"k8s.io/utils/exec",
"k8s.io/utils/strings"
]
},
{

2
pkg/controller/volume/attachdetach/reconciler/BUILD
View File

@@ -35,7 +35,6 @@ go_test(
"//pkg/controller/volume/attachdetach/cache:go_default_library",
"//pkg/controller/volume/attachdetach/statusupdater:go_default_library",
"//pkg/controller/volume/attachdetach/testing:go_default_library",
"//pkg/util/strings:go_default_library",
"//pkg/volume/testing:go_default_library",
"//pkg/volume/util/operationexecutor:go_default_library",
"//pkg/volume/util/types:go_default_library",
@@ -44,6 +43,7 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/client-go/informers:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//vendor/k8s.io/utils/strings:go_default_library",
],
)

4
pkg/controller/volume/attachdetach/reconciler/reconciler_test.go
View File

@@ -29,10 +29,10 @@ import (
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater"
controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing"
stringutil "k8s.io/kubernetes/pkg/util/strings"
volumetesting "k8s.io/kubernetes/pkg/volume/testing"
"k8s.io/kubernetes/pkg/volume/util/operationexecutor"
"k8s.io/kubernetes/pkg/volume/util/types"
utilsstrings "k8s.io/utils/strings"
)
const (
@@ -738,7 +738,7 @@ func Test_ReportMultiAttachError(t *testing.T) {
volumeSpec := controllervolumetesting.GetTestVolumeSpec(string(volumeName), volumeName)
volumeSpec.PersistentVolume.Spec.AccessModes = []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}
uid := string(n.name) + "-" + podName // unique UID
namespace, name := stringutil.SplitQualifiedName(podName)
namespace, name := utilsstrings.SplitQualifiedName(podName)
pod := controllervolumetesting.NewPod(uid, name)
pod.Namespace = namespace
_, err := dsw.AddPod(types.UniquePodName(uid), pod, volumeSpec, n.name)