Skip to content

Commit 9d41cbe

Browse files
committed
generated move results
1 parent b505911 commit 9d41cbe

File tree

320 files changed

+345
-4970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+345
-4970
lines changed

pkg/api/install/install.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ import (
4848
templateapi "github.com/openshift/origin/pkg/template/apis/template"
4949
userapi "github.com/openshift/origin/pkg/user/apis/user"
5050

51-
deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
52-
authorizationv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
53-
buildv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
54-
imagev1 "github.com/openshift/origin/pkg/image/apis/image/v1"
55-
oauthv1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"
56-
projectv1 "github.com/openshift/origin/pkg/project/apis/project/v1"
57-
routev1 "github.com/openshift/origin/pkg/route/apis/route/v1"
58-
templatev1 "github.com/openshift/origin/pkg/template/apis/template/v1"
59-
userv1 "github.com/openshift/origin/pkg/user/apis/user/v1"
51+
deployv1 "github.com/openshift/api/apps/v1"
52+
authorizationv1 "github.com/openshift/api/authorization/v1"
53+
buildv1 "github.com/openshift/api/build/v1"
54+
imagev1 "github.com/openshift/api/image/v1"
55+
oauthv1 "github.com/openshift/api/oauth/v1"
56+
projectv1 "github.com/openshift/api/project/v1"
57+
routev1 "github.com/openshift/api/route/v1"
58+
templatev1 "github.com/openshift/api/template/v1"
59+
userv1 "github.com/openshift/api/user/v1"
6060
)
6161

6262
func init() {

pkg/api/latest/latest_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
kapi "k8s.io/kubernetes/pkg/api"
88
_ "k8s.io/kubernetes/pkg/api/install"
99

10+
userapiv1 "github.com/openshift/api/user/v1"
1011
userapi "github.com/openshift/origin/pkg/user/apis/user"
1112
_ "github.com/openshift/origin/pkg/user/apis/user/install"
12-
userapiv1 "github.com/openshift/origin/pkg/user/apis/user/v1"
1313
)
1414

1515
func TestRESTRootScope(t *testing.T) {

pkg/api/meta/pods.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
"k8s.io/kubernetes/pkg/apis/batch"
1818
"k8s.io/kubernetes/pkg/apis/extensions"
1919

20+
deployapiv1 "github.com/openshift/api/apps/v1"
21+
securityapiv1 "github.com/openshift/api/security/v1"
2022
deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
21-
deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
2223
securityapi "github.com/openshift/origin/pkg/security/apis/security"
23-
securityapiv1 "github.com/openshift/origin/pkg/security/apis/security/v1"
2424
)
2525

2626
type ContainerMutator interface {

pkg/api/serialization_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"k8s.io/kubernetes/pkg/apis/extensions"
2727
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
2828

29+
buildv1 "github.com/openshift/api/build/v1"
2930
deploy "github.com/openshift/origin/pkg/apps/apis/apps"
3031
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
3132
build "github.com/openshift/origin/pkg/build/apis/build"
32-
buildv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
3333
image "github.com/openshift/origin/pkg/image/apis/image"
3434
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
3535
route "github.com/openshift/origin/pkg/route/apis/route"

pkg/api/v1/register.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package v1
22

33
import (
4-
_ "github.com/openshift/origin/pkg/apps/apis/apps/v1"
5-
_ "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
6-
_ "github.com/openshift/origin/pkg/build/apis/build/v1"
7-
_ "github.com/openshift/origin/pkg/image/apis/image/v1"
8-
_ "github.com/openshift/origin/pkg/network/apis/network/v1"
9-
_ "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"
10-
_ "github.com/openshift/origin/pkg/project/apis/project/v1"
11-
_ "github.com/openshift/origin/pkg/route/apis/route/v1"
12-
_ "github.com/openshift/origin/pkg/security/apis/security/v1"
13-
_ "github.com/openshift/origin/pkg/template/apis/template/v1"
14-
_ "github.com/openshift/origin/pkg/user/apis/user/v1"
4+
_ "github.com/openshift/api/apps/v1"
5+
_ "github.com/openshift/api/authorization/v1"
6+
_ "github.com/openshift/api/build/v1"
7+
_ "github.com/openshift/api/image/v1"
8+
_ "github.com/openshift/api/network/v1"
9+
_ "github.com/openshift/api/oauth/v1"
10+
_ "github.com/openshift/api/project/v1"
11+
_ "github.com/openshift/api/route/v1"
12+
_ "github.com/openshift/api/security/v1"
13+
_ "github.com/openshift/api/template/v1"
14+
_ "github.com/openshift/api/user/v1"
1515
"k8s.io/apimachinery/pkg/runtime/schema"
1616
)
1717

pkg/apps/apis/apps/install/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"k8s.io/apimachinery/pkg/runtime"
77
kapi "k8s.io/kubernetes/pkg/api"
88

9+
deployapiv1 "github.com/openshift/api/apps/v1"
910
legacy "github.com/openshift/origin/pkg/api/legacy"
1011
deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
11-
deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
1212
"k8s.io/apimachinery/pkg/util/sets"
1313
)
1414

pkg/apps/apis/apps/test/ok.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
kapi "k8s.io/kubernetes/pkg/api"
1010
"k8s.io/kubernetes/pkg/apis/autoscaling"
1111

12+
deployv1 "github.com/openshift/api/apps/v1"
1213
deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
13-
deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
1414
imageapi "github.com/openshift/origin/pkg/image/apis/image"
1515
)
1616

0 commit comments

Comments
 (0)