From 4705a856f2e6e3eed998e0fd9244caad2b543d7e Mon Sep 17 00:00:00 2001 From: zouyee Date: Fri, 19 May 2017 09:46:28 +0800 Subject: [PATCH] explicitly pick a version for Extensions --- controllers/gce/controller/controller.go | 4 ++-- controllers/gce/main.go | 2 +- core/pkg/ingress/controller/controller.go | 2 +- core/pkg/ingress/status/status.go | 2 +- core/pkg/ingress/status/status_test.go | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/controllers/gce/controller/controller.go b/controllers/gce/controller/controller.go index e4d49d4ff..3d8fc7cf2 100644 --- a/controllers/gce/controller/controller.go +++ b/controllers/gce/controller/controller.go @@ -141,7 +141,7 @@ func NewLoadBalancerController(kubeClient kubernetes.Interface, clusterManager * }, } lbc.ingLister.Store, lbc.ingController = cache.NewInformer( - cache.NewListWatchFromClient(lbc.client.Extensions().RESTClient(), "ingresses", namespace, fields.Everything()), + cache.NewListWatchFromClient(lbc.client.ExtensionsV1beta1().RESTClient(), "ingresses", namespace, fields.Everything()), &extensions.Ingress{}, resyncPeriod, pathHandlers) // Service watch handlers @@ -344,7 +344,7 @@ func (lbc *LoadBalancerController) sync(key string) (err error) { // updateIngressStatus updates the IP and annotations of a loadbalancer. // The annotations are parsed by kubectl describe. func (lbc *LoadBalancerController) updateIngressStatus(l7 *loadbalancers.L7, ing extensions.Ingress) error { - ingClient := lbc.client.Extensions().Ingresses(ing.Namespace) + ingClient := lbc.client.ExtensionsV1beta1().Ingresses(ing.Namespace) // Update IP through update/status endpoint ip := l7.GetIP() diff --git a/controllers/gce/main.go b/controllers/gce/main.go index c3544044b..2e526117e 100644 --- a/controllers/gce/main.go +++ b/controllers/gce/main.go @@ -385,7 +385,7 @@ func getClusterUID(kubeClient kubernetes.Interface, name string) (string, error) } // Check if the cluster has an Ingress with ip - ings, err := kubeClient.Extensions().Ingresses(api.NamespaceAll).List(meta_v1.ListOptions{ + ings, err := kubeClient.ExtensionsV1beta1().Ingresses(api.NamespaceAll).List(meta_v1.ListOptions{ LabelSelector: labels.Everything().String(), }) if err != nil { diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go index ae64957f6..ee6acda2f 100644 --- a/core/pkg/ingress/controller/controller.go +++ b/core/pkg/ingress/controller/controller.go @@ -273,7 +273,7 @@ func newIngressController(config *Configuration) *GenericController { } ic.ingLister.Store, ic.ingController = cache.NewInformer( - cache.NewListWatchFromClient(ic.cfg.Client.Extensions().RESTClient(), "ingresses", ic.cfg.Namespace, fields.Everything()), + cache.NewListWatchFromClient(ic.cfg.Client.ExtensionsV1beta1().RESTClient(), "ingresses", ic.cfg.Namespace, fields.Everything()), &extensions.Ingress{}, ic.cfg.ResyncPeriod, ingEventHandler) ic.endpLister.Store, ic.endpController = cache.NewInformer( diff --git a/core/pkg/ingress/status/status.go b/core/pkg/ingress/status/status.go index 5511afc4c..b0f712de3 100644 --- a/core/pkg/ingress/status/status.go +++ b/core/pkg/ingress/status/status.go @@ -285,7 +285,7 @@ func (s *statusSync) updateStatus(newIPs []api_v1.LoadBalancerIngress) { go func(wg *sync.WaitGroup, ing *extensions.Ingress) { defer wg.Done() - ingClient := s.Client.Extensions().Ingresses(ing.Namespace) + ingClient := s.Client.ExtensionsV1beta1().Ingresses(ing.Namespace) currIng, err := ingClient.Get(ing.Name, meta_v1.GetOptions{}) if err != nil { glog.Errorf("unexpected error searching Ingress %v/%v: %v", ing.Namespace, ing.Name, err) diff --git a/core/pkg/ingress/status/status_test.go b/core/pkg/ingress/status/status_test.go index e5b3f26f6..b612d3f67 100644 --- a/core/pkg/ingress/status/status_test.go +++ b/core/pkg/ingress/status/status_test.go @@ -286,7 +286,7 @@ func TestStatusActions(t *testing.T) { newIPs := []api_v1.LoadBalancerIngress{{ IP: "11.0.0.2", }} - fooIngress1, err1 := fk.Client.Extensions().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_1", meta_v1.GetOptions{}) + fooIngress1, err1 := fk.Client.ExtensionsV1beta1().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_1", meta_v1.GetOptions{}) if err1 != nil { t.Fatalf("unexpected error") } @@ -299,7 +299,7 @@ func TestStatusActions(t *testing.T) { fk.Shutdown() // ingress should be empty newIPs2 := []api_v1.LoadBalancerIngress{} - fooIngress2, err2 := fk.Client.Extensions().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_1", meta_v1.GetOptions{}) + fooIngress2, err2 := fk.Client.ExtensionsV1beta1().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_1", meta_v1.GetOptions{}) if err2 != nil { t.Fatalf("unexpected error") } @@ -308,7 +308,7 @@ func TestStatusActions(t *testing.T) { t.Fatalf("returned %v but expected %v", fooIngress2CurIPs, newIPs2) } - oic, err := fk.Client.Extensions().Ingresses(api.NamespaceDefault).Get("foo_ingress_different_class", meta_v1.GetOptions{}) + oic, err := fk.Client.ExtensionsV1beta1().Ingresses(api.NamespaceDefault).Get("foo_ingress_different_class", meta_v1.GetOptions{}) if err != nil { t.Fatalf("unexpected error") } @@ -376,7 +376,7 @@ func TestUpdateStatus(t *testing.T) { sort.Sort(loadBalancerIngressByIP(newIPs)) fk.updateStatus(newIPs) - fooIngress1, err1 := fk.Client.Extensions().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_1", meta_v1.GetOptions{}) + fooIngress1, err1 := fk.Client.ExtensionsV1beta1().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_1", meta_v1.GetOptions{}) if err1 != nil { t.Fatalf("unexpected error") } @@ -385,7 +385,7 @@ func TestUpdateStatus(t *testing.T) { t.Fatalf("returned %v but expected %v", fooIngress1CurIPs, newIPs) } - fooIngress2, err2 := fk.Client.Extensions().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_2", meta_v1.GetOptions{}) + fooIngress2, err2 := fk.Client.ExtensionsV1beta1().Ingresses(api_v1.NamespaceDefault).Get("foo_ingress_2", meta_v1.GetOptions{}) if err2 != nil { t.Fatalf("unexpected error") }