Skip to content

Commit d4db27a

Browse files
deads2kdeads2k
committed
update register files
1 parent e491d07 commit d4db27a

File tree

26 files changed

+53
-472
lines changed

26 files changed

+53
-472
lines changed

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

Lines changed: 1 addition & 1 deletion
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"
109
legacy "github.com/openshift/origin/pkg/api/legacy"
1110
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/v1/register.go

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package v1
22

33
import (
4-
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
5-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4+
"github.com/openshift/api/apps/v1"
65
"k8s.io/apimachinery/pkg/runtime"
76
"k8s.io/apimachinery/pkg/runtime/schema"
87
)
@@ -16,10 +15,10 @@ var (
1615
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
1716
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
1817

19-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, RegisterDeepCopies, RegisterDefaults, RegisterConversions)
18+
LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions)
2019
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
2120

22-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, RegisterDefaults)
21+
SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, RegisterDefaults)
2322
AddToScheme = SchemeBuilder.AddToScheme
2423

2524
localSchemeBuilder = &SchemeBuilder
@@ -28,33 +27,3 @@ var (
2827
func Resource(resource string) schema.GroupResource {
2928
return SchemeGroupVersion.WithResource(resource).GroupResource()
3029
}
31-
32-
// Adds the list of known types to api.Scheme.
33-
func addLegacyKnownTypes(scheme *runtime.Scheme) error {
34-
types := []runtime.Object{
35-
&DeploymentConfig{},
36-
&DeploymentConfigList{},
37-
&DeploymentConfigRollback{},
38-
&DeploymentRequest{},
39-
&DeploymentLog{},
40-
&DeploymentLogOptions{},
41-
&extensionsv1beta1.Scale{},
42-
}
43-
scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
44-
return nil
45-
}
46-
47-
// Adds the list of known types to api.Scheme.
48-
func addKnownTypes(scheme *runtime.Scheme) error {
49-
scheme.AddKnownTypes(SchemeGroupVersion,
50-
&DeploymentConfig{},
51-
&DeploymentConfigList{},
52-
&DeploymentConfigRollback{},
53-
&DeploymentRequest{},
54-
&DeploymentLog{},
55-
&DeploymentLogOptions{},
56-
&extensionsv1beta1.Scale{},
57-
)
58-
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
59-
return nil
60-
}

‎pkg/authorization/apis/authorization/install/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"k8s.io/apimachinery/pkg/util/sets"
88
kapi "k8s.io/kubernetes/pkg/api"
99

10-
authorizationapiv1 "github.com/openshift/api/authorization/v1"
1110
"github.com/openshift/origin/pkg/api/legacy"
1211
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
1312
"github.com/openshift/origin/pkg/authorization/apis/authorization/rbacconversion"
13+
authorizationapiv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
1414
)
1515

1616
func init() {

‎pkg/authorization/apis/authorization/v1/register.go

Lines changed: 3 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
import (
4-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4+
"github.com/openshift/api/authorization/v1"
55
"k8s.io/apimachinery/pkg/runtime"
66
"k8s.io/apimachinery/pkg/runtime/schema"
77
)
@@ -15,10 +15,10 @@ var (
1515
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
1616
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
1717

18-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions)
18+
LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions)
1919
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
2020

21-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
21+
SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
2222
AddToScheme = SchemeBuilder.AddToScheme
2323

2424
localSchemeBuilder = &SchemeBuilder
@@ -27,78 +27,3 @@ var (
2727
func Resource(resource string) schema.GroupResource {
2828
return SchemeGroupVersion.WithResource(resource).GroupResource()
2929
}
30-
31-
// Adds the list of known types to api.Scheme.
32-
func addKnownTypes(scheme *runtime.Scheme) error {
33-
scheme.AddKnownTypes(SchemeGroupVersion,
34-
&Role{},
35-
&RoleBinding{},
36-
&Policy{},
37-
&PolicyBinding{},
38-
&PolicyList{},
39-
&PolicyBindingList{},
40-
&RoleBindingList{},
41-
&RoleList{},
42-
43-
&SelfSubjectRulesReview{},
44-
&SubjectRulesReview{},
45-
&ResourceAccessReview{},
46-
&SubjectAccessReview{},
47-
&LocalResourceAccessReview{},
48-
&LocalSubjectAccessReview{},
49-
&ResourceAccessReviewResponse{},
50-
&SubjectAccessReviewResponse{},
51-
&IsPersonalSubjectAccessReview{},
52-
53-
&ClusterRole{},
54-
&ClusterRoleBinding{},
55-
&ClusterPolicy{},
56-
&ClusterPolicyBinding{},
57-
&ClusterPolicyList{},
58-
&ClusterPolicyBindingList{},
59-
&ClusterRoleBindingList{},
60-
&ClusterRoleList{},
61-
62-
&RoleBindingRestriction{},
63-
&RoleBindingRestrictionList{},
64-
)
65-
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
66-
return nil
67-
}
68-
69-
func addLegacyKnownTypes(scheme *runtime.Scheme) error {
70-
types := []runtime.Object{
71-
&Role{},
72-
&RoleBinding{},
73-
&Policy{},
74-
&PolicyBinding{},
75-
&PolicyList{},
76-
&PolicyBindingList{},
77-
&RoleBindingList{},
78-
&RoleList{},
79-
80-
&SelfSubjectRulesReview{},
81-
&SubjectRulesReview{},
82-
&ResourceAccessReview{},
83-
&SubjectAccessReview{},
84-
&LocalResourceAccessReview{},
85-
&LocalSubjectAccessReview{},
86-
&ResourceAccessReviewResponse{},
87-
&SubjectAccessReviewResponse{},
88-
&IsPersonalSubjectAccessReview{},
89-
90-
&ClusterRole{},
91-
&ClusterRoleBinding{},
92-
&ClusterPolicy{},
93-
&ClusterPolicyBinding{},
94-
&ClusterPolicyList{},
95-
&ClusterPolicyBindingList{},
96-
&ClusterRoleBindingList{},
97-
&ClusterRoleList{},
98-
99-
&RoleBindingRestriction{},
100-
&RoleBindingRestrictionList{},
101-
}
102-
scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
103-
return nil
104-
}

‎pkg/build/apis/build/install/install.go

Lines changed: 1 addition & 1 deletion
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-
buildapiv1 "github.com/openshift/api/build/v1"
109
"github.com/openshift/origin/pkg/api/legacy"
1110
buildapi "github.com/openshift/origin/pkg/build/apis/build"
11+
buildapiv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
1212
"k8s.io/apimachinery/pkg/util/sets"
1313
)
1414

‎pkg/build/apis/build/v1/register.go

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package v1
22

33
import (
4-
kapiv1 "k8s.io/api/core/v1"
5-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4+
"github.com/openshift/api/build/v1"
65
"k8s.io/apimachinery/pkg/runtime"
76
"k8s.io/apimachinery/pkg/runtime/schema"
87
)
@@ -14,10 +13,10 @@ var (
1413
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
1514
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
1615

17-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions)
16+
LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions)
1817
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
1918

20-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
19+
SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults)
2120
AddToScheme = SchemeBuilder.AddToScheme
2221

2322
localSchemeBuilder = &SchemeBuilder
@@ -37,38 +36,3 @@ func LegacyResource(resource string) schema.GroupResource {
3736
func IsResourceOrLegacy(resource string, gr schema.GroupResource) bool {
3837
return gr == Resource(resource) || gr == LegacyResource(resource)
3938
}
40-
41-
// addKnownTypes adds types to API group
42-
func addKnownTypes(scheme *runtime.Scheme) error {
43-
scheme.AddKnownTypes(SchemeGroupVersion,
44-
&Build{},
45-
&BuildList{},
46-
&BuildConfig{},
47-
&BuildConfigList{},
48-
&BuildLog{},
49-
&BuildRequest{},
50-
&BuildLogOptions{},
51-
&BinaryBuildRequestOptions{},
52-
// This is needed for webhooks
53-
&kapiv1.PodProxyOptions{},
54-
)
55-
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
56-
return nil
57-
}
58-
59-
// addLegacyKnownTypes adds types to legacy API group
60-
// DEPRECATED: This will be deprecated and should not be modified.
61-
func addLegacyKnownTypes(scheme *runtime.Scheme) error {
62-
types := []runtime.Object{
63-
&Build{},
64-
&BuildList{},
65-
&BuildConfig{},
66-
&BuildConfigList{},
67-
&BuildLog{},
68-
&BuildRequest{},
69-
&BuildLogOptions{},
70-
&BinaryBuildRequestOptions{},
71-
}
72-
scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
73-
return nil
74-
}

‎pkg/image/apis/image/docker10/register.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,9 @@ var (
1515
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "1.0"}
1616
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "1.0"}
1717

18-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
19-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes)
18+
SchemeBuilder = runtime.NewSchemeBuilder()
19+
LegacySchemeBuilder = runtime.NewSchemeBuilder()
2020

2121
AddToScheme = SchemeBuilder.AddToScheme
2222
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
2323
)
24-
25-
// Adds the list of known types to api.Scheme.
26-
func addKnownTypes(scheme *runtime.Scheme) error {
27-
scheme.AddKnownTypes(SchemeGroupVersion,
28-
&DockerImage{},
29-
)
30-
return nil
31-
}
32-
33-
func addLegacyKnownTypes(scheme *runtime.Scheme) error {
34-
scheme.AddKnownTypes(LegacySchemeGroupVersion,
35-
&DockerImage{},
36-
)
37-
return nil
38-
}

‎pkg/image/apis/image/dockerpre012/register.go

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dockerpre012
22

33
import (
4+
"github.com/openshift/api/image/dockerpre012"
45
"k8s.io/apimachinery/pkg/runtime"
56
"k8s.io/apimachinery/pkg/runtime/schema"
67
)
@@ -14,24 +15,9 @@ var (
1415
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "pre012"}
1516
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "pre012"}
1617

17-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, RegisterDeepCopies)
18+
SchemeBuilder = runtime.NewSchemeBuilder(addConversionFuncs, dockerpre012.RegisterDeepCopies)
1819
AddToScheme = SchemeBuilder.AddToScheme
1920

20-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs)
21+
LegacySchemeBuilder = runtime.NewSchemeBuilder(addConversionFuncs)
2122
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
2223
)
23-
24-
// Adds the list of known types to api.Scheme.
25-
func addKnownTypes(scheme *runtime.Scheme) error {
26-
scheme.AddKnownTypes(SchemeGroupVersion,
27-
&DockerImage{},
28-
)
29-
return nil
30-
}
31-
32-
func addLegacyKnownTypes(scheme *runtime.Scheme) error {
33-
scheme.AddKnownTypes(LegacySchemeGroupVersion,
34-
&DockerImage{},
35-
)
36-
return nil
37-
}

‎pkg/image/apis/image/install/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/openshift/api/image/docker10"
1111
"github.com/openshift/api/image/dockerpre012"
12-
imageapiv1 "github.com/openshift/api/image/v1"
1312
"github.com/openshift/origin/pkg/api/legacy"
1413
imageapi "github.com/openshift/origin/pkg/image/apis/image"
14+
imageapiv1 "github.com/openshift/origin/pkg/image/apis/image/v1"
1515
)
1616

1717
func init() {

‎pkg/image/apis/image/v1/register.go

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package v1
22

33
import (
4-
kapiv1 "k8s.io/api/core/v1"
5-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
64
"k8s.io/apimachinery/pkg/runtime"
75
"k8s.io/apimachinery/pkg/runtime/schema"
86

97
"github.com/openshift/api/image/docker10"
108
"github.com/openshift/api/image/dockerpre012"
9+
"github.com/openshift/api/image/v1"
1110
)
1211

1312
const (
@@ -19,10 +18,10 @@ var (
1918
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
2019
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
2120

22-
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addLegacyFieldSelectorKeyConversions, RegisterDeepCopies, RegisterDefaults, RegisterConversions, docker10.AddToSchemeInCoreGroup, dockerpre012.AddToSchemeInCoreGroup)
21+
LegacySchemeBuilder = runtime.NewSchemeBuilder(v1.LegacySchemeBuilder.AddToScheme, addConversionFuncs, addLegacyFieldSelectorKeyConversions, v1.RegisterDeepCopies, RegisterDefaults, RegisterConversions, docker10.AddToSchemeInCoreGroup, dockerpre012.AddToSchemeInCoreGroup)
2322
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
2423

25-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults, docker10.AddToScheme, dockerpre012.AddToScheme)
24+
SchemeBuilder = runtime.NewSchemeBuilder(v1.SchemeBuilder.AddToScheme, addConversionFuncs, addFieldSelectorKeyConversions, RegisterDefaults, docker10.AddToScheme, dockerpre012.AddToScheme)
2625
AddToScheme = SchemeBuilder.AddToScheme
2726

2827
localSchemeBuilder = &SchemeBuilder
@@ -31,40 +30,3 @@ var (
3130
func Resource(resource string) schema.GroupResource {
3231
return SchemeGroupVersion.WithResource(resource).GroupResource()
3332
}
34-
35-
// Adds the list of known types to api.Scheme.
36-
func addLegacyKnownTypes(scheme *runtime.Scheme) error {
37-
types := []runtime.Object{
38-
&Image{},
39-
&ImageList{},
40-
&ImageSignature{},
41-
&ImageStream{},
42-
&ImageStreamList{},
43-
&ImageStreamMapping{},
44-
&ImageStreamTag{},
45-
&ImageStreamTagList{},
46-
&ImageStreamImage{},
47-
&ImageStreamImport{},
48-
}
49-
scheme.AddKnownTypes(LegacySchemeGroupVersion, types...)
50-
return nil
51-
}
52-
53-
// Adds the list of known types to api.Scheme.
54-
func addKnownTypes(scheme *runtime.Scheme) error {
55-
scheme.AddKnownTypes(SchemeGroupVersion,
56-
&Image{},
57-
&ImageList{},
58-
&ImageSignature{},
59-
&ImageStream{},
60-
&ImageStreamList{},
61-
&ImageStreamMapping{},
62-
&ImageStreamTag{},
63-
&ImageStreamTagList{},
64-
&ImageStreamImage{},
65-
&ImageStreamImport{},
66-
&kapiv1.SecretList{},
67-
)
68-
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
69-
return nil
70-
}

0 commit comments

Comments
 (0)