Skip to content

Commit 4bc612e

Browse files
deads2kdeads2k
committed
boring changes
1 parent cf235c2 commit 4bc612e

File tree

812 files changed

+1595
-1718
lines changed

Some content is hidden

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

812 files changed

+1595
-1718
lines changed

‎cmd/gitserver/gitserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
// install all APIs
1616
_ "github.com/openshift/origin/pkg/api/install"
17-
_ "k8s.io/kubernetes/pkg/api/install"
17+
_ "k8s.io/kubernetes/pkg/apis/core/install"
1818
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
1919
)
2020

‎cmd/oc/oc.go

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

1515
// install all APIs
1616
_ "github.com/openshift/origin/pkg/api/install"
17-
_ "k8s.io/kubernetes/pkg/api/install"
1817
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
1918
_ "k8s.io/kubernetes/pkg/apis/batch/install"
19+
_ "k8s.io/kubernetes/pkg/apis/core/install"
2020
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
2121
)
2222

‎cmd/openshift-diagnostics/main.go

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

1515
// install all APIs
1616
_ "github.com/openshift/origin/pkg/api/install"
17-
_ "k8s.io/kubernetes/pkg/api/install"
1817
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
1918
_ "k8s.io/kubernetes/pkg/apis/batch/install"
19+
_ "k8s.io/kubernetes/pkg/apis/core/install"
2020
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
2121
)
2222

‎cmd/openshift/openshift.go

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

1515
// install all APIs
1616
_ "github.com/openshift/origin/pkg/api/install"
17-
_ "k8s.io/kubernetes/pkg/api/install"
1817
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
1918
_ "k8s.io/kubernetes/pkg/apis/batch/install"
19+
_ "k8s.io/kubernetes/pkg/apis/core/install"
2020
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
2121
)
2222

‎cmd/template-service-broker/tsb.go

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

1717
// install all APIs
1818
_ "github.com/openshift/origin/pkg/api/install"
19-
_ "k8s.io/kubernetes/pkg/api/install"
2019
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
2120
_ "k8s.io/kubernetes/pkg/apis/batch/install"
21+
_ "k8s.io/kubernetes/pkg/apis/core/install"
2222
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
2323
)
2424

‎examples/examples_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ import (
1313
"k8s.io/apimachinery/pkg/runtime"
1414
"k8s.io/apimachinery/pkg/util/yaml"
1515
apirequest "k8s.io/apiserver/pkg/endpoints/request"
16-
kapi "k8s.io/kubernetes/pkg/api"
17-
kvalidation "k8s.io/kubernetes/pkg/api/validation"
16+
"k8s.io/kubernetes/pkg/api/legacyscheme"
17+
kapi "k8s.io/kubernetes/pkg/apis/core"
18+
kvalidation "k8s.io/kubernetes/pkg/apis/core/validation"
1819
"k8s.io/kubernetes/pkg/capabilities"
1920

2021
"github.com/openshift/origin/pkg/api/validation"
@@ -28,7 +29,7 @@ import (
2829

2930
// install all APIs
3031
_ "github.com/openshift/origin/pkg/api/install"
31-
_ "k8s.io/kubernetes/pkg/api/install"
32+
_ "k8s.io/kubernetes/pkg/apis/core/install"
3233
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
3334
)
3435

@@ -153,7 +154,7 @@ func TestExampleObjectSchemas(t *testing.T) {
153154
t.Logf("%q is skipped", path)
154155
return
155156
}
156-
if err := runtime.DecodeInto(kapi.Codecs.UniversalDecoder(), data, expectedType); err != nil {
157+
if err := runtime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), data, expectedType); err != nil {
157158
t.Errorf("%s did not decode correctly: %v\n%s", path, err, string(data))
158159
return
159160
}
@@ -203,7 +204,7 @@ func validateObject(path string, obj runtime.Object, t *testing.T) {
203204

204205
case *kapi.List, *imageapi.ImageStreamList:
205206
if list, err := meta.ExtractList(typedObj); err == nil {
206-
runtime.DecodeList(list, kapi.Codecs.UniversalDecoder())
207+
runtime.DecodeList(list, legacyscheme.Codecs.UniversalDecoder())
207208
for i := range list {
208209
validateObject(path, list[i], t)
209210
}

‎pkg/api/compatibility_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"k8s.io/apimachinery/pkg/runtime"
1313
"k8s.io/apimachinery/pkg/runtime/schema"
1414
"k8s.io/apimachinery/pkg/util/validation/field"
15-
"k8s.io/kubernetes/pkg/api"
16-
"k8s.io/kubernetes/pkg/api/validation"
15+
api "k8s.io/kubernetes/pkg/apis/core"
16+
"k8s.io/kubernetes/pkg/apis/core/validation"
1717
)
1818

1919
func TestCompatibility_v1_Pod(t *testing.T) {

‎pkg/api/graph/graphview/veneering_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/gonum/graph/concrete"
99

1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11-
kapi "k8s.io/kubernetes/pkg/api"
11+
kapi "k8s.io/kubernetes/pkg/apis/core"
1212

1313
osgraph "github.com/openshift/origin/pkg/api/graph"
1414
osgraphtest "github.com/openshift/origin/pkg/api/graph/test"

‎pkg/api/graph/test/runtimeobject_nodebuilder.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import (
77

88
"k8s.io/apimachinery/pkg/api/meta"
99
"k8s.io/apimachinery/pkg/runtime"
10-
kapi "k8s.io/kubernetes/pkg/api"
10+
"k8s.io/kubernetes/pkg/api/legacyscheme"
1111
"k8s.io/kubernetes/pkg/apis/autoscaling"
12+
kapi "k8s.io/kubernetes/pkg/apis/core"
1213
"k8s.io/kubernetes/pkg/kubectl/resource"
1314

1415
osgraph "github.com/openshift/origin/pkg/api/graph"
@@ -129,13 +130,13 @@ func BuildGraph(path string) (osgraph.Graph, []runtime.Object, error) {
129130
return g, objs, err
130131
}
131132

132-
mapper := kapi.Registry.RESTMapper()
133-
typer := kapi.Scheme
133+
mapper := legacyscheme.Registry.RESTMapper()
134+
typer := legacyscheme.Scheme
134135
clientMapper := resource.ClientMapperFunc(func(mapping *meta.RESTMapping) (resource.RESTClient, error) {
135136
return nil, nil
136137
})
137138

138-
r := resource.NewBuilder(mapper, resource.SimpleCategoryExpander{}, typer, clientMapper, kapi.Codecs.UniversalDecoder()).
139+
r := resource.NewBuilder(mapper, resource.SimpleCategoryExpander{}, typer, clientMapper, legacyscheme.Codecs.UniversalDecoder()).
139140
FilenameParam(false, &resource.FilenameOptions{Recursive: false, Filenames: []string{abspath}}).
140141
Flatten().
141142
Do()

‎pkg/api/install/install.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ package install
33
import (
44
kv1 "k8s.io/api/core/v1"
55
"k8s.io/apimachinery/pkg/conversion"
6-
kapi "k8s.io/kubernetes/pkg/api"
7-
kapiv1 "k8s.io/kubernetes/pkg/api/v1"
6+
"k8s.io/kubernetes/pkg/api/legacyscheme"
7+
kapi "k8s.io/kubernetes/pkg/apis/core"
8+
kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
89

910
// we have a strong dependency on kube objects for deployments and scale
10-
_ "k8s.io/kubernetes/pkg/api/install"
1111
_ "k8s.io/kubernetes/pkg/apis/apps/install"
1212
_ "k8s.io/kubernetes/pkg/apis/authentication/install"
1313
_ "k8s.io/kubernetes/pkg/apis/authorization/install"
1414
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
1515
_ "k8s.io/kubernetes/pkg/apis/batch/install"
1616
_ "k8s.io/kubernetes/pkg/apis/certificates/install"
17+
_ "k8s.io/kubernetes/pkg/apis/core/install"
1718
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
1819
_ "k8s.io/kubernetes/pkg/apis/policy/install"
1920
_ "k8s.io/kubernetes/pkg/apis/rbac/install"
@@ -73,7 +74,7 @@ func init() {
7374
// This is a "fast-path" that avoids reflection for common types. It focuses on the objects that are
7475
// converted the most in the cluster.
7576
// TODO: generate one of these for every external API group - this is to prove the impact
76-
kapi.Scheme.AddGenericConversionFunc(func(objA, objB interface{}, s conversion.Scope) (bool, error) {
77+
legacyscheme.Scheme.AddGenericConversionFunc(func(objA, objB interface{}, s conversion.Scope) (bool, error) {
7778
switch a := objA.(type) {
7879
case *metav1.WatchEvent:
7980
switch b := objB.(type) {
@@ -107,34 +108,34 @@ func init() {
107108
case *kv1.ServiceAccount:
108109
switch b := objB.(type) {
109110
case *kapi.ServiceAccount:
110-
return true, kapiv1.Convert_v1_ServiceAccount_To_api_ServiceAccount(a, b, s)
111+
return true, kapiv1.Convert_v1_ServiceAccount_To_core_ServiceAccount(a, b, s)
111112
}
112113
case *kapi.ServiceAccount:
113114
switch b := objB.(type) {
114115
case *kv1.ServiceAccount:
115-
return true, kapiv1.Convert_api_ServiceAccount_To_v1_ServiceAccount(a, b, s)
116+
return true, kapiv1.Convert_core_ServiceAccount_To_v1_ServiceAccount(a, b, s)
116117
}
117118

118119
case *kv1.SecretList:
119120
switch b := objB.(type) {
120121
case *kapi.SecretList:
121-
return true, kapiv1.Convert_v1_SecretList_To_api_SecretList(a, b, s)
122+
return true, kapiv1.Convert_v1_SecretList_To_core_SecretList(a, b, s)
122123
}
123124
case *kapi.SecretList:
124125
switch b := objB.(type) {
125126
case *kv1.SecretList:
126-
return true, kapiv1.Convert_api_SecretList_To_v1_SecretList(a, b, s)
127+
return true, kapiv1.Convert_core_SecretList_To_v1_SecretList(a, b, s)
127128
}
128129

129130
case *kv1.Secret:
130131
switch b := objB.(type) {
131132
case *kapi.Secret:
132-
return true, kapiv1.Convert_v1_Secret_To_api_Secret(a, b, s)
133+
return true, kapiv1.Convert_v1_Secret_To_core_Secret(a, b, s)
133134
}
134135
case *kapi.Secret:
135136
switch b := objB.(type) {
136137
case *kv1.Secret:
137-
return true, kapiv1.Convert_api_Secret_To_v1_Secret(a, b, s)
138+
return true, kapiv1.Convert_core_Secret_To_v1_Secret(a, b, s)
138139
}
139140

140141
case *routev1.RouteList:

‎pkg/api/install/tags_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ import (
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"k8s.io/apimachinery/pkg/runtime/schema"
1212
"k8s.io/apimachinery/pkg/util/sets"
13-
kapi "k8s.io/kubernetes/pkg/api"
13+
"k8s.io/kubernetes/pkg/api/legacyscheme"
1414

1515
configapi "github.com/openshift/origin/pkg/cmd/server/api"
1616
configapiv1 "github.com/openshift/origin/pkg/cmd/server/api/v1"
1717
)
1818

1919
func TestDescriptions(t *testing.T) {
20-
for _, version := range kapi.Registry.RegisteredGroupVersions() {
20+
for _, version := range legacyscheme.Registry.RegisteredGroupVersions() {
2121
seen := map[reflect.Type]bool{}
2222

23-
for _, apiType := range kapi.Scheme.KnownTypes(version) {
23+
for _, apiType := range legacyscheme.Scheme.KnownTypes(version) {
2424
checkDescriptions(apiType, &seen, t)
2525
}
2626
}
@@ -63,14 +63,14 @@ func TestInternalJsonTags(t *testing.T) {
6363
seen := map[reflect.Type]bool{}
6464
seenGroups := sets.String{}
6565

66-
for _, version := range kapi.Registry.RegisteredGroupVersions() {
66+
for _, version := range legacyscheme.Registry.RegisteredGroupVersions() {
6767
if seenGroups.Has(version.Group) {
6868
continue
6969
}
7070
seenGroups.Insert(version.Group)
7171

7272
internalVersion := schema.GroupVersion{Group: version.Group, Version: runtime.APIVersionInternal}
73-
for _, apiType := range kapi.Scheme.KnownTypes(internalVersion) {
73+
for _, apiType := range legacyscheme.Scheme.KnownTypes(internalVersion) {
7474
checkInternalJsonTags(apiType, &seen, t)
7575
}
7676
}
@@ -122,8 +122,8 @@ func checkInternalJsonTags(objType reflect.Type, seen *map[reflect.Type]bool, t
122122
func TestExternalJsonTags(t *testing.T) {
123123
seen := map[reflect.Type]bool{}
124124

125-
for _, version := range kapi.Registry.RegisteredGroupVersions() {
126-
for _, apiType := range kapi.Scheme.KnownTypes(version) {
125+
for _, version := range legacyscheme.Registry.RegisteredGroupVersions() {
126+
for _, apiType := range legacyscheme.Scheme.KnownTypes(version) {
127127
checkExternalJsonTags(apiType, &seen, t)
128128
}
129129
}

‎pkg/api/kubegraph/analysis/hpa.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strings"
66

77
"k8s.io/apimachinery/pkg/util/sets"
8-
kapi "k8s.io/kubernetes/pkg/api"
98
"k8s.io/kubernetes/pkg/apis/autoscaling"
9+
kapi "k8s.io/kubernetes/pkg/apis/core"
1010

1111
graphapi "github.com/gonum/graph"
1212
"github.com/gonum/graph/path"

‎pkg/api/kubegraph/analysis/pod.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/MakeNowJust/heredoc"
88

99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
10-
kapi "k8s.io/kubernetes/pkg/api"
10+
kapi "k8s.io/kubernetes/pkg/apis/core"
1111

1212
osgraph "github.com/openshift/origin/pkg/api/graph"
1313
kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"

‎pkg/api/kubegraph/edge_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"k8s.io/apimachinery/pkg/api/meta"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/apimachinery/pkg/runtime"
12-
kapi "k8s.io/kubernetes/pkg/api"
13-
_ "k8s.io/kubernetes/pkg/api/install"
1412
kapps "k8s.io/kubernetes/pkg/apis/apps"
1513
"k8s.io/kubernetes/pkg/apis/autoscaling"
14+
kapi "k8s.io/kubernetes/pkg/apis/core"
15+
_ "k8s.io/kubernetes/pkg/apis/core/install"
1616

1717
osgraph "github.com/openshift/origin/pkg/api/graph"
1818
kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"

‎pkg/api/kubegraph/edges.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ import (
44
"strings"
55

66
"github.com/gonum/graph"
7+
"k8s.io/kubernetes/pkg/api/legacyscheme"
78

89
"k8s.io/apimachinery/pkg/api/meta"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
"k8s.io/apimachinery/pkg/labels"
1112
"k8s.io/apimachinery/pkg/runtime"
1213
"k8s.io/apimachinery/pkg/runtime/schema"
13-
kapi "k8s.io/kubernetes/pkg/api"
14+
kapi "k8s.io/kubernetes/pkg/apis/core"
1415

1516
osgraph "github.com/openshift/origin/pkg/api/graph"
1617
kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
@@ -229,7 +230,7 @@ func AddHPAScaleRefEdges(g osgraph.Graph) {
229230
groupVersionResource = schema.GroupVersionResource{Resource: resource}
230231
}
231232

232-
groupVersionResource, err := kapi.Registry.RESTMapper().ResourceFor(groupVersionResource)
233+
groupVersionResource, err := legacyscheme.Registry.RESTMapper().ResourceFor(groupVersionResource)
233234
if err != nil {
234235
continue
235236
}

‎pkg/api/kubegraph/nodes/nodes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package nodes
33
import (
44
"github.com/gonum/graph"
55

6-
kapi "k8s.io/kubernetes/pkg/api"
76
kapps "k8s.io/kubernetes/pkg/apis/apps"
87
"k8s.io/kubernetes/pkg/apis/autoscaling"
8+
kapi "k8s.io/kubernetes/pkg/apis/core"
99

1010
osgraph "github.com/openshift/origin/pkg/api/graph"
1111
)

‎pkg/api/kubegraph/nodes/nodes_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package nodes
33
import (
44
"testing"
55

6-
kapi "k8s.io/kubernetes/pkg/api"
6+
kapi "k8s.io/kubernetes/pkg/apis/core"
77

88
osgraph "github.com/openshift/origin/pkg/api/graph"
99
)

‎pkg/api/kubegraph/nodes/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"reflect"
66

7-
kapi "k8s.io/kubernetes/pkg/api"
87
kapps "k8s.io/kubernetes/pkg/apis/apps"
98
"k8s.io/kubernetes/pkg/apis/autoscaling"
9+
kapi "k8s.io/kubernetes/pkg/apis/core"
1010

1111
osgraph "github.com/openshift/origin/pkg/api/graph"
1212
)

‎pkg/api/latest/latest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sync"
66

77
"k8s.io/apimachinery/pkg/runtime/schema"
8-
"k8s.io/kubernetes/pkg/api"
8+
"k8s.io/kubernetes/pkg/api/legacyscheme"
99
)
1010

1111
// HACK TO ELIMINATE CYCLES UNTIL WE KILL THIS PACKAGE
@@ -72,7 +72,7 @@ func getOrCreateOriginKinds() map[schema.GroupVersionKind]bool {
7272

7373
// enumerate all supported versions, get the kinds, and register with the mapper how to address our resources
7474
for _, version := range Versions {
75-
for kind, t := range api.Scheme.KnownTypes(version) {
75+
for kind, t := range legacyscheme.Scheme.KnownTypes(version) {
7676
// these don't require special handling at the RESTMapping level since they are either "normal" when groupified
7777
// or under /api (not /oapi)
7878
if kind == "SecurityContextConstraints" {

0 commit comments

Comments
 (0)