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

Correct import statements

Browse Source
This commit is contained in:
Clayton Coleman
2017-01-14 01:55:53 -05:00
parent 660095776a
commit bcde05753b
19 changed files with 36 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/soak/cauldron/cauldron.go
View File

@@ -31,7 +31,7 @@ import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/restclient"
@@ -106,7 +106,7 @@ func main() {
} else {
// wait until the namespace disappears
for i := 0; i < int(namespaceDeleteTimeout/time.Second); i++ {
if _, err := client.Core().Namespaces().Get(ns, v1.GetOptions{}); err != nil {
if _, err := client.Core().Namespaces().Get(ns, metav1.GetOptions{}); err != nil {
if errors.IsNotFound(err) {
return
}
@@ -221,7 +221,7 @@ func main() {
for _, podName := range podNames {
var pod *api.Pod
for start := time.Now(); time.Since(start) < podStartTimeout; time.Sleep(5 * time.Second) {
pod, err = client.Core().Pods(ns).Get(podName, v1.GetOptions{})
pod, err = client.Core().Pods(ns).Get(podName, metav1.GetOptions{})
if err != nil {
glog.Warningf("Get pod %s/%s failed, ignoring for %v: %v", ns, podName, err, podStartTimeout)
continue