Skip to content

Commit 6ba369f

Browse files
deads2kdeads2k
committed
mechanical
1 parent a9c2566 commit 6ba369f

File tree

79 files changed

+316
-300
lines changed

Some content is hidden

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

79 files changed

+316
-300
lines changed

‎pkg/api/meta/pods.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import (
1919

2020
oapps "github.com/openshift/api/apps"
2121
appsapiv1 "github.com/openshift/api/apps/v1"
22+
"github.com/openshift/api/security"
2223
securityapiv1 "github.com/openshift/api/security/v1"
24+
"github.com/openshift/origin/pkg/api/legacy"
2325
appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
2426
securityapi "github.com/openshift/origin/pkg/security/apis/security"
2527
)
@@ -62,15 +64,15 @@ var resourcesToCheck = map[schema.GroupResource]schema.GroupKind{
6264
extensions.Resource("replicasets"): extensions.Kind("ReplicaSet"),
6365
apps.Resource("statefulsets"): apps.Kind("StatefulSet"),
6466

65-
{Group: "", Resource: "deploymentconfigs"}: {Group: "", Kind: "DeploymentConfig"},
66-
{Group: "", Resource: "podsecuritypolicysubjectreviews"}: {Group: "", Kind: "PodSecurityPolicySubjectReview"},
67-
{Group: "", Resource: "podsecuritypolicyselfsubjectreviews"}: {Group: "", Kind: "PodSecurityPolicySelfSubjectReview"},
68-
{Group: "", Resource: "podsecuritypolicyreviews"}: {Group: "", Kind: "PodSecurityPolicyReview"},
67+
legacy.Resource("deploymentconfigs"): legacy.Kind("DeploymentConfig"),
68+
legacy.Resource("podsecuritypolicysubjectreviews"): legacy.Kind("PodSecurityPolicySubjectReview"),
69+
legacy.Resource("podsecuritypolicyselfsubjectreviews"): legacy.Kind("PodSecurityPolicySelfSubjectReview"),
70+
legacy.Resource("podsecuritypolicyreviews"): legacy.Kind("PodSecurityPolicyReview"),
6971

70-
oapps.Resource("deploymentconfigs"): oapps.Kind("DeploymentConfig"),
71-
securityapi.Resource("podsecuritypolicysubjectreviews"): securityapi.Kind("PodSecurityPolicySubjectReview"),
72-
securityapi.Resource("podsecuritypolicyselfsubjectreviews"): securityapi.Kind("PodSecurityPolicySelfSubjectReview"),
73-
securityapi.Resource("podsecuritypolicyreviews"): securityapi.Kind("PodSecurityPolicyReview"),
72+
oapps.Resource("deploymentconfigs"): oapps.Kind("DeploymentConfig"),
73+
security.Resource("podsecuritypolicysubjectreviews"): security.Kind("PodSecurityPolicySubjectReview"),
74+
security.Resource("podsecuritypolicyselfsubjectreviews"): security.Kind("PodSecurityPolicySelfSubjectReview"),
75+
security.Resource("podsecuritypolicyreviews"): security.Kind("PodSecurityPolicyReview"),
7476
}
7577

7678
// HasPodSpec returns true if the resource is known to have a pod spec.

‎pkg/api/serialization_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ func TestSpecificKind(t *testing.T) {
544544
}
545545

546546
var dockerImageTypes = map[schema.GroupVersionKind]bool{
547-
image.SchemeGroupVersion.WithKind("DockerImage"): true,
547+
image.GroupVersion.WithKind("DockerImage"): true,
548548
}
549549

550550
// TestRoundTripTypes applies the round-trip test to all round-trippable Kinds

‎pkg/apps/registry/instantiate/rest_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
kapihelper "k8s.io/kubernetes/pkg/apis/core/helper"
1212
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
1313

14+
"github.com/openshift/api/image"
1415
appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
1516
_ "github.com/openshift/origin/pkg/apps/apis/apps/install"
1617
appstest "github.com/openshift/origin/pkg/apps/apis/apps/test"
@@ -238,7 +239,7 @@ func TestProcess_matchScenarios(t *testing.T) {
238239
fake.AddReactor("get", "imagestreams", func(action clientgotesting.Action) (handled bool, ret runtime.Object, err error) {
239240
if test.notFound {
240241
name := action.(clientgotesting.GetAction).GetName()
241-
return true, nil, errors.NewNotFound(imageapi.Resource("ImageStream"), name)
242+
return true, nil, errors.NewNotFound(image.Resource("ImageStream"), name)
242243
}
243244
stream := fakeStream(appstest.ImageStreamName, imageapi.DefaultImageTag, appstest.DockerImageReference, appstest.ImageID)
244245
return true, stream, nil

‎pkg/authorization/authorizer/scope/converter.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func (userEvaluator) ResolveRules(scope, namespace string, _ rbaclisters.Cluster
198198
case UserInfo:
199199
return []rbacv1.PolicyRule{
200200
rbacv1helpers.NewRule("get").
201-
Groups(userapi.GroupName, userapi.LegacyGroupName).
201+
Groups(userapi.GroupName, legacy.GroupName).
202202
Resources("users").
203203
Names("~").
204204
RuleOrDie(),
@@ -217,14 +217,14 @@ func (userEvaluator) ResolveRules(scope, namespace string, _ rbaclisters.Cluster
217217
case UserListScopedProjects:
218218
return []rbacv1.PolicyRule{
219219
rbacv1helpers.NewRule("list", "watch").
220-
Groups(projectapi.GroupName, projectapi.LegacyGroupName).
220+
Groups(projectapi.GroupName, legacy.GroupName).
221221
Resources("projects").
222222
RuleOrDie(),
223223
}, nil
224224
case UserListAllProjects:
225225
return []rbacv1.PolicyRule{
226226
rbacv1helpers.NewRule("list", "watch").
227-
Groups(projectapi.GroupName, projectapi.LegacyGroupName).
227+
Groups(projectapi.GroupName, legacy.GroupName).
228228
Resources("projects").
229229
RuleOrDie(),
230230
rbacv1helpers.NewRule("get").

‎pkg/build/generator/generator_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
kapi "k8s.io/kubernetes/pkg/apis/core"
1818
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
1919

20+
"github.com/openshift/api/image"
2021
buildapi "github.com/openshift/origin/pkg/build/apis/build"
2122
"github.com/openshift/origin/pkg/build/apis/build/validation"
2223
mocks "github.com/openshift/origin/pkg/build/generator/test"
@@ -610,7 +611,7 @@ func TestInstantiateWithMissingImageStream(t *testing.T) {
610611
g := mockBuildGenerator(nil, nil, nil, nil, nil, nil, nil)
611612
c := g.Client.(TestingClient)
612613
c.GetImageStreamFunc = func(ctx context.Context, name string, options *metav1.GetOptions) (*imageapi.ImageStream, error) {
613-
return nil, errors.NewNotFound(imageapi.Resource("imagestreams"), "testRepo")
614+
return nil, errors.NewNotFound(image.Resource("imagestreams"), "testRepo")
614615
}
615616
g.Client = c
616617

‎pkg/cmd/server/bootstrappolicy/policy.go‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,23 @@ import (
2323
"k8s.io/kubernetes/pkg/apis/storage"
2424
"k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy"
2525

26+
oapps "github.com/openshift/api/apps"
27+
"github.com/openshift/api/authorization"
28+
"github.com/openshift/api/build"
29+
"github.com/openshift/api/image"
30+
"github.com/openshift/api/network"
31+
"github.com/openshift/api/oauth"
32+
"github.com/openshift/api/project"
33+
"github.com/openshift/api/quota"
34+
"github.com/openshift/api/route"
35+
"github.com/openshift/api/security"
36+
"github.com/openshift/api/template"
37+
"github.com/openshift/api/user"
2638
oapi "github.com/openshift/origin/pkg/api"
2739
"github.com/openshift/origin/pkg/api/legacy"
28-
appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
2940
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
3041
buildapi "github.com/openshift/origin/pkg/build/apis/build"
31-
imageapi "github.com/openshift/origin/pkg/image/apis/image"
32-
networkapi "github.com/openshift/origin/pkg/network/apis/network"
33-
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
34-
projectapi "github.com/openshift/origin/pkg/project/apis/project"
35-
quotaapi "github.com/openshift/origin/pkg/quota/apis/quota"
36-
routeapi "github.com/openshift/origin/pkg/route/apis/route"
37-
securityapi "github.com/openshift/origin/pkg/security/apis/security"
3842
templateapi "github.com/openshift/origin/pkg/template/apis/template"
39-
userapi "github.com/openshift/origin/pkg/user/apis/user"
4043
)
4144

4245
const (
@@ -63,36 +66,36 @@ var (
6366
networkingGroup = "networking.k8s.io"
6467
policyGroup = policy.GroupName
6568
rbacGroup = rbac.GroupName
66-
securityGroup = securityapi.GroupName
67-
legacySecurityGroup = securityapi.LegacyGroupName
6869
storageGroup = storage.GroupName
6970
settingsGroup = settings.GroupName
7071
schedulingGroup = "scheduling.k8s.io"
71-
72-
authzGroup = authorizationapi.GroupName
73-
kAuthzGroup = kauthorizationapi.GroupName
74-
kAuthnGroup = kauthenticationapi.GroupName
72+
kAuthzGroup = kauthorizationapi.GroupName
73+
kAuthnGroup = kauthenticationapi.GroupName
74+
75+
deployGroup = oapps.GroupName
76+
authzGroup = authorization.GroupName
77+
buildGroup = build.GroupName
78+
imageGroup = image.GroupName
79+
networkGroup = network.GroupName
80+
oauthGroup = oauth.GroupName
81+
projectGroup = project.GroupName
82+
quotaGroup = quota.GroupName
83+
routeGroup = route.GroupName
84+
securityGroup = security.GroupName
85+
templateGroup = template.GroupName
86+
userGroup = user.GroupName
7587
legacyAuthzGroup = legacy.GroupName
76-
buildGroup = buildapi.GroupName
7788
legacyBuildGroup = legacy.GroupName
78-
deployGroup = appsapi.GroupName
7989
legacyDeployGroup = legacy.GroupName
80-
imageGroup = imageapi.GroupName
8190
legacyImageGroup = legacy.GroupName
82-
projectGroup = projectapi.GroupName
8391
legacyProjectGroup = legacy.GroupName
84-
quotaGroup = quotaapi.GroupName
8592
legacyQuotaGroup = legacy.GroupName
86-
routeGroup = routeapi.GroupName
8793
legacyRouteGroup = legacy.GroupName
88-
templateGroup = templateapi.GroupName
8994
legacyTemplateGroup = legacy.GroupName
90-
userGroup = userapi.GroupName
9195
legacyUserGroup = legacy.GroupName
92-
oauthGroup = oauthapi.GroupName
9396
legacyOauthGroup = legacy.GroupName
94-
networkGroup = networkapi.GroupName
9597
legacyNetworkGroup = legacy.GroupName
98+
legacySecurityGroup = legacy.GroupName
9699
)
97100

98101
func GetOpenshiftBootstrapClusterRoles() []rbacv1.ClusterRole {

‎pkg/cmd/server/kubernetes/master/master_config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ import (
8484
cmdflags "github.com/openshift/origin/pkg/cmd/util/flags"
8585
oauthutil "github.com/openshift/origin/pkg/oauth/util"
8686
openapigenerated "github.com/openshift/origin/pkg/openapi"
87-
securityapi "github.com/openshift/origin/pkg/security/apis/security"
8887
"github.com/openshift/origin/pkg/version"
8988

9089
// TODO fix this install, it is required for TestPreferredGroupVersions to pass
90+
"github.com/openshift/api/security"
9191
_ "github.com/openshift/origin/pkg/authorization/apis/authorization/install"
9292
)
9393

@@ -249,7 +249,7 @@ func BuildStorageFactory(server *kapiserveroptions.ServerRunOptions, enforcedSto
249249
storageFactory.AddCohabitatingResources(apps.Resource("daemonsets"), extensions.Resource("daemonsets"))
250250
storageFactory.AddCohabitatingResources(apps.Resource("replicasets"), extensions.Resource("replicasets"))
251251
storageFactory.AddCohabitatingResources(networking.Resource("networkpolicies"), extensions.Resource("networkpolicies"))
252-
storageFactory.AddCohabitatingResources(securityapi.Resource("securitycontextconstraints"), kapi.Resource("securitycontextconstraints"))
252+
storageFactory.AddCohabitatingResources(security.Resource("securitycontextconstraints"), kapi.Resource("securitycontextconstraints"))
253253
// TODO: switch to prefer policy API group in 3.11
254254
storageFactory.AddCohabitatingResources(extensions.Resource("podsecuritypolicies"), policy.Resource("podsecuritypolicies"))
255255

‎pkg/image/admission/admission.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import (
1515
kadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
1616
"k8s.io/kubernetes/plugin/pkg/admission/limitranger"
1717

18+
"github.com/openshift/api/image"
19+
"github.com/openshift/origin/pkg/api/legacy"
1820
imageapi "github.com/openshift/origin/pkg/image/apis/image"
1921
"github.com/openshift/origin/pkg/image/util"
2022
)
@@ -106,7 +108,7 @@ func (a *imageLimitRangerPlugin) SupportsAttributes(attr admission.Attributes) b
106108
return false
107109
}
108110
gk := attr.GetKind().GroupKind()
109-
return imageapi.Kind("ImageStreamMapping") == gk || imageapi.LegacyKind("ImageStreamMapping") == gk
111+
return image.Kind("ImageStreamMapping") == gk || legacy.Kind("ImageStreamMapping") == gk
110112
}
111113

112114
// SupportsLimit provides a check to see if the limitRange is applicable to image objects.

‎pkg/image/admission/admission_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import (
1515
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
1616
kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
1717

18+
"github.com/openshift/api/image"
19+
"github.com/openshift/origin/pkg/api/legacy"
1820
"github.com/openshift/origin/pkg/image/admission/testutil"
1921
imageapi "github.com/openshift/origin/pkg/image/apis/image"
2022
)
@@ -60,10 +62,10 @@ func TestAdmitImageStreamMapping(t *testing.T) {
6062
informerFactory.Start(wait.NeverStop)
6163

6264
attrs := kadmission.NewAttributesRecord(v.imageStreamMapping, nil,
63-
imageapi.Kind("ImageStreamMapping").WithVersion("version"),
65+
image.Kind("ImageStreamMapping").WithVersion("version"),
6466
v.imageStreamMapping.Namespace,
6567
v.imageStreamMapping.Name,
66-
imageapi.Resource("imagestreammappings").WithVersion("version"),
68+
image.Resource("imagestreammappings").WithVersion("version"),
6769
"",
6870
v.operation,
6971
nil)
@@ -218,15 +220,15 @@ func TestSupports(t *testing.T) {
218220
}
219221
ilr := plugin.(*imageLimitRangerPlugin)
220222
for _, r := range resources {
221-
attr := kadmission.NewAttributesRecord(nil, nil, imageapi.LegacyKind("ImageStreamMapping").WithVersion(""), "ns", "name", imageapi.LegacyResource(r).WithVersion("version"), "", kadmission.Create, nil)
223+
attr := kadmission.NewAttributesRecord(nil, nil, legacy.Kind("ImageStreamMapping").WithVersion(""), "ns", "name", legacy.Resource(r).WithVersion("version"), "", kadmission.Create, nil)
222224
if !ilr.SupportsAttributes(attr) {
223225
t.Errorf("plugin is expected to support %#v", r)
224226
}
225227
}
226228

227229
badKinds := []string{"ImageStream", "Image", "Pod", "foo"}
228230
for _, k := range badKinds {
229-
attr := kadmission.NewAttributesRecord(nil, nil, imageapi.LegacyKind(k).WithVersion(""), "ns", "name", imageapi.Resource("bar").WithVersion("version"), "", kadmission.Create, nil)
231+
attr := kadmission.NewAttributesRecord(nil, nil, legacy.Kind(k).WithVersion(""), "ns", "name", image.Resource("bar").WithVersion("version"), "", kadmission.Create, nil)
230232
if ilr.SupportsAttributes(attr) {
231233
t.Errorf("plugin is not expected to support %s", k)
232234
}

‎pkg/image/admission/imagepolicy/imagepolicy_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
kapiextensions "k8s.io/kubernetes/pkg/apis/extensions"
2121
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
2222

23+
"github.com/openshift/api/image"
2324
buildapi "github.com/openshift/origin/pkg/build/apis/build"
2425
configlatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
2526
"github.com/openshift/origin/pkg/image/admission/apis/imagepolicy"
@@ -106,7 +107,7 @@ func TestDefaultPolicy(t *testing.T) {
106107
case badImage.Name:
107108
return true, badImage, nil
108109
default:
109-
return true, nil, kerrors.NewNotFound(imageapi.Resource("images"), name)
110+
return true, nil, kerrors.NewNotFound(image.Resource("images"), name)
110111
}
111112
})
112113
client.AddReactor("get", "imagestreamtags", func(action clientgotesting.Action) (handled bool, ret runtime.Object, err error) {
@@ -117,7 +118,7 @@ func TestDefaultPolicy(t *testing.T) {
117118
case badTag.Name:
118119
return true, badTag, nil
119120
default:
120-
return true, nil, kerrors.NewNotFound(imageapi.Resource("imagestreamtags"), name)
121+
return true, nil, kerrors.NewNotFound(image.Resource("imagestreamtags"), name)
121122
}
122123
})
123124

0 commit comments

Comments
 (0)