Skip to content

Commit 8bcbbd4

Browse files
jcbsmpsnjcbsmpsn
committed
Migrate api.Registry to testapi.Groups in tests.
1 parent a765b8c commit 8bcbbd4

Some content is hidden

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

49 files changed

+113
-98
lines changed

‎test/e2e/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ go_library(
9696
tags = ["automanaged"],
9797
deps = [
9898
"//pkg/api:go_default_library",
99+
"//pkg/api/testapi:go_default_library",
99100
"//pkg/api/v1/pod:go_default_library",
100101
"//pkg/api/v1/service:go_default_library",
101102
"//pkg/apis/networking:go_default_library",

‎test/e2e/common/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ go_library(
3535
tags = ["automanaged"],
3636
deps = [
3737
"//pkg/api:go_default_library",
38+
"//pkg/api/testapi:go_default_library",
3839
"//pkg/api/v1/helper:go_default_library",
3940
"//pkg/api/v1/pod:go_default_library",
4041
"//pkg/apis/extensions:go_default_library",

‎test/e2e/common/empty_dir.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ import (
2020
"fmt"
2121
"path"
2222

23+
. "github.com/onsi/ginkgo"
2324
"k8s.io/api/core/v1"
2425
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526
"k8s.io/apimachinery/pkg/util/uuid"
26-
"k8s.io/kubernetes/pkg/api"
27+
"k8s.io/kubernetes/pkg/api/testapi"
2728
"k8s.io/kubernetes/test/e2e/framework"
28-
29-
. "github.com/onsi/ginkgo"
3029
)
3130

3231
const (
@@ -343,7 +342,7 @@ func testPodWithVolume(image, path string, source *v1.EmptyDirVolumeSource) *v1.
343342
return &v1.Pod{
344343
TypeMeta: metav1.TypeMeta{
345344
Kind: "Pod",
346-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
345+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
347346
},
348347
ObjectMeta: metav1.ObjectMeta{
349348
Name: podName,

‎test/e2e/common/host_path.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26-
"k8s.io/kubernetes/pkg/api"
26+
"k8s.io/kubernetes/pkg/api/testapi"
2727
"k8s.io/kubernetes/test/e2e/framework"
2828

2929
. "github.com/onsi/ginkgo"
@@ -222,7 +222,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod {
222222
return &v1.Pod{
223223
TypeMeta: metav1.TypeMeta{
224224
Kind: "Pod",
225-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
225+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
226226
},
227227
ObjectMeta: metav1.ObjectMeta{
228228
Name: podName,

‎test/e2e/dns.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/util/uuid"
3131
"k8s.io/apimachinery/pkg/util/wait"
3232
clientset "k8s.io/client-go/kubernetes"
33-
"k8s.io/kubernetes/pkg/api"
33+
"k8s.io/kubernetes/pkg/api/testapi"
3434
"k8s.io/kubernetes/test/e2e/framework"
3535
)
3636

@@ -46,7 +46,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string, useAnnotatio
4646
dnsPod := &v1.Pod{
4747
TypeMeta: metav1.TypeMeta{
4848
Kind: "Pod",
49-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
49+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
5050
},
5151
ObjectMeta: metav1.ObjectMeta{
5252
Name: "dns-test-" + string(uuid.NewUUID()),

‎test/e2e/framework/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ go_library(
4444
deps = [
4545
"//federation/apis/federation/v1beta1:go_default_library",
4646
"//pkg/api:go_default_library",
47+
"//pkg/api/testapi:go_default_library",
4748
"//pkg/api/v1/helper:go_default_library",
4849
"//pkg/api/v1/node:go_default_library",
4950
"//pkg/api/v1/pod:go_default_library",

‎test/e2e/framework/networking_utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"k8s.io/apimachinery/pkg/util/wait"
4141
clientset "k8s.io/client-go/kubernetes"
4242
coreclientset "k8s.io/client-go/kubernetes/typed/core/v1"
43-
"k8s.io/kubernetes/pkg/api"
43+
"k8s.io/kubernetes/pkg/api/testapi"
4444
)
4545

4646
const (
@@ -325,7 +325,7 @@ func (config *NetworkingTestConfig) createNetShellPodSpec(podName, hostname stri
325325
pod := &v1.Pod{
326326
TypeMeta: metav1.TypeMeta{
327327
Kind: "Pod",
328-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
328+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
329329
},
330330
ObjectMeta: metav1.ObjectMeta{
331331
Name: podName,
@@ -369,7 +369,7 @@ func (config *NetworkingTestConfig) createTestPodSpec() *v1.Pod {
369369
pod := &v1.Pod{
370370
TypeMeta: metav1.TypeMeta{
371371
Kind: "Pod",
372-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
372+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
373373
},
374374
ObjectMeta: metav1.ObjectMeta{
375375
Name: testPodName,

‎test/e2e/framework/pv_util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"k8s.io/apimachinery/pkg/types"
3636
"k8s.io/apimachinery/pkg/util/uuid"
3737
clientset "k8s.io/client-go/kubernetes"
38-
"k8s.io/kubernetes/pkg/api"
38+
"k8s.io/kubernetes/pkg/api/testapi"
3939
"k8s.io/kubernetes/pkg/api/v1/helper"
4040
awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
4141
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
@@ -805,7 +805,7 @@ func MakePod(ns string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool,
805805
podSpec := &v1.Pod{
806806
TypeMeta: metav1.TypeMeta{
807807
Kind: "Pod",
808-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
808+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
809809
},
810810
ObjectMeta: metav1.ObjectMeta{
811811
GenerateName: "pvc-tester-",

‎test/e2e/framework/rc_util.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
clientset "k8s.io/client-go/kubernetes"
3131
"k8s.io/kubernetes/pkg/api"
32+
"k8s.io/kubernetes/pkg/api/testapi"
3233
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
3334
testutils "k8s.io/kubernetes/test/utils"
3435
)
@@ -58,7 +59,7 @@ func RcByNameContainer(name string, replicas int32, image string, labels map[str
5859
return &v1.ReplicationController{
5960
TypeMeta: metav1.TypeMeta{
6061
Kind: "ReplicationController",
61-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
62+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
6263
},
6364
ObjectMeta: metav1.ObjectMeta{
6465
Name: name,

‎test/e2e/framework/util.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import (
7474

7575
clientset "k8s.io/client-go/kubernetes"
7676
"k8s.io/kubernetes/pkg/api"
77+
"k8s.io/kubernetes/pkg/api/testapi"
7778
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
7879
nodeutil "k8s.io/kubernetes/pkg/api/v1/node"
7980
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
@@ -2331,7 +2332,7 @@ func isNodeUntainted(node *v1.Node) bool {
23312332
fakePod := &v1.Pod{
23322333
TypeMeta: metav1.TypeMeta{
23332334
Kind: "Pod",
2334-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
2335+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
23352336
},
23362337
ObjectMeta: metav1.ObjectMeta{
23372338
Name: "fake-not-scheduled",

‎test/e2e/gke_local_ssd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"k8s.io/api/core/v1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/util/uuid"
26-
"k8s.io/kubernetes/pkg/api"
26+
"k8s.io/kubernetes/pkg/api/testapi"
2727
"k8s.io/kubernetes/test/e2e/framework"
2828

2929
. "github.com/onsi/ginkgo"
@@ -74,7 +74,7 @@ func testPodWithSsd(command string) *v1.Pod {
7474
return &v1.Pod{
7575
TypeMeta: metav1.TypeMeta{
7676
Kind: "Pod",
77-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
77+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
7878
},
7979
ObjectMeta: metav1.ObjectMeta{
8080
Name: podName,

‎test/e2e/kubectl/proxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/util/intstr"
3333
"k8s.io/apimachinery/pkg/util/net"
3434
clientset "k8s.io/client-go/kubernetes"
35-
"k8s.io/kubernetes/pkg/api"
35+
"k8s.io/kubernetes/pkg/api/testapi"
3636
"k8s.io/kubernetes/test/e2e/framework"
3737
testutils "k8s.io/kubernetes/test/utils"
3838

@@ -52,7 +52,7 @@ const (
5252
)
5353

5454
var _ = SIGDescribe("Kubectl Proxy", func() {
55-
version := api.Registry.GroupOrDie(v1.GroupName).GroupVersion.Version
55+
version := testapi.Groups[v1.GroupName].GroupVersion().Version
5656
Context("version "+version, func() {
5757
options := framework.FrameworkOptions{
5858
ClientQPS: -1.0,

‎test/e2e/kubelet.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/util/uuid"
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
clientset "k8s.io/client-go/kubernetes"
31-
"k8s.io/kubernetes/pkg/api"
31+
"k8s.io/kubernetes/pkg/api/testapi"
3232
"k8s.io/kubernetes/test/e2e/framework"
3333
testutils "k8s.io/kubernetes/test/utils"
3434

@@ -172,7 +172,7 @@ func createPodUsingNfs(f *framework.Framework, c clientset.Interface, ns, nfsIP,
172172
pod := &v1.Pod{
173173
TypeMeta: metav1.TypeMeta{
174174
Kind: "Pod",
175-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
175+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
176176
},
177177
ObjectMeta: metav1.ObjectMeta{
178178
GenerateName: "pod-nfs-vol-",

‎test/e2e/storage/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ go_library(
3131
],
3232
tags = ["automanaged"],
3333
deps = [
34-
"//pkg/api:go_default_library",
34+
"//pkg/api/testapi:go_default_library",
3535
"//pkg/api/v1/helper:go_default_library",
3636
"//pkg/apis/storage/v1/util:go_default_library",
3737
"//pkg/cloudprovider/providers/vsphere:go_default_library",

‎test/e2e/storage/pd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"k8s.io/apimachinery/pkg/types"
3737
"k8s.io/apimachinery/pkg/util/uuid"
3838
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
39-
"k8s.io/kubernetes/pkg/api"
39+
"k8s.io/kubernetes/pkg/api/testapi"
4040
"k8s.io/kubernetes/test/e2e/framework"
4141
)
4242

@@ -619,7 +619,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num
619619
pod := &v1.Pod{
620620
TypeMeta: metav1.TypeMeta{
621621
Kind: "Pod",
622-
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
622+
APIVersion: testapi.Groups[v1.GroupName].GroupVersion().String(),
623623
},
624624
ObjectMeta: metav1.ObjectMeta{
625625
Name: "pd-test-" + string(uuid.NewUUID()),

‎test/integration/apiserver/apiserver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func newRS(namespace string) *v1beta1.ReplicaSet {
102102
var cascDel = `
103103
{
104104
"kind": "DeleteOptions",
105-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
105+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
106106
"orphanDependents": false
107107
}
108108
`

‎test/integration/auth/accessreview_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/apiserver/pkg/authorization/authorizer"
2929
restclient "k8s.io/client-go/rest"
3030
"k8s.io/kubernetes/pkg/api"
31+
"k8s.io/kubernetes/pkg/api/testapi"
3132
authorizationapi "k8s.io/kubernetes/pkg/apis/authorization"
3233
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
3334
"k8s.io/kubernetes/plugin/pkg/admission/admit"
@@ -60,7 +61,7 @@ func TestSubjectAccessReview(t *testing.T) {
6061
_, s, closeFn := framework.RunAMaster(masterConfig)
6162
defer closeFn()
6263

63-
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}})
64+
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Groups[api.GroupName].GroupVersion()}})
6465

6566
tests := []struct {
6667
name string
@@ -154,7 +155,7 @@ func TestSelfSubjectAccessReview(t *testing.T) {
154155
_, s, closeFn := framework.RunAMaster(masterConfig)
155156
defer closeFn()
156157

157-
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}})
158+
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Groups[api.GroupName].GroupVersion()}})
158159

159160
tests := []struct {
160161
name string
@@ -234,7 +235,7 @@ func TestLocalSubjectAccessReview(t *testing.T) {
234235
_, s, closeFn := framework.RunAMaster(masterConfig)
235236
defer closeFn()
236237

237-
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}})
238+
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Groups[api.GroupName].GroupVersion()}})
238239

239240
tests := []struct {
240241
name string

‎test/integration/auth/auth_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func timeoutPath(resource, namespace, name string) string {
108108
var aPod string = `
109109
{
110110
"kind": "Pod",
111-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
111+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
112112
"metadata": {
113113
"name": "a",
114114
"creationTimestamp": null%s
@@ -126,7 +126,7 @@ var aPod string = `
126126
var aRC string = `
127127
{
128128
"kind": "ReplicationController",
129-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
129+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
130130
"metadata": {
131131
"name": "a",
132132
"labels": {
@@ -159,7 +159,7 @@ var aRC string = `
159159
var aService string = `
160160
{
161161
"kind": "Service",
162-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
162+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
163163
"metadata": {
164164
"name": "a",
165165
"labels": {
@@ -183,7 +183,7 @@ var aService string = `
183183
var aNode string = `
184184
{
185185
"kind": "Node",
186-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
186+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
187187
"metadata": {
188188
"name": "a"%s
189189
},
@@ -197,7 +197,7 @@ func aEvent(namespace string) string {
197197
return `
198198
{
199199
"kind": "Event",
200-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
200+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
201201
"metadata": {
202202
"name": "a"%s
203203
},
@@ -214,7 +214,7 @@ func aEvent(namespace string) string {
214214
var aBinding string = `
215215
{
216216
"kind": "Binding",
217-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
217+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
218218
"metadata": {
219219
"name": "a"%s
220220
},
@@ -237,7 +237,7 @@ var emptyEndpoints string = `
237237
var aEndpoints string = `
238238
{
239239
"kind": "Endpoints",
240-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
240+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
241241
"metadata": {
242242
"name": "a"%s
243243
},
@@ -262,7 +262,7 @@ var aEndpoints string = `
262262
var deleteNow string = `
263263
{
264264
"kind": "DeleteOptions",
265-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
265+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
266266
"gracePeriodSeconds": 0%s
267267
}
268268
`

‎test/integration/auth/rbac_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ var (
221221
`
222222
podNamespace = `
223223
{
224-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
224+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
225225
"kind": "Namespace",
226226
"metadata": {
227227
"name": "pod-namespace"%s
@@ -230,7 +230,7 @@ var (
230230
`
231231
jobNamespace = `
232232
{
233-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
233+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
234234
"kind": "Namespace",
235235
"metadata": {
236236
"name": "job-namespace"%s
@@ -239,7 +239,7 @@ var (
239239
`
240240
forbiddenNamespace = `
241241
{
242-
"apiVersion": "` + api.Registry.GroupOrDie(api.GroupName).GroupVersion.String() + `",
242+
"apiVersion": "` + testapi.Groups[api.GroupName].GroupVersion().String() + `",
243243
"kind": "Namespace",
244244
"metadata": {
245245
"name": "forbidden-namespace"%s
@@ -510,7 +510,7 @@ func TestBootstrapping(t *testing.T) {
510510
_, s, closeFn := framework.RunAMaster(masterConfig)
511511
defer closeFn()
512512

513-
clientset := clientset.NewForConfigOrDie(&restclient.Config{BearerToken: superUser, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}})
513+
clientset := clientset.NewForConfigOrDie(&restclient.Config{BearerToken: superUser, Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Groups[api.GroupName].GroupVersion()}})
514514

515515
watcher, err := clientset.Rbac().ClusterRoles().Watch(metav1.ListOptions{ResourceVersion: "0"})
516516
if err != nil {

0 commit comments

Comments
 (0)