Merge branch 'master' into addon-manager

x13n · web-flow · commit ad6996170b63 · 2017-11-14T09:36:20.000+01:00
diff --git a/pkg/cloudprovider/providers/openstack/BUILD b/pkg/cloudprovider/providers/openstack/BUILD
@@ -20,8 +20,8 @@ go_library(
     ],
     importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack",
     deps = [
-        "//pkg/api/v1/helper:go_default_library",
         "//pkg/api/v1/service:go_default_library",
+        "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/util/mount:go_default_library",
diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go
@@ -42,7 +42,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	netutil "k8s.io/apimachinery/pkg/util/net"
 	certutil "k8s.io/client-go/util/cert"
-	v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
+	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/controller"
 )

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ import (`
`42`	`42`	`"k8s.io/apimachinery/pkg/types"`
`43`	`43`	`netutil "k8s.io/apimachinery/pkg/util/net"`
`44`	`44`	`certutil "k8s.io/client-go/util/cert"`
`45`		`- v1helper "k8s.io/kubernetes/pkg/api/v1/helper"`
	`45`	`+ v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"`
`46`	`46`	`"k8s.io/kubernetes/pkg/cloudprovider"`
`47`	`47`	`"k8s.io/kubernetes/pkg/controller"`
`48`	`48`	`)`