Skip to content

Commit 65e7463

Browse files
author
OpenShift Bot
authored
Merge pull request #13482 from mfojtik/legacy-schema-registration
Merged by openshift-bot
2 parents b3b8784 + 96a8b34 commit 65e7463

File tree

3 files changed

+212
-7
lines changed

3 files changed

+212
-7
lines changed

‎pkg/cmd/server/origin/legacy.go

+194
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
package origin
2+
3+
import (
4+
"k8s.io/kubernetes/pkg/api/rest"
5+
"k8s.io/kubernetes/pkg/api/unversioned"
6+
"k8s.io/kubernetes/pkg/util/sets"
7+
)
8+
9+
var (
10+
// OriginLegacyKinds lists all kinds that are locked to the legacy Origin API schema.
11+
// This list should not grow and adding a new types to the locked Origin API schema will
12+
// cause a unit test failure.
13+
OriginLegacyKinds = sets.NewString(
14+
"AppliedClusterResourceQuota",
15+
"AppliedClusterResourceQuotaList",
16+
"BinaryBuildRequestOptions",
17+
"Build",
18+
"BuildConfig",
19+
"BuildConfigList",
20+
"BuildList",
21+
"BuildLog",
22+
"BuildLogOptions",
23+
"BuildRequest",
24+
"ClusterNetwork",
25+
"ClusterNetworkList",
26+
"ClusterPolicy",
27+
"ClusterPolicyBinding",
28+
"ClusterPolicyBindingList",
29+
"ClusterPolicyList",
30+
"ClusterResourceQuota",
31+
"ClusterResourceQuotaList",
32+
"ClusterRole",
33+
"ClusterRoleBinding",
34+
"ClusterRoleBindingList",
35+
"ClusterRoleList",
36+
"DeploymentConfig",
37+
"DeploymentConfigList",
38+
"DeploymentConfigRollback",
39+
"DeploymentLog",
40+
"DeploymentLogOptions",
41+
"DeploymentRequest",
42+
"EgressNetworkPolicy",
43+
"EgressNetworkPolicyList",
44+
"Group",
45+
"GroupList",
46+
"HostSubnet",
47+
"HostSubnetList",
48+
"Identity",
49+
"IdentityList",
50+
"Image",
51+
"ImageList",
52+
"ImageSignature",
53+
"ImageStream",
54+
"ImageStreamImage",
55+
"ImageStreamImport",
56+
"ImageStreamList",
57+
"ImageStreamMapping",
58+
"ImageStreamTag",
59+
"ImageStreamTagList",
60+
"IsPersonalSubjectAccessReview",
61+
"LocalResourceAccessReview",
62+
"LocalSubjectAccessReview",
63+
"NetNamespace",
64+
"NetNamespaceList",
65+
"OAuthAccessToken",
66+
"OAuthAccessTokenList",
67+
"OAuthAuthorizeToken",
68+
"OAuthAuthorizeTokenList",
69+
"OAuthClient",
70+
"OAuthClientAuthorization",
71+
"OAuthClientAuthorizationList",
72+
"OAuthClientList",
73+
"OAuthRedirectReference",
74+
"PodSecurityPolicyReview",
75+
"PodSecurityPolicySelfSubjectReview",
76+
"PodSecurityPolicySubjectReview",
77+
"Policy",
78+
"PolicyBinding",
79+
"PolicyBindingList",
80+
"PolicyList",
81+
"ProcessedTemplate",
82+
"Project",
83+
"ProjectList",
84+
"ProjectRequest",
85+
"ResourceAccessReview",
86+
"ResourceAccessReviewResponse",
87+
"Role",
88+
"RoleBinding",
89+
"RoleBindingList",
90+
"RoleBindingRestriction",
91+
"RoleBindingRestrictionList",
92+
"RoleList",
93+
"Route",
94+
"RouteList",
95+
"SelfSubjectRulesReview",
96+
"SubjectAccessReview",
97+
"SubjectAccessReviewResponse",
98+
"SubjectRulesReview",
99+
"Template",
100+
"TemplateConfig",
101+
"TemplateList",
102+
"User",
103+
"UserIdentityMapping",
104+
"UserList",
105+
)
106+
107+
// OriginLegacyResources lists all Origin resources that are locked for the legacy v1
108+
// Origin API. This list should not grow.
109+
OriginLegacyResources = sets.NewString(
110+
"appliedClusterResourceQuotas",
111+
"buildConfigs",
112+
"builds",
113+
"clusterNetworks",
114+
"clusterPolicies",
115+
"clusterPolicyBindings",
116+
"clusterResourceQuotas",
117+
"clusterRoleBindings",
118+
"clusterRoles",
119+
"deploymentConfigRollbacks",
120+
"deploymentConfigs",
121+
"egressNetworkPolicies",
122+
"groups",
123+
"hostSubnets",
124+
"identities",
125+
"imageStreamImages",
126+
"imageStreamImports",
127+
"imageStreamMappings",
128+
"imageStreamTags",
129+
"imageStreams",
130+
"images",
131+
"imagesignatures",
132+
"localResourceAccessReviews",
133+
"localSubjectAccessReviews",
134+
"netNamespaces",
135+
"oAuthAccessTokens",
136+
"oAuthAuthorizeTokens",
137+
"oAuthClientAuthorizations",
138+
"oAuthClients",
139+
"podSecurityPolicyReviews",
140+
"podSecurityPolicySelfSubjectReviews",
141+
"podSecurityPolicySubjectReviews",
142+
"policies",
143+
"policyBindings",
144+
"processedTemplates",
145+
"projectRequests",
146+
"projects",
147+
"resourceAccessReviews",
148+
"roleBindingRestrictions",
149+
"roleBindings",
150+
"roles",
151+
"routes",
152+
"selfSubjectRulesReviews",
153+
"subjectAccessReviews",
154+
"subjectRulesReviews",
155+
"templates",
156+
"userIdentityMappings",
157+
"users",
158+
)
159+
160+
// OriginLegacySubresources lists all Origin sub-resources that are locked for the
161+
// legacy v1 Origin API. This list should not grow.
162+
OriginLegacySubresources = sets.NewString(
163+
"clusterResourceQuotas/status",
164+
"processedTemplates",
165+
"imageStreams/status",
166+
"imageStreams/secrets",
167+
"generateDeploymentConfigs",
168+
"deploymentConfigs/log",
169+
"deploymentConfigs/instantiate",
170+
"deploymentConfigs/scale",
171+
"deploymentConfigs/status",
172+
"deploymentConfigs/rollback",
173+
"routes/status",
174+
"builds/clone",
175+
"builds/log",
176+
"builds/details",
177+
"buildConfigs/webhooks",
178+
"buildConfigs/instantiate",
179+
"buildConfigs/instantiatebinary",
180+
)
181+
)
182+
183+
// LegacyStorage returns a storage for locked legacy types.
184+
func LegacyStorage(storage map[unversioned.GroupVersion]map[string]rest.Storage) map[string]rest.Storage {
185+
legacyStorage := map[string]rest.Storage{}
186+
for _, gvStorage := range storage {
187+
for resource, s := range gvStorage {
188+
if OriginLegacyResources.Has(resource) || OriginLegacySubresources.Has(resource) {
189+
legacyStorage[resource] = s
190+
}
191+
}
192+
}
193+
return legacyStorage
194+
}

‎pkg/cmd/server/origin/legacy_test.go

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package origin
2+
3+
import (
4+
"testing"
5+
6+
"github.com/openshift/origin/pkg/api/latest"
7+
8+
"k8s.io/kubernetes/pkg/api"
9+
)
10+
11+
func TestLegacyKinds(t *testing.T) {
12+
for gvk := range api.Scheme.AllKnownTypes() {
13+
if latest.OriginLegacyKind(gvk) && !OriginLegacyKinds.Has(gvk.Kind) {
14+
t.Errorf("%s should not be registered into legacy Origin API", gvk.Kind)
15+
}
16+
}
17+
}

‎pkg/cmd/server/origin/master.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -504,13 +504,7 @@ func (c *MasterConfig) InstallProtectedAPI(apiserver *genericapiserver.GenericAP
504504
}
505505
}
506506

507-
// Install Origin legacy/core APIs
508-
legacyStorage := map[string]rest.Storage{}
509-
for _, gvStorage := range storage {
510-
for resource, s := range gvStorage {
511-
legacyStorage[resource] = s
512-
}
513-
}
507+
legacyStorage := LegacyStorage(storage)
514508
legacyAPIVersions := []string{}
515509
currentAPIVersions := []string{}
516510
if configapi.HasOpenShiftAPILevel(c.Options, v1.SchemeGroupVersion.Version) {

0 commit comments

Comments
 (0)