github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 15:05:20 +00:00
Code Issues Projects Releases Wiki Activity

remove testapi.Default.GroupVersion

Browse Source
This commit is contained in:
deads2k
2016-10-04 17:20:07 -04:00
parent 6d56d0337a
commit 518d5500c7
88 changed files with 393 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/integration/auth/auth_test.go
View File

@@ -38,6 +38,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apimachinery/registered"
authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
"k8s.io/kubernetes/pkg/apis/autoscaling"
"k8s.io/kubernetes/pkg/apis/extensions"
@@ -108,7 +109,7 @@ func timeoutPath(resource, namespace, name string) string {
var aPod string = `
{
"kind": "Pod",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a",
"creationTimestamp": null%s
@@ -126,7 +127,7 @@ var aPod string = `
var aRC string = `
{
"kind": "ReplicationController",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a",
"labels": {
@@ -159,7 +160,7 @@ var aRC string = `
var aService string = `
{
"kind": "Service",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a",
"labels": {
@@ -183,7 +184,7 @@ var aService string = `
var aNode string = `
{
"kind": "Node",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a"%s
},
@@ -197,7 +198,7 @@ func aEvent(namespace string) string {
return `
{
"kind": "Event",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a"%s
},
@@ -214,7 +215,7 @@ func aEvent(namespace string) string {
var aBinding string = `
{
"kind": "Binding",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a"%s
},
@@ -237,7 +238,7 @@ var emptyEndpoints string = `
var aEndpoints string = `
{
"kind": "Endpoints",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"metadata": {
"name": "a"%s
},
@@ -262,7 +263,7 @@ var aEndpoints string = `
var deleteNow string = `
{
"kind": "DeleteOptions",
"apiVersion": "` + testapi.Default.GroupVersion().String() + `",
"apiVersion": "` + registered.GroupOrDie(api.GroupName).GroupVersion.String() + `",
"gracePeriodSeconds": 0%s
}
`