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

Merge pull request #37547 from sttts/sttts-cut-off-genericapserver-from-registry

Browse Source 
Automatic merge from submit-queue

Cut genericapserver->registry dependency

Towards moving genericapiserver into staging.
This commit is contained in:
Kubernetes Submit Queue
2016-12-03 12:22:20 -08:00
committed by GitHub
parent 9f66f7544b b2b0142b6f
commit ad72d1728c
75 changed files with 297 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/kubectl.go
View File

@@ -50,7 +50,7 @@ import (
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/generic/registry"
genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry"
uexec "k8s.io/kubernetes/pkg/util/exec"
utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/pkg/util/uuid"
@@ -159,7 +159,7 @@ func runKubectlRetryOrDie(args ...string) string {
var output string
for i := 0; i < 5; i++ {
output, err = framework.RunKubectl(args...)
if err == nil || (!strings.Contains(err.Error(), registry.OptimisticLockErrorMsg) && !strings.Contains(err.Error(), "Operation cannot be fulfilled")) {
if err == nil || (!strings.Contains(err.Error(), genericregistry.OptimisticLockErrorMsg) && !strings.Contains(err.Error(), "Operation cannot be fulfilled")) {
break
}
time.Sleep(time.Second)