From 11f0d77dffc32ed06726027b5b0b1f03de235abc Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 31 Jan 2017 12:57:32 +0100 Subject: [PATCH] Fix k8s.io/client-go imports in authorative files before resync --- staging/src/k8s.io/client-go/rest/request_test.go | 5 +++-- .../src/k8s.io/client-go/tools/portforward/portforward.go | 2 +- test/e2e/disruption.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/client-go/rest/request_test.go b/staging/src/k8s.io/client-go/rest/request_test.go index 58b55ff32f6..0b9e5cd39a0 100755 --- a/staging/src/k8s.io/client-go/rest/request_test.go +++ b/staging/src/k8s.io/client-go/rest/request_test.go @@ -44,8 +44,9 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util/httpstream" - "k8s.io/client-go/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/apimachinery/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/intstr" restclientwatch "k8s.io/client-go/rest/watch" "k8s.io/client-go/util/clock" "k8s.io/client-go/util/flowcontrol" diff --git a/staging/src/k8s.io/client-go/tools/portforward/portforward.go b/staging/src/k8s.io/client-go/tools/portforward/portforward.go index 5b1129060cb..50a1ce66551 100644 --- a/staging/src/k8s.io/client-go/tools/portforward/portforward.go +++ b/staging/src/k8s.io/client-go/tools/portforward/portforward.go @@ -27,10 +27,10 @@ import ( "strings" "sync" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/kubelet/server/portforward" - "k8s.io/client-go/pkg/util/httpstream" ) // PortForwarder knows how to listen for local connections and forward them to diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index f5d80ac1274..6d7ac97bd69 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -23,12 +23,12 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" "k8s.io/client-go/pkg/api/v1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" - "k8s.io/client-go/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" )