From 060e4490560347a65b78a9f8105bd598cd5272ef Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sun, 16 Jul 2017 15:30:20 -0400 Subject: [PATCH] Update gce controller --- controllers/gce/backends/backends.go | 2 +- controllers/gce/backends/backends_test.go | 2 +- controllers/gce/backends/fakes.go | 2 +- controllers/gce/backends/interfaces.go | 2 +- controllers/gce/controller/controller.go | 4 ++-- controllers/gce/controller/controller_test.go | 6 +++--- controllers/gce/controller/tls.go | 4 ++-- controllers/gce/controller/util_test.go | 2 +- controllers/gce/controller/utils.go | 8 ++++---- controllers/gce/examples/https/make_secret.go | 4 ++-- controllers/gce/main.go | 4 ++-- controllers/gce/storage/configmaps.go | 2 +- controllers/gce/storage/configmaps_test.go | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/controllers/gce/backends/backends.go b/controllers/gce/backends/backends.go index b9f0d8eba..09d81d26d 100644 --- a/controllers/gce/backends/backends.go +++ b/controllers/gce/backends/backends.go @@ -26,10 +26,10 @@ import ( "github.com/golang/glog" compute "google.golang.org/api/compute/v1" + api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" - api_v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/ingress/controllers/gce/healthchecks" "k8s.io/ingress/controllers/gce/instances" diff --git a/controllers/gce/backends/backends_test.go b/controllers/gce/backends/backends_test.go index d3efbf53d..e08956462 100644 --- a/controllers/gce/backends/backends_test.go +++ b/controllers/gce/backends/backends_test.go @@ -23,9 +23,9 @@ import ( compute "google.golang.org/api/compute/v1" "google.golang.org/api/googleapi" + api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" - api_v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/ingress/controllers/gce/healthchecks" "k8s.io/ingress/controllers/gce/instances" diff --git a/controllers/gce/backends/fakes.go b/controllers/gce/backends/fakes.go index 4ad8d0c28..fac84aedb 100644 --- a/controllers/gce/backends/fakes.go +++ b/controllers/gce/backends/fakes.go @@ -20,7 +20,7 @@ import ( "fmt" compute "google.golang.org/api/compute/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/ingress/controllers/gce/utils" diff --git a/controllers/gce/backends/interfaces.go b/controllers/gce/backends/interfaces.go index c24fc88a3..da0d45899 100644 --- a/controllers/gce/backends/interfaces.go +++ b/controllers/gce/backends/interfaces.go @@ -18,7 +18,7 @@ package backends import ( compute "google.golang.org/api/compute/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" ) // ProbeProvider retrieves a probe struct given a nodePort diff --git a/controllers/gce/controller/controller.go b/controllers/gce/controller/controller.go index fe59034c7..5264f56ef 100644 --- a/controllers/gce/controller/controller.go +++ b/controllers/gce/controller/controller.go @@ -24,14 +24,14 @@ import ( "github.com/golang/glog" + api_v1 "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/kubernetes" scheme "k8s.io/client-go/kubernetes/scheme" unversionedcore "k8s.io/client-go/kubernetes/typed/core/v1" listers "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" diff --git a/controllers/gce/controller/controller_test.go b/controllers/gce/controller/controller_test.go index 6f16fd542..75285f688 100644 --- a/controllers/gce/controller/controller_test.go +++ b/controllers/gce/controller/controller_test.go @@ -24,14 +24,14 @@ import ( compute "google.golang.org/api/compute/v1" + api_v1 "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/kubernetes/pkg/api" "k8s.io/ingress/controllers/gce/firewalls" "k8s.io/ingress/controllers/gce/loadbalancers" diff --git a/controllers/gce/controller/tls.go b/controllers/gce/controller/tls.go index 6795cc0d7..a44f16405 100644 --- a/controllers/gce/controller/tls.go +++ b/controllers/gce/controller/tls.go @@ -21,10 +21,10 @@ import ( "github.com/golang/glog" + api_v1 "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - api_v1 "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" "k8s.io/ingress/controllers/gce/loadbalancers" ) diff --git a/controllers/gce/controller/util_test.go b/controllers/gce/controller/util_test.go index c521b649d..a4b421669 100644 --- a/controllers/gce/controller/util_test.go +++ b/controllers/gce/controller/util_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" + api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" - api_v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/ingress/controllers/gce/backends" "k8s.io/ingress/controllers/gce/utils" ) diff --git a/controllers/gce/controller/utils.go b/controllers/gce/controller/utils.go index c8d02b8d2..72ba593a8 100644 --- a/controllers/gce/controller/utils.go +++ b/controllers/gce/controller/utils.go @@ -26,6 +26,8 @@ import ( "github.com/golang/glog" compute "google.golang.org/api/compute/v1" + api_v1 "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/meta" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -34,8 +36,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" listers "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" @@ -595,8 +595,8 @@ func (t *GCETranslator) getHTTPProbe(svc api_v1.Service, targetPort intstr.IntOr // - has no special host or headers fields, except for possibly an HTTP Host header func isSimpleHTTPProbe(probe *api_v1.Probe) bool { return (probe != nil && probe.Handler.HTTPGet != nil && probe.Handler.HTTPGet.Host == "" && - (len(probe.Handler.HTTPGet.HTTPHeaders) == 0 || - (len(probe.Handler.HTTPGet.HTTPHeaders) == 1 && probe.Handler.HTTPGet.HTTPHeaders[0].Name == "Host"))) + (len(probe.Handler.HTTPGet.HTTPHeaders) == 0 || + (len(probe.Handler.HTTPGet.HTTPHeaders) == 1 && probe.Handler.HTTPGet.HTTPHeaders[0].Name == "Host"))) } // GetProbe returns a probe that's used for the given nodeport diff --git a/controllers/gce/examples/https/make_secret.go b/controllers/gce/examples/https/make_secret.go index 8cb6ced9c..ab3537bd7 100644 --- a/controllers/gce/examples/https/make_secret.go +++ b/controllers/gce/examples/https/make_secret.go @@ -26,13 +26,13 @@ import ( "io/ioutil" "log" + api_v1 "k8s.io/api/core/v1" registered "k8s.io/apimachinery/pkg/apimachinery/registered" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" // This installs the legacy v1 API + "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" ) diff --git a/controllers/gce/main.go b/controllers/gce/main.go index d2df2c720..f614cc120 100644 --- a/controllers/gce/main.go +++ b/controllers/gce/main.go @@ -36,8 +36,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" + api_v1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/controllers/gce/storage/configmaps.go b/controllers/gce/storage/configmaps.go index 89f1748ec..1c3089c15 100644 --- a/controllers/gce/storage/configmaps.go +++ b/controllers/gce/storage/configmaps.go @@ -23,10 +23,10 @@ import ( "github.com/golang/glog" + api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - api_v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/tools/cache" ) diff --git a/controllers/gce/storage/configmaps_test.go b/controllers/gce/storage/configmaps_test.go index 42d6e47cb..2c40fdeae 100644 --- a/controllers/gce/storage/configmaps_test.go +++ b/controllers/gce/storage/configmaps_test.go @@ -19,7 +19,7 @@ package storage import ( "testing" - "k8s.io/client-go/pkg/api" + api "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestConfigMapUID(t *testing.T) {