generated move results

openshift · Nov 28, 2017 · 9d41cbe · 9d41cbe
1 parent b505911
commit 9d41cbe
Show file tree

Hide file tree

Showing 320 changed files with 345 additions and 4,970 deletions.
diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go
@@ -48,15 +48,15 @@ import (
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
 
-	deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
-	authorizationv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
-	buildv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
-	imagev1 "github.com/openshift/origin/pkg/image/apis/image/v1"
-	oauthv1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"
-	projectv1 "github.com/openshift/origin/pkg/project/apis/project/v1"
-	routev1 "github.com/openshift/origin/pkg/route/apis/route/v1"
-	templatev1 "github.com/openshift/origin/pkg/template/apis/template/v1"
-	userv1 "github.com/openshift/origin/pkg/user/apis/user/v1"
+	deployv1 "github.com/openshift/api/apps/v1"
+	authorizationv1 "github.com/openshift/api/authorization/v1"
+	buildv1 "github.com/openshift/api/build/v1"
+	imagev1 "github.com/openshift/api/image/v1"
+	oauthv1 "github.com/openshift/api/oauth/v1"
+	projectv1 "github.com/openshift/api/project/v1"
+	routev1 "github.com/openshift/api/route/v1"
+	templatev1 "github.com/openshift/api/template/v1"
+	userv1 "github.com/openshift/api/user/v1"
 )
 
 func init() {

diff --git a/pkg/api/latest/latest_test.go b/pkg/api/latest/latest_test.go
@@ -7,9 +7,9 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
 
+	userapiv1 "github.com/openshift/api/user/v1"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
 	_ "github.com/openshift/origin/pkg/user/apis/user/install"
-	userapiv1 "github.com/openshift/origin/pkg/user/apis/user/v1"
 )
 
 func TestRESTRootScope(t *testing.T) {

diff --git a/pkg/api/meta/pods.go b/pkg/api/meta/pods.go
@@ -17,10 +17,10 @@ import (
 	"k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 
+	deployapiv1 "github.com/openshift/api/apps/v1"
+	securityapiv1 "github.com/openshift/api/security/v1"
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
-	deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	securityapi "github.com/openshift/origin/pkg/security/apis/security"
-	securityapiv1 "github.com/openshift/origin/pkg/security/apis/security/v1"
 )
 
 type ContainerMutator interface {

diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go
@@ -26,10 +26,10 @@ import (
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 
+	buildv1 "github.com/openshift/api/build/v1"
 	deploy "github.com/openshift/origin/pkg/apps/apis/apps"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	build "github.com/openshift/origin/pkg/build/apis/build"
-	buildv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
 	image "github.com/openshift/origin/pkg/image/apis/image"
 	oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
 	route "github.com/openshift/origin/pkg/route/apis/route"

diff --git a/pkg/api/v1/register.go b/pkg/api/v1/register.go
@@ -1,17 +1,17 @@
 package v1
 
 import (
-	_ "github.com/openshift/origin/pkg/apps/apis/apps/v1"
-	_ "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
-	_ "github.com/openshift/origin/pkg/build/apis/build/v1"
-	_ "github.com/openshift/origin/pkg/image/apis/image/v1"
-	_ "github.com/openshift/origin/pkg/network/apis/network/v1"
-	_ "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"
-	_ "github.com/openshift/origin/pkg/project/apis/project/v1"
-	_ "github.com/openshift/origin/pkg/route/apis/route/v1"
-	_ "github.com/openshift/origin/pkg/security/apis/security/v1"
-	_ "github.com/openshift/origin/pkg/template/apis/template/v1"
-	_ "github.com/openshift/origin/pkg/user/apis/user/v1"
+	_ "github.com/openshift/api/apps/v1"
+	_ "github.com/openshift/api/authorization/v1"
+	_ "github.com/openshift/api/build/v1"
+	_ "github.com/openshift/api/image/v1"
+	_ "github.com/openshift/api/network/v1"
+	_ "github.com/openshift/api/oauth/v1"
+	_ "github.com/openshift/api/project/v1"
+	_ "github.com/openshift/api/route/v1"
+	_ "github.com/openshift/api/security/v1"
+	_ "github.com/openshift/api/template/v1"
+	_ "github.com/openshift/api/user/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

diff --git a/pkg/apps/apis/apps/install/install.go b/pkg/apps/apis/apps/install/install.go
@@ -6,9 +6,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	kapi "k8s.io/kubernetes/pkg/api"
 
+	deployapiv1 "github.com/openshift/api/apps/v1"
 	legacy "github.com/openshift/origin/pkg/api/legacy"
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
-	deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 

diff --git a/pkg/apps/apis/apps/test/ok.go b/pkg/apps/apis/apps/test/ok.go
@@ -9,8 +9,8 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
 
+	deployv1 "github.com/openshift/api/apps/v1"
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
-	deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 )