diff --git a/core/pkg/cache/main.go b/core/pkg/cache/main.go
index 04257a0ba..920c17740 100644
--- a/core/pkg/cache/main.go
+++ b/core/pkg/cache/main.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package cache
 
-import "k8s.io/kubernetes/pkg/client/cache"
+import "k8s.io/client-go/tools/cache"
 
 // StoreToIngressLister makes a Store that lists Ingress.
 type StoreToIngressLister struct {
diff --git a/core/pkg/cache/main_test.go b/core/pkg/cache/main_test.go
index 72dc7617e..dc1a29d2f 100644
--- a/core/pkg/cache/main_test.go
+++ b/core/pkg/cache/main_test.go
@@ -19,10 +19,10 @@ package cache
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/client/cache"
-	"k8s.io/kubernetes/pkg/util/sets"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/pkg/util/sets"
 )
 
 func TestStoreToIngressLister(t *testing.T) {
diff --git a/core/pkg/ingress/annotations/auth/main.go b/core/pkg/ingress/annotations/auth/main.go
index fe2167f03..7ebe0af5c 100644
--- a/core/pkg/ingress/annotations/auth/main.go
+++ b/core/pkg/ingress/annotations/auth/main.go
@@ -24,8 +24,8 @@ import (
 	"regexp"
 
 	"github.com/pkg/errors"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
@@ -121,7 +121,7 @@ func (a auth) Parse(ing *extensions.Ingress) (interface{}, error) {
 
 // dumpSecret dumps the content of a secret into a file
 // in the expected format for the specified authorization
-func dumpSecret(filename string, secret *api.Secret) error {
+func dumpSecret(filename string, secret *v1.Secret) error {
 	val, ok := secret.Data["auth"]
 	if !ok {
 		return ing_errors.LocationDenied{
diff --git a/core/pkg/ingress/annotations/auth/main_test.go b/core/pkg/ingress/annotations/auth/main_test.go
index 6d4027313..cd28e06d9 100644
--- a/core/pkg/ingress/annotations/auth/main_test.go
+++ b/core/pkg/ingress/annotations/auth/main_test.go
@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/authreq/main.go b/core/pkg/ingress/annotations/authreq/main.go
index 31c208507..40d6cb8cc 100644
--- a/core/pkg/ingress/annotations/authreq/main.go
+++ b/core/pkg/ingress/annotations/authreq/main.go
@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"strings"
 
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
diff --git a/core/pkg/ingress/annotations/authreq/main_test.go b/core/pkg/ingress/annotations/authreq/main_test.go
index 696d8bdc0..c0d97b80f 100644
--- a/core/pkg/ingress/annotations/authreq/main_test.go
+++ b/core/pkg/ingress/annotations/authreq/main_test.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/authtls/main.go b/core/pkg/ingress/annotations/authtls/main.go
index 143353249..6f9056d34 100644
--- a/core/pkg/ingress/annotations/authtls/main.go
+++ b/core/pkg/ingress/annotations/authtls/main.go
@@ -18,7 +18,7 @@ package authtls
 
 import (
 	"github.com/pkg/errors"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
diff --git a/core/pkg/ingress/annotations/authtls/main_test.go b/core/pkg/ingress/annotations/authtls/main_test.go
index b1f4886f6..9d3969909 100644
--- a/core/pkg/ingress/annotations/authtls/main_test.go
+++ b/core/pkg/ingress/annotations/authtls/main_test.go
@@ -19,9 +19,9 @@ package authtls
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/cors/main.go b/core/pkg/ingress/annotations/cors/main.go
index 71195863f..b8e6d8079 100644
--- a/core/pkg/ingress/annotations/cors/main.go
+++ b/core/pkg/ingress/annotations/cors/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package cors
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 )
diff --git a/core/pkg/ingress/annotations/cors/main_test.go b/core/pkg/ingress/annotations/cors/main_test.go
index 61521f301..dd054f98f 100644
--- a/core/pkg/ingress/annotations/cors/main_test.go
+++ b/core/pkg/ingress/annotations/cors/main_test.go
@@ -19,8 +19,8 @@ package cors
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
 )
 
 const (
diff --git a/core/pkg/ingress/annotations/healthcheck/main.go b/core/pkg/ingress/annotations/healthcheck/main.go
index 493195154..6423e8913 100644
--- a/core/pkg/ingress/annotations/healthcheck/main.go
+++ b/core/pkg/ingress/annotations/healthcheck/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package healthcheck
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	"k8s.io/ingress/core/pkg/ingress/resolver"
diff --git a/core/pkg/ingress/annotations/healthcheck/main_test.go b/core/pkg/ingress/annotations/healthcheck/main_test.go
index 21166cbe0..877783251 100644
--- a/core/pkg/ingress/annotations/healthcheck/main_test.go
+++ b/core/pkg/ingress/annotations/healthcheck/main_test.go
@@ -19,9 +19,9 @@ package healthcheck
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 
 	"k8s.io/ingress/core/pkg/ingress/defaults"
 )
diff --git a/core/pkg/ingress/annotations/ipwhitelist/main.go b/core/pkg/ingress/annotations/ipwhitelist/main.go
index 0e44ff9d6..ceccc4c37 100644
--- a/core/pkg/ingress/annotations/ipwhitelist/main.go
+++ b/core/pkg/ingress/annotations/ipwhitelist/main.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/util/net/sets"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
diff --git a/core/pkg/ingress/annotations/ipwhitelist/main_test.go b/core/pkg/ingress/annotations/ipwhitelist/main_test.go
index d3f60adc1..ad6f5e0ad 100644
--- a/core/pkg/ingress/annotations/ipwhitelist/main_test.go
+++ b/core/pkg/ingress/annotations/ipwhitelist/main_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 
 	"k8s.io/ingress/core/pkg/ingress/defaults"
 )
diff --git a/core/pkg/ingress/annotations/parser/main.go b/core/pkg/ingress/annotations/parser/main.go
index bff6f2210..1289b2764 100644
--- a/core/pkg/ingress/annotations/parser/main.go
+++ b/core/pkg/ingress/annotations/parser/main.go
@@ -19,7 +19,7 @@ package parser
 import (
 	"strconv"
 
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/errors"
 )
diff --git a/core/pkg/ingress/annotations/parser/main_test.go b/core/pkg/ingress/annotations/parser/main_test.go
index 099e76556..42d47be95 100644
--- a/core/pkg/ingress/annotations/parser/main_test.go
+++ b/core/pkg/ingress/annotations/parser/main_test.go
@@ -19,8 +19,8 @@ package parser
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/portinredirect/main.go b/core/pkg/ingress/annotations/portinredirect/main.go
index 1b16e8dcd..6331a6132 100644
--- a/core/pkg/ingress/annotations/portinredirect/main.go
+++ b/core/pkg/ingress/annotations/portinredirect/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package portinredirect
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	"k8s.io/ingress/core/pkg/ingress/resolver"
diff --git a/core/pkg/ingress/annotations/portinredirect/main_test.go b/core/pkg/ingress/annotations/portinredirect/main_test.go
index cb6403fd1..db3ecd0d2 100644
--- a/core/pkg/ingress/annotations/portinredirect/main_test.go
+++ b/core/pkg/ingress/annotations/portinredirect/main_test.go
@@ -19,9 +19,9 @@ package portinredirect
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 
 	"fmt"
 
diff --git a/core/pkg/ingress/annotations/proxy/main.go b/core/pkg/ingress/annotations/proxy/main.go
index c1ee7e47b..7118866ae 100644
--- a/core/pkg/ingress/annotations/proxy/main.go
+++ b/core/pkg/ingress/annotations/proxy/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package proxy
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	"k8s.io/ingress/core/pkg/ingress/resolver"
diff --git a/core/pkg/ingress/annotations/proxy/main_test.go b/core/pkg/ingress/annotations/proxy/main_test.go
index 8671c42a4..7da8713c4 100644
--- a/core/pkg/ingress/annotations/proxy/main_test.go
+++ b/core/pkg/ingress/annotations/proxy/main_test.go
@@ -19,9 +19,9 @@ package proxy
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 
 	"k8s.io/ingress/core/pkg/ingress/defaults"
 )
diff --git a/core/pkg/ingress/annotations/ratelimit/main.go b/core/pkg/ingress/annotations/ratelimit/main.go
index f3ca328b7..df66a85e3 100644
--- a/core/pkg/ingress/annotations/ratelimit/main.go
+++ b/core/pkg/ingress/annotations/ratelimit/main.go
@@ -19,7 +19,7 @@ package ratelimit
 import (
 	"fmt"
 
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 )
diff --git a/core/pkg/ingress/annotations/ratelimit/main_test.go b/core/pkg/ingress/annotations/ratelimit/main_test.go
index 46ad25d54..cb220257d 100644
--- a/core/pkg/ingress/annotations/ratelimit/main_test.go
+++ b/core/pkg/ingress/annotations/ratelimit/main_test.go
@@ -19,9 +19,9 @@ package ratelimit
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/rewrite/main.go b/core/pkg/ingress/annotations/rewrite/main.go
index 14dec6616..68ffa38be 100644
--- a/core/pkg/ingress/annotations/rewrite/main.go
+++ b/core/pkg/ingress/annotations/rewrite/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package rewrite
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	"k8s.io/ingress/core/pkg/ingress/resolver"
diff --git a/core/pkg/ingress/annotations/rewrite/main_test.go b/core/pkg/ingress/annotations/rewrite/main_test.go
index f4f0ed973..1ee07fc88 100644
--- a/core/pkg/ingress/annotations/rewrite/main_test.go
+++ b/core/pkg/ingress/annotations/rewrite/main_test.go
@@ -19,9 +19,9 @@ package rewrite
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 
 	"k8s.io/ingress/core/pkg/ingress/defaults"
 )
diff --git a/core/pkg/ingress/annotations/secureupstream/main.go b/core/pkg/ingress/annotations/secureupstream/main.go
index 732b577cd..f20c2a89d 100644
--- a/core/pkg/ingress/annotations/secureupstream/main.go
+++ b/core/pkg/ingress/annotations/secureupstream/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package secureupstream
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 )
diff --git a/core/pkg/ingress/annotations/secureupstream/main_test.go b/core/pkg/ingress/annotations/secureupstream/main_test.go
index a841e28c7..639cdf4b0 100644
--- a/core/pkg/ingress/annotations/secureupstream/main_test.go
+++ b/core/pkg/ingress/annotations/secureupstream/main_test.go
@@ -19,9 +19,9 @@ package secureupstream
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/service/service.go b/core/pkg/ingress/annotations/service/service.go
index 0615645c8..fad0c09b3 100644
--- a/core/pkg/ingress/annotations/service/service.go
+++ b/core/pkg/ingress/annotations/service/service.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"k8s.io/kubernetes/pkg/api"
+	api "k8s.io/client-go/pkg/api/v1"
 
 	"github.com/golang/glog"
 )
diff --git a/core/pkg/ingress/annotations/service/service_test.go b/core/pkg/ingress/annotations/service/service_test.go
index abfa0f907..4360bd8e4 100644
--- a/core/pkg/ingress/annotations/service/service_test.go
+++ b/core/pkg/ingress/annotations/service/service_test.go
@@ -18,8 +18,8 @@ package service
 
 import (
 	"encoding/json"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/api/v1/unversioned"
 	"testing"
 )
 
diff --git a/core/pkg/ingress/annotations/sessionaffinity/main.go b/core/pkg/ingress/annotations/sessionaffinity/main.go
index d506e844e..d8f45b874 100644
--- a/core/pkg/ingress/annotations/sessionaffinity/main.go
+++ b/core/pkg/ingress/annotations/sessionaffinity/main.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 )
diff --git a/core/pkg/ingress/annotations/sessionaffinity/main_test.go b/core/pkg/ingress/annotations/sessionaffinity/main_test.go
index 3a3a17200..c2639c2eb 100644
--- a/core/pkg/ingress/annotations/sessionaffinity/main_test.go
+++ b/core/pkg/ingress/annotations/sessionaffinity/main_test.go
@@ -19,9 +19,9 @@ package sessionaffinity
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/annotations/sslpassthrough/main.go b/core/pkg/ingress/annotations/sslpassthrough/main.go
index 99fcd0ab3..62ae68b2e 100644
--- a/core/pkg/ingress/annotations/sslpassthrough/main.go
+++ b/core/pkg/ingress/annotations/sslpassthrough/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package sslpassthrough
 
 import (
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
 	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
diff --git a/core/pkg/ingress/annotations/sslpassthrough/main_test.go b/core/pkg/ingress/annotations/sslpassthrough/main_test.go
index 3f1f6286b..42ca0a1ec 100644
--- a/core/pkg/ingress/annotations/sslpassthrough/main_test.go
+++ b/core/pkg/ingress/annotations/sslpassthrough/main_test.go
@@ -19,9 +19,9 @@ package sslpassthrough
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func buildIngress() *extensions.Ingress {
diff --git a/core/pkg/ingress/controller/annotations.go b/core/pkg/ingress/controller/annotations.go
index 5a54e83cd..05448cd66 100644
--- a/core/pkg/ingress/controller/annotations.go
+++ b/core/pkg/ingress/controller/annotations.go
@@ -19,7 +19,7 @@ package controller
 import (
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress/annotations/auth"
 	"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
diff --git a/core/pkg/ingress/controller/annotations_test.go b/core/pkg/ingress/controller/annotations_test.go
index 1b3b9b08d..f39a3fc1b 100644
--- a/core/pkg/ingress/controller/annotations_test.go
+++ b/core/pkg/ingress/controller/annotations_test.go
@@ -19,9 +19,9 @@ package controller
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/util/intstr"
 
 	"k8s.io/ingress/core/pkg/ingress/defaults"
 	"k8s.io/ingress/core/pkg/ingress/resolver"
diff --git a/core/pkg/ingress/controller/backend_ssl.go b/core/pkg/ingress/controller/backend_ssl.go
index 92c32fc8c..d9b938708 100644
--- a/core/pkg/ingress/controller/backend_ssl.go
+++ b/core/pkg/ingress/controller/backend_ssl.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/client/cache"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/tools/cache"
 
 	"k8s.io/ingress/core/pkg/ingress"
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go
index 0523d3063..61a98dafb 100644
--- a/core/pkg/ingress/controller/controller.go
+++ b/core/pkg/ingress/controller/controller.go
@@ -28,15 +28,15 @@ import (
 	"github.com/golang/glog"
 	"github.com/kylelemons/godebug/pretty"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/client/cache"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
-	"k8s.io/kubernetes/pkg/client/record"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/util/flowcontrol"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	clientset "k8s.io/client-go/kubernetes"
+	unversionedcore "k8s.io/client-go/kubernetes/typed/core/v1"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/pkg/util/flowcontrol"
 
 	cache_store "k8s.io/ingress/core/pkg/cache"
 	"k8s.io/ingress/core/pkg/ingress"
@@ -150,7 +150,7 @@ func newIngressController(config *Configuration) *GenericController {
 		stopLock:        &sync.Mutex{},
 		stopCh:          make(chan struct{}),
 		syncRateLimiter: flowcontrol.NewTokenBucketRateLimiter(0.1, 1),
-		recorder: eventBroadcaster.NewRecorder(api.EventSource{
+		recorder: eventBroadcaster.NewRecorder(v1.EventSource{
 			Component: "ingress-controller",
 		}),
 		sslCertTracker: newSSLCertTracker(),
@@ -169,7 +169,7 @@ func newIngressController(config *Configuration) *GenericController {
 				glog.Infof("ignoring add for ingress %v based on annotation %v", addIng.Name, ingressClassKey)
 				return
 			}
-			ic.recorder.Eventf(addIng, api.EventTypeNormal, "CREATE", fmt.Sprintf("Ingress %s/%s", addIng.Namespace, addIng.Name))
+			ic.recorder.Eventf(addIng, v1.EventTypeNormal, "CREATE", fmt.Sprintf("Ingress %s/%s", addIng.Namespace, addIng.Name))
 			ic.syncQueue.Enqueue(obj)
 		},
 		DeleteFunc: func(obj interface{}) {
@@ -178,7 +178,7 @@ func newIngressController(config *Configuration) *GenericController {
 				glog.Infof("ignoring delete for ingress %v based on annotation %v", delIng.Name, ingressClassKey)
 				return
 			}
-			ic.recorder.Eventf(delIng, api.EventTypeNormal, "DELETE", fmt.Sprintf("Ingress %s/%s", delIng.Namespace, delIng.Name))
+			ic.recorder.Eventf(delIng, v1.EventTypeNormal, "DELETE", fmt.Sprintf("Ingress %s/%s", delIng.Namespace, delIng.Name))
 			ic.syncQueue.Enqueue(obj)
 		},
 		UpdateFunc: func(old, cur interface{}) {
@@ -190,7 +190,7 @@ func newIngressController(config *Configuration) *GenericController {
 
 			if !reflect.DeepEqual(old, cur) {
 				upIng := cur.(*extensions.Ingress)
-				ic.recorder.Eventf(upIng, api.EventTypeNormal, "UPDATE", fmt.Sprintf("Ingress %s/%s", upIng.Namespace, upIng.Name))
+				ic.recorder.Eventf(upIng, v1.EventTypeNormal, "UPDATE", fmt.Sprintf("Ingress %s/%s", upIng.Namespace, upIng.Name))
 				// the referenced secret is different?
 				if diff := pretty.Compare(curIng.Spec.TLS, oldIng.Spec.TLS); diff != "" {
 					for _, secretName := range curIng.Spec.TLS {
@@ -216,16 +216,16 @@ func newIngressController(config *Configuration) *GenericController {
 
 	secrEventHandler := cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {
-			sec := obj.(*api.Secret)
+			sec := obj.(*v1.Secret)
 			ic.secretQueue.Enqueue(sec)
 		},
 		DeleteFunc: func(obj interface{}) {
-			sec := obj.(*api.Secret)
+			sec := obj.(*v1.Secret)
 			ic.sslCertTracker.Delete(fmt.Sprintf("%v/%v", sec.Namespace, sec.Name))
 		},
 		UpdateFunc: func(old, cur interface{}) {
 			if !reflect.DeepEqual(old, cur) {
-				sec := cur.(*api.Secret)
+				sec := cur.(*v1.Secret)
 				ic.secretQueue.Enqueue(sec)
 			}
 		},
@@ -247,7 +247,7 @@ func newIngressController(config *Configuration) *GenericController {
 
 	mapEventHandler := cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj interface{}) {
-			upCmap := obj.(*api.ConfigMap)
+			upCmap := obj.(*v1.ConfigMap)
 			mapKey := fmt.Sprintf("%s/%s", upCmap.Namespace, upCmap.Name)
 			if mapKey == ic.cfg.ConfigMapName {
 				glog.V(2).Infof("adding configmap %v to backend", mapKey)
@@ -256,7 +256,7 @@ func newIngressController(config *Configuration) *GenericController {
 		},
 		UpdateFunc: func(old, cur interface{}) {
 			if !reflect.DeepEqual(old, cur) {
-				upCmap := cur.(*api.ConfigMap)
+				upCmap := cur.(*v1.ConfigMap)
 				mapKey := fmt.Sprintf("%s/%s", upCmap.Namespace, upCmap.Name)
 				if mapKey == ic.cfg.ConfigMapName {
 					glog.V(2).Infof("updating configmap backend (%v)", mapKey)
@@ -264,7 +264,7 @@ func newIngressController(config *Configuration) *GenericController {
 				}
 				// updates to configuration configmaps can trigger an update
 				if mapKey == ic.cfg.ConfigMapName || mapKey == ic.cfg.TCPConfigMapName || mapKey == ic.cfg.UDPConfigMapName {
-					ic.recorder.Eventf(upCmap, api.EventTypeNormal, "UPDATE", fmt.Sprintf("ConfigMap %v", mapKey))
+					ic.recorder.Eventf(upCmap, v1.EventTypeNormal, "UPDATE", fmt.Sprintf("ConfigMap %v", mapKey))
 					ic.syncQueue.Enqueue(cur)
 				}
 			}
@@ -277,26 +277,26 @@ func newIngressController(config *Configuration) *GenericController {
 
 	ic.endpLister.Store, ic.endpController = cache.NewInformer(
 		cache.NewListWatchFromClient(ic.cfg.Client.Core().RESTClient(), "endpoints", ic.cfg.Namespace, fields.Everything()),
-		&api.Endpoints{}, ic.cfg.ResyncPeriod, eventHandler)
+		&v1.Endpoints{}, ic.cfg.ResyncPeriod, eventHandler)
 
 	ic.secrLister.Store, ic.secrController = cache.NewInformer(
 		cache.NewListWatchFromClient(ic.cfg.Client.Core().RESTClient(), "secrets", ic.cfg.Namespace, fields.Everything()),
-		&api.Secret{}, ic.cfg.ResyncPeriod, secrEventHandler)
+		&v1.Secret{}, ic.cfg.ResyncPeriod, secrEventHandler)
 
 	ic.mapLister.Store, ic.mapController = cache.NewInformer(
 		cache.NewListWatchFromClient(ic.cfg.Client.Core().RESTClient(), "configmaps", ic.cfg.Namespace, fields.Everything()),
-		&api.ConfigMap{}, ic.cfg.ResyncPeriod, mapEventHandler)
+		&v1.ConfigMap{}, ic.cfg.ResyncPeriod, mapEventHandler)
 
 	ic.svcLister.Indexer, ic.svcController = cache.NewIndexerInformer(
 		cache.NewListWatchFromClient(ic.cfg.Client.Core().RESTClient(), "services", ic.cfg.Namespace, fields.Everything()),
-		&api.Service{},
+		&v1.Service{},
 		ic.cfg.ResyncPeriod,
 		cache.ResourceEventHandlerFuncs{},
 		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 
 	ic.nodeLister.Store, ic.nodeController = cache.NewInformer(
 		cache.NewListWatchFromClient(ic.cfg.Client.Core().RESTClient(), "nodes", ic.cfg.Namespace, fields.Everything()),
-		&api.Node{}, ic.cfg.ResyncPeriod, eventHandler)
+		&v1.Node{}, ic.cfg.ResyncPeriod, eventHandler)
 
 	if config.UpdateStatus {
 		ic.syncStatus = status.NewStatusSyncer(status.Config{
@@ -346,7 +346,7 @@ func (ic GenericController) GetDefaultBackend() defaults.Backend {
 }
 
 // GetSecret searches for a secret in the local secrets Store
-func (ic GenericController) GetSecret(name string) (*api.Secret, error) {
+func (ic GenericController) GetSecret(name string) (*v1.Secret, error) {
 	s, exists, err := ic.secrLister.Store.GetByKey(name)
 	if err != nil {
 		return nil, err
@@ -354,10 +354,10 @@ func (ic GenericController) GetSecret(name string) (*api.Secret, error) {
 	if !exists {
 		return nil, fmt.Errorf("secret %v was not found", name)
 	}
-	return s.(*api.Secret), nil
+	return s.(*v1.Secret), nil
 }
 
-func (ic *GenericController) getConfigMap(ns, name string) (*api.ConfigMap, error) {
+func (ic *GenericController) getConfigMap(ns, name string) (*v1.ConfigMap, error) {
 	s, exists, err := ic.mapLister.Store.GetByKey(fmt.Sprintf("%v/%v", ns, name))
 	if err != nil {
 		return nil, err
@@ -365,7 +365,7 @@ func (ic *GenericController) getConfigMap(ns, name string) (*api.ConfigMap, erro
 	if !exists {
 		return nil, fmt.Errorf("configmap %v was not found", name)
 	}
-	return s.(*api.ConfigMap), nil
+	return s.(*v1.ConfigMap), nil
 }
 
 // sync collects all the pieces required to assemble the configuration file and
@@ -405,8 +405,8 @@ func (ic *GenericController) sync(key interface{}) error {
 	data, err := ic.cfg.Backend.OnUpdate(ingress.Configuration{
 		Backends:            upstreams,
 		Servers:             servers,
-		TCPEndpoints:        ic.getStreamServices(ic.cfg.TCPConfigMapName, api.ProtocolTCP),
-		UDPEndpoints:        ic.getStreamServices(ic.cfg.UDPConfigMapName, api.ProtocolUDP),
+		TCPEndpoints:        ic.getStreamServices(ic.cfg.TCPConfigMapName, v1.ProtocolTCP),
+		UDPEndpoints:        ic.getStreamServices(ic.cfg.UDPConfigMapName, v1.ProtocolUDP),
 		PassthroughBackends: passUpstreams,
 	})
 	if err != nil {
@@ -426,7 +426,7 @@ func (ic *GenericController) sync(key interface{}) error {
 	return nil
 }
 
-func (ic *GenericController) getStreamServices(configmapName string, proto api.Protocol) []*ingress.Location {
+func (ic *GenericController) getStreamServices(configmapName string, proto v1.Protocol) []*ingress.Location {
 	glog.V(3).Infof("obtaining information about stream services of type %v located in configmap %v", proto, configmapName)
 	if configmapName == "" {
 		// no configmap configured
@@ -487,7 +487,7 @@ func (ic *GenericController) getStreamServices(configmapName string, proto api.P
 			continue
 		}
 
-		svc := svcObj.(*api.Service)
+		svc := svcObj.(*v1.Service)
 
 		var endps []ingress.Endpoint
 		targetPort, err := strconv.Atoi(svcPort)
@@ -547,8 +547,8 @@ func (ic *GenericController) getDefaultUpstream() *ingress.Backend {
 		return upstream
 	}
 
-	svc := svcObj.(*api.Service)
-	endps := ic.getEndpoints(svc, svc.Spec.Ports[0].TargetPort, api.ProtocolTCP, &healthcheck.Upstream{})
+	svc := svcObj.(*v1.Service)
+	endps := ic.getEndpoints(svc, svc.Spec.Ports[0].TargetPort, v1.ProtocolTCP, &healthcheck.Upstream{})
 	if len(endps) == 0 {
 		glog.Warningf("service %v does not have any active endpoints", svcKey)
 		endps = []ingress.Endpoint{newDefaultServer()}
@@ -780,7 +780,7 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string,
 		return upstreams, err
 	}
 
-	svc := svcObj.(*api.Service)
+	svc := svcObj.(*v1.Service)
 	glog.V(3).Infof("obtaining port information for service %v", svcKey)
 	for _, servicePort := range svc.Spec.Ports {
 		// targetPort could be a string, use the name or the port (int)
@@ -788,7 +788,7 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string,
 			servicePort.TargetPort.String() == backendPort ||
 			servicePort.Name == backendPort {
 
-			endps := ic.getEndpoints(svc, servicePort.TargetPort, api.ProtocolTCP, hz)
+			endps := ic.getEndpoints(svc, servicePort.TargetPort, v1.ProtocolTCP, hz)
 			if len(endps) == 0 {
 				glog.Warningf("service %v does not have any active endpoints", svcKey)
 			}
@@ -939,9 +939,9 @@ func (ic *GenericController) createServers(data []interface{},
 
 // getEndpoints returns a list of <endpoint ip>:<port> for a given service/target port combination.
 func (ic *GenericController) getEndpoints(
-	s *api.Service,
+	s *v1.Service,
 	servicePort intstr.IntOrString,
-	proto api.Protocol,
+	proto v1.Protocol,
 	hz *healthcheck.Upstream) []ingress.Endpoint {
 	glog.V(3).Infof("getting endpoints for service %v/%v and port %v", s.Namespace, s.Name, servicePort.String())
 	ep, err := ic.endpLister.GetServiceEndpoints(s)
diff --git a/core/pkg/ingress/controller/launch.go b/core/pkg/ingress/controller/launch.go
index ce23f9a5c..548735a2f 100644
--- a/core/pkg/ingress/controller/launch.go
+++ b/core/pkg/ingress/controller/launch.go
@@ -14,8 +14,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/pflag"
 
-	"k8s.io/kubernetes/pkg/api"
-	client "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/client-go/pkg/api/v1"
+	client "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/healthz"
diff --git a/core/pkg/ingress/controller/named_port.go b/core/pkg/ingress/controller/named_port.go
index c1cdeb6e2..396381fbe 100644
--- a/core/pkg/ingress/controller/named_port.go
+++ b/core/pkg/ingress/controller/named_port.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/client-go/pkg/api"
 	podutil "k8s.io/kubernetes/pkg/api/pod"
 	"k8s.io/kubernetes/pkg/labels"
 
diff --git a/core/pkg/ingress/controller/util.go b/core/pkg/ingress/controller/util.go
index 7ff154d8f..faeda2841 100644
--- a/core/pkg/ingress/controller/util.go
+++ b/core/pkg/ingress/controller/util.go
@@ -22,7 +22,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/imdario/mergo"
 
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/apis/extensions"
 
 	"k8s.io/ingress/core/pkg/ingress"
 	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
diff --git a/core/pkg/ingress/controller/util_test.go b/core/pkg/ingress/controller/util_test.go
index 8ec84785a..c9d6deea6 100644
--- a/core/pkg/ingress/controller/util_test.go
+++ b/core/pkg/ingress/controller/util_test.go
@@ -29,8 +29,8 @@ import (
 	"k8s.io/ingress/core/pkg/ingress/annotations/ratelimit"
 	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
 	"k8s.io/ingress/core/pkg/ingress/resolver"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
 )
 
 type fakeError struct{}
diff --git a/core/pkg/ingress/resolver/main.go b/core/pkg/ingress/resolver/main.go
index 6017c8cb5..06763a9c9 100644
--- a/core/pkg/ingress/resolver/main.go
+++ b/core/pkg/ingress/resolver/main.go
@@ -17,7 +17,7 @@ limitations under the License.
 package resolver
 
 import (
-	"k8s.io/kubernetes/pkg/api"
+	api "k8s.io/client-go/pkg/api/v1"
 
 	"k8s.io/ingress/core/pkg/ingress/defaults"
 )
diff --git a/core/pkg/ingress/sort_ingress.go b/core/pkg/ingress/sort_ingress.go
index 621b95232..7c713d975 100644
--- a/core/pkg/ingress/sort_ingress.go
+++ b/core/pkg/ingress/sort_ingress.go
@@ -17,8 +17,8 @@ limitations under the License.
 package ingress
 
 import (
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
+	"k8s.io/client-go/pkg/api"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // BackendByNameServers sorts upstreams by name
@@ -86,4 +86,4 @@ type SSLCert struct {
 }
 
 // GetObjectKind implements the ObjectKind interface as a noop
-func (s SSLCert) GetObjectKind() unversioned.ObjectKind { return unversioned.EmptyObjectKind }
+func (s SSLCert) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
diff --git a/core/pkg/ingress/sort_ingress_test.go b/core/pkg/ingress/sort_ingress_test.go
index 52ceb7029..1157817d1 100644
--- a/core/pkg/ingress/sort_ingress_test.go
+++ b/core/pkg/ingress/sort_ingress_test.go
@@ -19,7 +19,7 @@ package ingress
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/client-go/pkg/api/v1"
 )
 
 func buildBackendByNameServers() BackendByNameServers {
diff --git a/core/pkg/ingress/status/election.go b/core/pkg/ingress/status/election.go
index 0710f1d82..09050fbac 100644
--- a/core/pkg/ingress/status/election.go
+++ b/core/pkg/ingress/status/election.go
@@ -23,15 +23,16 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/apimachinery/pkg/api/errors"
+	client "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/tools/record"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/errors"
-	client "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/leaderelection"
 	"k8s.io/kubernetes/pkg/client/leaderelection/resourcelock"
-	"k8s.io/kubernetes/pkg/client/record"
 )
 
-func getCurrentLeader(electionID, namespace string, c client.Interface) (string, *api.Endpoints, error) {
+func getCurrentLeader(electionID, namespace string, c client.Interface) (string, *v1.Endpoints, error) {
 	endpoints, err := c.Core().Endpoints(namespace).Get(electionID)
 	if err != nil {
 		return "", nil, err
@@ -59,8 +60,8 @@ func NewElection(electionID,
 	_, err := c.Core().Endpoints(namespace).Get(electionID)
 	if err != nil {
 		if errors.IsNotFound(err) {
-			_, err = c.Core().Endpoints(namespace).Create(&api.Endpoints{
-				ObjectMeta: api.ObjectMeta{
+			_, err = c.Core().Endpoints(namespace).Create(&v1.Endpoints{
+				ObjectMeta: v1.ObjectMeta{
 					Name: electionID,
 				},
 			})
@@ -93,7 +94,7 @@ func NewElection(electionID,
 	if err != nil {
 		return nil, err
 	}
-	recorder := broadcaster.NewRecorder(api.EventSource{
+	recorder := broadcaster.NewRecorder(v1.EventSource{
 		Component: "ingress-leader-elector",
 		Host:      hostname,
 	})
diff --git a/core/pkg/ingress/status/election_test.go b/core/pkg/ingress/status/election_test.go
index 4726aa8af..0e74284c1 100644
--- a/core/pkg/ingress/status/election_test.go
+++ b/core/pkg/ingress/status/election_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/client-go/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	tc "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
 	"k8s.io/kubernetes/pkg/client/leaderelection/resourcelock"
diff --git a/core/pkg/ingress/status/status.go b/core/pkg/ingress/status/status.go
index 09ddb702d..db19edc2b 100644
--- a/core/pkg/ingress/status/status.go
+++ b/core/pkg/ingress/status/status.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/pkg/client/leaderelection"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util/wait"
@@ -106,7 +106,7 @@ func (s statusSync) Shutdown() {
 	}
 
 	glog.Infof("removing address from ingress status (%v)", addrs)
-	s.updateStatus([]api.LoadBalancerIngress{})
+	s.updateStatus([]v1.LoadBalancerIngress{})
 }
 
 func (s *statusSync) run() {
@@ -204,7 +204,7 @@ func (s *statusSync) runningAddresess() ([]string, error) {
 	}
 
 	// get information about all the pods running the ingress controller
-	pods, err := s.Client.Core().Pods(s.pod.Namespace).List(api.ListOptions{
+	pods, err := s.Client.Core().Pods(s.pod.Namespace).List(v1.ListOptions{
 		LabelSelector: labels.SelectorFromSet(s.pod.Labels),
 	})
 	if err != nil {
@@ -222,13 +222,13 @@ func (s *statusSync) runningAddresess() ([]string, error) {
 }
 
 // sliceToStatus converts a slice of IP and/or hostnames to LoadBalancerIngress
-func sliceToStatus(endpoints []string) []api.LoadBalancerIngress {
-	lbi := []api.LoadBalancerIngress{}
+func sliceToStatus(endpoints []string) []v1.LoadBalancerIngress {
+	lbi := []v1.LoadBalancerIngress{}
 	for _, ep := range endpoints {
 		if net.ParseIP(ep) == nil {
-			lbi = append(lbi, api.LoadBalancerIngress{Hostname: ep})
+			lbi = append(lbi, v1.LoadBalancerIngress{Hostname: ep})
 		} else {
-			lbi = append(lbi, api.LoadBalancerIngress{IP: ep})
+			lbi = append(lbi, v1.LoadBalancerIngress{IP: ep})
 		}
 	}
 
@@ -236,7 +236,7 @@ func sliceToStatus(endpoints []string) []api.LoadBalancerIngress {
 	return lbi
 }
 
-func (s *statusSync) updateStatus(newIPs []api.LoadBalancerIngress) {
+func (s *statusSync) updateStatus(newIPs []v1.LoadBalancerIngress) {
 	ings := s.IngressLister.List()
 	var wg sync.WaitGroup
 	wg.Add(len(ings))
@@ -270,7 +270,7 @@ func (s *statusSync) updateStatus(newIPs []api.LoadBalancerIngress) {
 	wg.Wait()
 }
 
-func ingressSliceEqual(lhs, rhs []api.LoadBalancerIngress) bool {
+func ingressSliceEqual(lhs, rhs []v1.LoadBalancerIngress) bool {
 	if len(lhs) != len(rhs) {
 		return false
 	}
@@ -287,7 +287,7 @@ func ingressSliceEqual(lhs, rhs []api.LoadBalancerIngress) bool {
 }
 
 // loadBalancerIngressByIP sorts LoadBalancerIngress using the field IP
-type loadBalancerIngressByIP []api.LoadBalancerIngress
+type loadBalancerIngressByIP []v1.LoadBalancerIngress
 
 func (c loadBalancerIngressByIP) Len() int      { return len(c) }
 func (c loadBalancerIngressByIP) Swap(i, j int) { c[i], c[j] = c[j], c[i] }
diff --git a/core/pkg/ingress/status/status_test.go b/core/pkg/ingress/status/status_test.go
index 57e9f1e84..87e481987 100644
--- a/core/pkg/ingress/status/status_test.go
+++ b/core/pkg/ingress/status/status_test.go
@@ -26,11 +26,11 @@ import (
 	cache_store "k8s.io/ingress/core/pkg/cache"
 	"k8s.io/ingress/core/pkg/k8s"
 	"k8s.io/ingress/core/pkg/task"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/client/cache"
-	testclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
-	"k8s.io/kubernetes/pkg/util/sets"
+	"k8s.io/client-go/pkg/api/v1"
+	"k8s.io/client-go/pkg/apis/extensions"
+	"k8s.io/client-go/tools/cache"
+	testclient "k8s.io/client-go/kubernetes/fake"
+	"k8s.io/client-go/pkg/util/sets"
 )
 
 func buildLoadBalancerIngressByIP() loadBalancerIngressByIP {
diff --git a/core/pkg/ingress/types.go b/core/pkg/ingress/types.go
index 488945574..044cf8f9f 100644
--- a/core/pkg/ingress/types.go
+++ b/core/pkg/ingress/types.go
@@ -19,7 +19,7 @@ package ingress
 import (
 	"github.com/spf13/pflag"
 
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/client-go/pkg/api"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/healthz"
 
diff --git a/core/pkg/k8s/main.go b/core/pkg/k8s/main.go
index 2f0caf5e5..9bc54c8ad 100644
--- a/core/pkg/k8s/main.go
+++ b/core/pkg/k8s/main.go
@@ -21,12 +21,12 @@ import (
 	"os"
 	"strings"
 
-	"k8s.io/kubernetes/pkg/api"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/pkg/api/v1"
 )
 
 // IsValidService checks if exists a service with the specified name
-func IsValidService(kubeClient clientset.Interface, name string) (*api.Service, error) {
+func IsValidService(kubeClient clientset.Interface, name string) (*v1.Service, error) {
 	ns, name, err := ParseNameNS(name)
 	if err != nil {
 		return nil, err
@@ -35,7 +35,7 @@ func IsValidService(kubeClient clientset.Interface, name string) (*api.Service,
 }
 
 // IsValidSecret checks if exists a secret with the specified name
-func IsValidSecret(kubeClient clientset.Interface, name string) (*api.Secret, error) {
+func IsValidSecret(kubeClient clientset.Interface, name string) (*v1.Secret, error) {
 	ns, name, err := ParseNameNS(name)
 	if err != nil {
 		return nil, err
@@ -62,14 +62,15 @@ func GetNodeIP(kubeClient clientset.Interface, name string) string {
 	}
 
 	for _, address := range node.Status.Addresses {
-		if address.Type == api.NodeExternalIP {
+		if address.Type == v1.NodeExternalIP {
 			if address.Address != "" {
 				externalIP = address.Address
 				break
 			}
 		}
 
-		if externalIP == "" && address.Type == api.NodeLegacyHostIP {
+		//FIXME There's no v1.NodeLegacyHostIP
+		if externalIP == "" { // && address.Type == v1.NodeLegacyHostIP {
 			externalIP = address.Address
 		}
 	}
diff --git a/core/pkg/k8s/main_test.go b/core/pkg/k8s/main_test.go
index 384a7313d..6a0435967 100644
--- a/core/pkg/k8s/main_test.go
+++ b/core/pkg/k8s/main_test.go
@@ -19,8 +19,8 @@ package k8s
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
-	testclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
+	"k8s.io/client-go/pkg/api/v1"
+	testclient "k8s.io/client-go/kubernetes/fake"
 	"os"
 )
 
diff --git a/core/pkg/task/queue.go b/core/pkg/task/queue.go
index d29f3c2c9..aa021920b 100644
--- a/core/pkg/task/queue.go
+++ b/core/pkg/task/queue.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"k8s.io/kubernetes/pkg/client/cache"
+	"k8s.io/client-go/tools/cache"
 	"k8s.io/kubernetes/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/util/workqueue"
 )