Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a89291a5
Commit
a89291a5
authored
Apr 26, 2018
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stop duplicating preferred version order
parent
b8ab2891
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
65 changed files
with
157 additions
and
201 deletions
+157
-201
testapi.go
pkg/api/testapi/testapi.go
+18
-18
conversion_test.go
pkg/api/testing/conversion_test.go
+3
-3
copy_test.go
pkg/api/testing/copy_test.go
+2
-2
install_test.go
pkg/apis/core/install/install_test.go
+2
-2
validation_test.go
pkg/apis/core/validation/validation_test.go
+16
-16
listwatch_test.go
pkg/client/tests/listwatch_test.go
+4
-4
controller_utils_test.go
pkg/controller/controller_utils_test.go
+3
-3
daemon_controller_test.go
pkg/controller/daemon/daemon_controller_test.go
+2
-2
deployment_controller_test.go
pkg/controller/deployment/deployment_controller_test.go
+1
-1
disruption_test.go
pkg/controller/disruption/disruption_test.go
+7
-7
endpoints_controller_test.go
pkg/controller/endpoint/endpoints_controller_test.go
+3
-3
job_controller_test.go
pkg/controller/job/job_controller_test.go
+0
-0
replica_set_test.go
pkg/controller/replicaset/replica_set_test.go
+8
-8
attach_test.go
pkg/kubectl/cmd/attach_test.go
+5
-5
convert.go
pkg/kubectl/cmd/convert.go
+2
-2
drain_test.go
pkg/kubectl/cmd/drain_test.go
+2
-2
get_test.go
pkg/kubectl/cmd/get/get_test.go
+1
-1
fake.go
pkg/kubectl/cmd/testing/fake.go
+1
-1
helpers_test.go
pkg/kubectl/cmd/util/helpers_test.go
+5
-5
rolling_updater_test.go
pkg/kubectl/rolling_updater_test.go
+4
-4
common.go
pkg/kubelet/config/common.go
+1
-1
http_test.go
pkg/kubelet/config/http_test.go
+5
-5
ref_test.go
pkg/kubelet/container/ref_test.go
+7
-7
kubelet_pods_test.go
pkg/kubelet/kubelet_pods_test.go
+8
-8
master_test.go
pkg/master/master_test.go
+1
-1
printers_test.go
pkg/printers/internalversion/printers_test.go
+4
-4
storage_apiserver.go
pkg/registry/admissionregistration/rest/storage_apiserver.go
+0
-2
storage_apps.go
pkg/registry/apps/rest/storage_apps.go
+0
-3
storage_authentication.go
pkg/registry/authentication/rest/storage_authentication.go
+0
-2
storage_authorization.go
pkg/registry/authorization/rest/storage_authorization.go
+0
-2
storage_autoscaling.go
pkg/registry/autoscaling/rest/storage_autoscaling.go
+0
-2
storage_batch.go
pkg/registry/batch/rest/storage_batch.go
+0
-3
storage_certificates.go
pkg/registry/certificates/rest/storage_certificates.go
+0
-1
strategy_test.go
pkg/registry/core/event/strategy_test.go
+3
-3
strategy_test.go
pkg/registry/core/namespace/strategy_test.go
+1
-1
strategy_test.go
pkg/registry/core/node/strategy_test.go
+1
-1
strategy_test.go
pkg/registry/core/persistentvolume/strategy_test.go
+1
-1
strategy_test.go
pkg/registry/core/persistentvolumeclaim/strategy_test.go
+1
-1
strategy_test.go
pkg/registry/core/pod/strategy_test.go
+1
-1
strategy_test.go
pkg/registry/core/replicationcontroller/strategy_test.go
+1
-1
strategy_test.go
pkg/registry/core/secret/strategy_test.go
+1
-1
storage_events.go
pkg/registry/events/rest/storage_events.go
+0
-1
storage_extensions.go
pkg/registry/extensions/rest/storage_extensions.go
+0
-1
storage_settings.go
pkg/registry/networking/rest/storage_settings.go
+0
-1
storage_policy.go
pkg/registry/policy/rest/storage_policy.go
+0
-1
storage_rbac.go
pkg/registry/rbac/rest/storage_rbac.go
+0
-3
storage_scheduling.go
pkg/registry/scheduling/rest/storage_scheduling.go
+0
-1
storage_settings.go
pkg/registry/settings/rest/storage_settings.go
+0
-1
storage_storage.go
pkg/registry/storage/rest/storage_storage.go
+0
-3
compatibility_test.go
...cheduler/algorithmprovider/defaults/compatibility_test.go
+1
-1
factory_test.go
pkg/scheduler/factory/factory_test.go
+10
-10
testutil.go
pkg/scheduler/util/testutil.go
+1
-1
apiserver.go
...k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
+0
-1
group_factory.go
.../apimachinery/pkg/apimachinery/announced/group_factory.go
+0
-2
registered.go
...io/apimachinery/pkg/apimachinery/registered/registered.go
+2
-2
registered_test.go
...imachinery/pkg/apimachinery/registered/registered_test.go
+4
-4
types.go
staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
+1
-4
types_test.go
...ng/src/k8s.io/apimachinery/pkg/apimachinery/types_test.go
+0
-4
genericapiserver.go
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
+5
-5
genericapiserver_test.go
.../src/k8s.io/apiserver/pkg/server/genericapiserver_test.go
+5
-6
helpers_test.go
...8s.io/apiserver/pkg/server/resourceconfig/helpers_test.go
+0
-2
resource_encoding_config.go
.../apiserver/pkg/server/storage/resource_encoding_config.go
+1
-1
generator_for_group.go
...enerator/cmd/client-gen/generators/generator_for_group.go
+2
-2
storage_apiservice.go
...egator/pkg/registry/apiservice/rest/storage_apiservice.go
+0
-2
apiserver.go
...ng/src/k8s.io/sample-apiserver/pkg/apiserver/apiserver.go
+0
-2
No files found.
pkg/api/testapi/testapi.go
View file @
a89291a5
...
@@ -151,7 +151,7 @@ func init() {
...
@@ -151,7 +151,7 @@ func init() {
}
}
if
_
,
ok
:=
Groups
[
api
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
api
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
api
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
api
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
api
.
GroupName
]
=
TestGroup
{
Groups
[
api
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
api
.
SchemeGroupVersion
,
internalGroupVersion
:
api
.
SchemeGroupVersion
,
...
@@ -160,7 +160,7 @@ func init() {
...
@@ -160,7 +160,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
extensions
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
extensions
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
extensions
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
extensions
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
extensions
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
extensions
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
extensions
.
GroupName
]
=
TestGroup
{
Groups
[
extensions
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
extensions
.
SchemeGroupVersion
,
internalGroupVersion
:
extensions
.
SchemeGroupVersion
,
...
@@ -176,7 +176,7 @@ func init() {
...
@@ -176,7 +176,7 @@ func init() {
}
}
internalTypes
[
k
]
=
t
internalTypes
[
k
]
=
t
}
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
autoscaling
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
autoscaling
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
autoscaling
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
autoscaling
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
autoscaling
.
GroupName
]
=
TestGroup
{
Groups
[
autoscaling
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
extensions
.
SchemeGroupVersion
,
internalGroupVersion
:
extensions
.
SchemeGroupVersion
,
...
@@ -192,7 +192,7 @@ func init() {
...
@@ -192,7 +192,7 @@ func init() {
break
break
}
}
}
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
autoscaling
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
autoscaling
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
autoscaling
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
autoscaling
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
autoscaling
.
GroupName
]
=
TestGroup
{
Groups
[
autoscaling
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
autoscaling
.
SchemeGroupVersion
,
internalGroupVersion
:
autoscaling
.
SchemeGroupVersion
,
...
@@ -201,7 +201,7 @@ func init() {
...
@@ -201,7 +201,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
batch
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
batch
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
batch
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
batch
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
batch
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
batch
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
batch
.
GroupName
]
=
TestGroup
{
Groups
[
batch
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
batch
.
SchemeGroupVersion
,
internalGroupVersion
:
batch
.
SchemeGroupVersion
,
...
@@ -210,7 +210,7 @@ func init() {
...
@@ -210,7 +210,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
apps
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
apps
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
apps
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
apps
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
apps
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
apps
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
apps
.
GroupName
]
=
TestGroup
{
Groups
[
apps
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
apps
.
SchemeGroupVersion
,
internalGroupVersion
:
apps
.
SchemeGroupVersion
,
...
@@ -219,7 +219,7 @@ func init() {
...
@@ -219,7 +219,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
policy
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
policy
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
policy
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
policy
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
policy
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
policy
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
policy
.
GroupName
]
=
TestGroup
{
Groups
[
policy
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
policy
.
SchemeGroupVersion
,
internalGroupVersion
:
policy
.
SchemeGroupVersion
,
...
@@ -228,7 +228,7 @@ func init() {
...
@@ -228,7 +228,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
rbac
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
rbac
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
rbac
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
rbac
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
rbac
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
rbac
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
rbac
.
GroupName
]
=
TestGroup
{
Groups
[
rbac
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
rbac
.
SchemeGroupVersion
,
internalGroupVersion
:
rbac
.
SchemeGroupVersion
,
...
@@ -237,7 +237,7 @@ func init() {
...
@@ -237,7 +237,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
scheduling
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
scheduling
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
scheduling
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
scheduling
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
scheduling
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
scheduling
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
scheduling
.
GroupName
]
=
TestGroup
{
Groups
[
scheduling
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
scheduling
.
SchemeGroupVersion
,
internalGroupVersion
:
scheduling
.
SchemeGroupVersion
,
...
@@ -246,7 +246,7 @@ func init() {
...
@@ -246,7 +246,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
settings
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
settings
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
settings
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
settings
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
settings
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
settings
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
settings
.
GroupName
]
=
TestGroup
{
Groups
[
settings
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
settings
.
SchemeGroupVersion
,
internalGroupVersion
:
settings
.
SchemeGroupVersion
,
...
@@ -255,7 +255,7 @@ func init() {
...
@@ -255,7 +255,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
storage
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
storage
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
storage
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
storage
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
storage
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
storage
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
storage
.
GroupName
]
=
TestGroup
{
Groups
[
storage
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
storage
.
SchemeGroupVersion
,
internalGroupVersion
:
storage
.
SchemeGroupVersion
,
...
@@ -264,7 +264,7 @@ func init() {
...
@@ -264,7 +264,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
certificates
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
certificates
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
certificates
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
certificates
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
certificates
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
certificates
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
certificates
.
GroupName
]
=
TestGroup
{
Groups
[
certificates
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
certificates
.
SchemeGroupVersion
,
internalGroupVersion
:
certificates
.
SchemeGroupVersion
,
...
@@ -273,7 +273,7 @@ func init() {
...
@@ -273,7 +273,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
imagepolicy
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
imagepolicy
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
imagepolicy
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
imagepolicy
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
imagepolicy
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
imagepolicy
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
imagepolicy
.
GroupName
]
=
TestGroup
{
Groups
[
imagepolicy
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
imagepolicy
.
SchemeGroupVersion
,
internalGroupVersion
:
imagepolicy
.
SchemeGroupVersion
,
...
@@ -282,7 +282,7 @@ func init() {
...
@@ -282,7 +282,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
authorization
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
authorization
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
authorization
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
authorization
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
authorization
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
authorization
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
authorization
.
GroupName
]
=
TestGroup
{
Groups
[
authorization
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
authorization
.
SchemeGroupVersion
,
internalGroupVersion
:
authorization
.
SchemeGroupVersion
,
...
@@ -291,7 +291,7 @@ func init() {
...
@@ -291,7 +291,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
admissionregistration
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
admissionregistration
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
admissionregistration
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
admissionregistration
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
admissionregistration
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
admissionregistration
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
admissionregistration
.
GroupName
]
=
TestGroup
{
Groups
[
admissionregistration
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
admissionregistration
.
SchemeGroupVersion
,
internalGroupVersion
:
admissionregistration
.
SchemeGroupVersion
,
...
@@ -300,7 +300,7 @@ func init() {
...
@@ -300,7 +300,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
admission
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
admission
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
admission
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
admission
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
admission
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
admission
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
admission
.
GroupName
]
=
TestGroup
{
Groups
[
admission
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
admission
.
SchemeGroupVersion
,
internalGroupVersion
:
admission
.
SchemeGroupVersion
,
...
@@ -309,7 +309,7 @@ func init() {
...
@@ -309,7 +309,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
networking
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
networking
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
networking
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
networking
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
networking
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
networking
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
networking
.
GroupName
]
=
TestGroup
{
Groups
[
networking
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
networking
.
SchemeGroupVersion
,
internalGroupVersion
:
networking
.
SchemeGroupVersion
,
...
@@ -318,7 +318,7 @@ func init() {
...
@@ -318,7 +318,7 @@ func init() {
}
}
}
}
if
_
,
ok
:=
Groups
[
events
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
events
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
events
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
events
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
events
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
events
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
events
.
GroupName
]
=
TestGroup
{
Groups
[
events
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
events
.
SchemeGroupVersion
,
internalGroupVersion
:
events
.
SchemeGroupVersion
,
...
...
pkg/api/testing/conversion_test.go
View file @
a89291a5
...
@@ -46,7 +46,7 @@ func BenchmarkPodConversion(b *testing.B) {
...
@@ -46,7 +46,7 @@ func BenchmarkPodConversion(b *testing.B) {
scheme
:=
legacyscheme
.
Scheme
scheme
:=
legacyscheme
.
Scheme
for
i
:=
0
;
i
<
b
.
N
;
i
++
{
for
i
:=
0
;
i
<
b
.
N
;
i
++
{
pod
:=
&
items
[
i
%
width
]
pod
:=
&
items
[
i
%
width
]
versionedObj
,
err
:=
scheme
.
UnsafeConvertToVersion
(
pod
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
versionedObj
,
err
:=
scheme
.
UnsafeConvertToVersion
(
pod
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
if
err
!=
nil
{
if
err
!=
nil
{
b
.
Fatalf
(
"Conversion error: %v"
,
err
)
b
.
Fatalf
(
"Conversion error: %v"
,
err
)
}
}
...
@@ -70,7 +70,7 @@ func BenchmarkNodeConversion(b *testing.B) {
...
@@ -70,7 +70,7 @@ func BenchmarkNodeConversion(b *testing.B) {
var
result
*
api
.
Node
var
result
*
api
.
Node
b
.
ResetTimer
()
b
.
ResetTimer
()
for
i
:=
0
;
i
<
b
.
N
;
i
++
{
for
i
:=
0
;
i
<
b
.
N
;
i
++
{
versionedObj
,
err
:=
scheme
.
UnsafeConvertToVersion
(
&
node
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
versionedObj
,
err
:=
scheme
.
UnsafeConvertToVersion
(
&
node
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
if
err
!=
nil
{
if
err
!=
nil
{
b
.
Fatalf
(
"Conversion error: %v"
,
err
)
b
.
Fatalf
(
"Conversion error: %v"
,
err
)
}
}
...
@@ -100,7 +100,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
...
@@ -100,7 +100,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
var
result
*
api
.
ReplicationController
var
result
*
api
.
ReplicationController
b
.
ResetTimer
()
b
.
ResetTimer
()
for
i
:=
0
;
i
<
b
.
N
;
i
++
{
for
i
:=
0
;
i
<
b
.
N
;
i
++
{
versionedObj
,
err
:=
scheme
.
UnsafeConvertToVersion
(
&
replicationController
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
versionedObj
,
err
:=
scheme
.
UnsafeConvertToVersion
(
&
replicationController
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
if
err
!=
nil
{
if
err
!=
nil
{
b
.
Fatalf
(
"Conversion error: %v"
,
err
)
b
.
Fatalf
(
"Conversion error: %v"
,
err
)
}
}
...
...
pkg/api/testing/copy_test.go
View file @
a89291a5
...
@@ -35,7 +35,7 @@ import (
...
@@ -35,7 +35,7 @@ import (
func
TestDeepCopyApiObjects
(
t
*
testing
.
T
)
{
func
TestDeepCopyApiObjects
(
t
*
testing
.
T
)
{
for
i
:=
0
;
i
<
*
roundtrip
.
FuzzIters
;
i
++
{
for
i
:=
0
;
i
<
*
roundtrip
.
FuzzIters
;
i
++
{
for
_
,
version
:=
range
[]
schema
.
GroupVersion
{
testapi
.
Default
.
InternalGroupVersion
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
}
{
for
_
,
version
:=
range
[]
schema
.
GroupVersion
{
testapi
.
Default
.
InternalGroupVersion
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
}
{
f
:=
fuzzer
.
FuzzerFor
(
FuzzerFuncs
,
rand
.
NewSource
(
rand
.
Int63
()),
legacyscheme
.
Codecs
)
f
:=
fuzzer
.
FuzzerFor
(
FuzzerFuncs
,
rand
.
NewSource
(
rand
.
Int63
()),
legacyscheme
.
Codecs
)
for
kind
:=
range
legacyscheme
.
Scheme
.
KnownTypes
(
version
)
{
for
kind
:=
range
legacyscheme
.
Scheme
.
KnownTypes
(
version
)
{
doDeepCopyTest
(
t
,
version
.
WithKind
(
kind
),
f
)
doDeepCopyTest
(
t
,
version
.
WithKind
(
kind
),
f
)
...
@@ -79,7 +79,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer)
...
@@ -79,7 +79,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer)
func
TestDeepCopySingleType
(
t
*
testing
.
T
)
{
func
TestDeepCopySingleType
(
t
*
testing
.
T
)
{
for
i
:=
0
;
i
<
*
roundtrip
.
FuzzIters
;
i
++
{
for
i
:=
0
;
i
<
*
roundtrip
.
FuzzIters
;
i
++
{
for
_
,
version
:=
range
[]
schema
.
GroupVersion
{
testapi
.
Default
.
InternalGroupVersion
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
}
{
for
_
,
version
:=
range
[]
schema
.
GroupVersion
{
testapi
.
Default
.
InternalGroupVersion
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
}
{
f
:=
fuzzer
.
FuzzerFor
(
FuzzerFuncs
,
rand
.
NewSource
(
rand
.
Int63
()),
legacyscheme
.
Codecs
)
f
:=
fuzzer
.
FuzzerFor
(
FuzzerFuncs
,
rand
.
NewSource
(
rand
.
Int63
()),
legacyscheme
.
Codecs
)
doDeepCopyTest
(
t
,
version
.
WithKind
(
"Pod"
),
f
)
doDeepCopyTest
(
t
,
version
.
WithKind
(
"Pod"
),
f
)
}
}
...
...
pkg/apis/core/install/install_test.go
View file @
a89291a5
...
@@ -53,7 +53,7 @@ func TestCodec(t *testing.T) {
...
@@ -53,7 +53,7 @@ func TestCodec(t *testing.T) {
pod
:=
internal
.
Pod
{}
pod
:=
internal
.
Pod
{}
// We do want to use package registered rather than testapi here, because we
// We do want to use package registered rather than testapi here, because we
// want to test if the package install and package registered work as expected.
// want to test if the package install and package registered work as expected.
data
,
err
:=
runtime
.
Encode
(
legacyscheme
.
Codecs
.
LegacyCodec
(
legacyscheme
.
Registry
.
GroupOrDie
(
internal
.
GroupName
)
.
GroupVersion
),
&
pod
)
data
,
err
:=
runtime
.
Encode
(
legacyscheme
.
Codecs
.
LegacyCodec
(
legacyscheme
.
Registry
.
GroupOrDie
(
internal
.
GroupName
)
.
GroupVersion
s
[
0
]
),
&
pod
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
}
}
...
@@ -61,7 +61,7 @@ func TestCodec(t *testing.T) {
...
@@ -61,7 +61,7 @@ func TestCodec(t *testing.T) {
if
err
:=
json
.
Unmarshal
(
data
,
&
other
);
err
!=
nil
{
if
err
:=
json
.
Unmarshal
(
data
,
&
other
);
err
!=
nil
{
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
}
}
if
other
.
APIVersion
!=
legacyscheme
.
Registry
.
GroupOrDie
(
internal
.
GroupName
)
.
GroupVersion
.
Version
||
other
.
Kind
!=
"Pod"
{
if
other
.
APIVersion
!=
legacyscheme
.
Registry
.
GroupOrDie
(
internal
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
||
other
.
Kind
!=
"Pod"
{
t
.
Errorf
(
"unexpected unmarshalled object %#v"
,
other
)
t
.
Errorf
(
"unexpected unmarshalled object %#v"
,
other
)
}
}
}
}
...
...
pkg/apis/core/validation/validation_test.go
View file @
a89291a5
...
@@ -4025,7 +4025,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4025,7 +4025,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.annotations['key']"
,
FieldPath
:
"metadata.annotations['key']"
,
},
},
},
},
...
@@ -4034,7 +4034,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4034,7 +4034,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.labels['key']"
,
FieldPath
:
"metadata.labels['key']"
,
},
},
},
},
...
@@ -4043,7 +4043,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4043,7 +4043,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
},
},
...
@@ -4052,7 +4052,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4052,7 +4052,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.namespace"
,
FieldPath
:
"metadata.namespace"
,
},
},
},
},
...
@@ -4061,7 +4061,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4061,7 +4061,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.uid"
,
FieldPath
:
"metadata.uid"
,
},
},
},
},
...
@@ -4070,7 +4070,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4070,7 +4070,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"spec.nodeName"
,
FieldPath
:
"spec.nodeName"
,
},
},
},
},
...
@@ -4079,7 +4079,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4079,7 +4079,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"spec.serviceAccountName"
,
FieldPath
:
"spec.serviceAccountName"
,
},
},
},
},
...
@@ -4088,7 +4088,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4088,7 +4088,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"status.hostIP"
,
FieldPath
:
"status.hostIP"
,
},
},
},
},
...
@@ -4097,7 +4097,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4097,7 +4097,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"status.podIP"
,
FieldPath
:
"status.podIP"
,
},
},
},
},
...
@@ -4166,7 +4166,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4166,7 +4166,7 @@ func TestValidateEnv(t *testing.T) {
Value
:
"foo"
,
Value
:
"foo"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
},
},
...
@@ -4187,7 +4187,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4187,7 +4187,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
SecretKeyRef
:
&
core
.
SecretKeySelector
{
SecretKeyRef
:
&
core
.
SecretKeySelector
{
...
@@ -4206,7 +4206,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4206,7 +4206,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"some_var_name"
,
Name
:
"some_var_name"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
ConfigMapKeyRef
:
&
core
.
ConfigMapKeySelector
{
ConfigMapKeyRef
:
&
core
.
ConfigMapKeySelector
{
...
@@ -4225,7 +4225,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4225,7 +4225,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
SecretKeyRef
:
&
core
.
SecretKeySelector
{
SecretKeyRef
:
&
core
.
SecretKeySelector
{
...
@@ -4278,7 +4278,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4278,7 +4278,7 @@ func TestValidateEnv(t *testing.T) {
Name
:
"abc"
,
Name
:
"abc"
,
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
},
},
},
},
}},
}},
...
@@ -4303,7 +4303,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4303,7 +4303,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldPath
:
"metadata.whoops"
,
FieldPath
:
"metadata.whoops"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
},
},
},
},
}},
}},
...
@@ -4381,7 +4381,7 @@ func TestValidateEnv(t *testing.T) {
...
@@ -4381,7 +4381,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom
:
&
core
.
EnvVarSource
{
ValueFrom
:
&
core
.
EnvVarSource
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldRef
:
&
core
.
ObjectFieldSelector
{
FieldPath
:
"status.phase"
,
FieldPath
:
"status.phase"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
core
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
},
},
},
},
}},
}},
...
...
pkg/client/tests/listwatch_test.go
View file @
a89291a5
...
@@ -61,7 +61,7 @@ func buildLocation(resourcePath string, query url.Values) string {
...
@@ -61,7 +61,7 @@ func buildLocation(resourcePath string, query url.Values) string {
}
}
func
TestListWatchesCanList
(
t
*
testing
.
T
)
{
func
TestListWatchesCanList
(
t
*
testing
.
T
)
{
fieldSelectorQueryParamName
:=
metav1
.
FieldSelectorQueryParam
(
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
())
fieldSelectorQueryParamName
:=
metav1
.
FieldSelectorQueryParam
(
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
())
table
:=
[]
struct
{
table
:=
[]
struct
{
location
string
location
string
resource
string
resource
string
...
@@ -102,7 +102,7 @@ func TestListWatchesCanList(t *testing.T) {
...
@@ -102,7 +102,7 @@ func TestListWatchesCanList(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
lw
:=
NewListWatchFromClient
(
client
.
Core
()
.
RESTClient
(),
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
lw
:=
NewListWatchFromClient
(
client
.
Core
()
.
RESTClient
(),
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
lw
.
DisableChunking
=
true
lw
.
DisableChunking
=
true
// This test merely tests that the correct request is made.
// This test merely tests that the correct request is made.
...
@@ -112,7 +112,7 @@ func TestListWatchesCanList(t *testing.T) {
...
@@ -112,7 +112,7 @@ func TestListWatchesCanList(t *testing.T) {
}
}
func
TestListWatchesCanWatch
(
t
*
testing
.
T
)
{
func
TestListWatchesCanWatch
(
t
*
testing
.
T
)
{
fieldSelectorQueryParamName
:=
metav1
.
FieldSelectorQueryParam
(
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
())
fieldSelectorQueryParamName
:=
metav1
.
FieldSelectorQueryParam
(
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
())
table
:=
[]
struct
{
table
:=
[]
struct
{
rv
string
rv
string
location
string
location
string
...
@@ -169,7 +169,7 @@ func TestListWatchesCanWatch(t *testing.T) {
...
@@ -169,7 +169,7 @@ func TestListWatchesCanWatch(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
lw
:=
NewListWatchFromClient
(
client
.
Core
()
.
RESTClient
(),
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
lw
:=
NewListWatchFromClient
(
client
.
Core
()
.
RESTClient
(),
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
// This test merely tests that the correct request is made.
// This test merely tests that the correct request is made.
lw
.
Watch
(
metav1
.
ListOptions
{
ResourceVersion
:
item
.
rv
})
lw
.
Watch
(
metav1
.
ListOptions
{
ResourceVersion
:
item
.
rv
})
...
...
pkg/controller/controller_utils_test.go
View file @
a89291a5
...
@@ -62,7 +62,7 @@ func NewFakeControllerExpectationsLookup(ttl time.Duration) (*ControllerExpectat
...
@@ -62,7 +62,7 @@ func NewFakeControllerExpectationsLookup(ttl time.Duration) (*ControllerExpectat
func
newReplicationController
(
replicas
int
)
*
v1
.
ReplicationController
{
func
newReplicationController
(
replicas
int
)
*
v1
.
ReplicationController
{
rc
:=
&
v1
.
ReplicationController
{
rc
:=
&
v1
.
ReplicationController
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -124,7 +124,7 @@ func newPodList(store cache.Store, count int, status v1.PodPhase, rc *v1.Replica
...
@@ -124,7 +124,7 @@ func newPodList(store cache.Store, count int, status v1.PodPhase, rc *v1.Replica
func
newReplicaSet
(
name
string
,
replicas
int
)
*
extensions
.
ReplicaSet
{
func
newReplicaSet
(
name
string
,
replicas
int
)
*
extensions
.
ReplicaSet
{
return
&
extensions
.
ReplicaSet
{
return
&
extensions
.
ReplicaSet
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
name
,
Name
:
name
,
...
@@ -286,7 +286,7 @@ func TestCreatePods(t *testing.T) {
...
@@ -286,7 +286,7 @@ func TestCreatePods(t *testing.T) {
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
defer
testServer
.
Close
()
clientset
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
testServer
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
clientset
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
testServer
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
podControl
:=
RealPodControl
{
podControl
:=
RealPodControl
{
KubeClient
:
clientset
,
KubeClient
:
clientset
,
...
...
pkg/controller/daemon/daemon_controller_test.go
View file @
a89291a5
...
@@ -147,7 +147,7 @@ func updateStrategies() []*apps.DaemonSetUpdateStrategy {
...
@@ -147,7 +147,7 @@ func updateStrategies() []*apps.DaemonSetUpdateStrategy {
func
newNode
(
name
string
,
label
map
[
string
]
string
)
*
v1
.
Node
{
func
newNode
(
name
string
,
label
map
[
string
]
string
)
*
v1
.
Node
{
return
&
v1
.
Node
{
return
&
v1
.
Node
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
name
,
Name
:
name
,
Labels
:
label
,
Labels
:
label
,
...
@@ -197,7 +197,7 @@ func newPod(podName string, nodeName string, label map[string]string, ds *apps.D
...
@@ -197,7 +197,7 @@ func newPod(podName string, nodeName string, label map[string]string, ds *apps.D
}
}
pod
:=
&
v1
.
Pod
{
pod
:=
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
GenerateName
:
podName
,
GenerateName
:
podName
,
Labels
:
newLabels
,
Labels
:
newLabels
,
...
...
pkg/controller/deployment/deployment_controller_test.go
View file @
a89291a5
...
@@ -78,7 +78,7 @@ func newRSWithStatus(name string, specReplicas, statusReplicas int, selector map
...
@@ -78,7 +78,7 @@ func newRSWithStatus(name string, specReplicas, statusReplicas int, selector map
func
newDeployment
(
name
string
,
replicas
int
,
revisionHistoryLimit
*
int32
,
maxSurge
,
maxUnavailable
*
intstr
.
IntOrString
,
selector
map
[
string
]
string
)
*
extensions
.
Deployment
{
func
newDeployment
(
name
string
,
replicas
int
,
revisionHistoryLimit
*
int32
,
maxSurge
,
maxUnavailable
*
intstr
.
IntOrString
,
selector
map
[
string
]
string
)
*
extensions
.
Deployment
{
d
:=
extensions
.
Deployment
{
d
:=
extensions
.
Deployment
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
extensions
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
extensions
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
name
,
Name
:
name
,
...
...
pkg/controller/disruption/disruption_test.go
View file @
a89291a5
...
@@ -142,7 +142,7 @@ func newSelFooBar() *metav1.LabelSelector {
...
@@ -142,7 +142,7 @@ func newSelFooBar() *metav1.LabelSelector {
func
newMinAvailablePodDisruptionBudget
(
t
*
testing
.
T
,
minAvailable
intstr
.
IntOrString
)
(
*
policy
.
PodDisruptionBudget
,
string
)
{
func
newMinAvailablePodDisruptionBudget
(
t
*
testing
.
T
,
minAvailable
intstr
.
IntOrString
)
(
*
policy
.
PodDisruptionBudget
,
string
)
{
pdb
:=
&
policy
.
PodDisruptionBudget
{
pdb
:=
&
policy
.
PodDisruptionBudget
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -165,7 +165,7 @@ func newMinAvailablePodDisruptionBudget(t *testing.T, minAvailable intstr.IntOrS
...
@@ -165,7 +165,7 @@ func newMinAvailablePodDisruptionBudget(t *testing.T, minAvailable intstr.IntOrS
func
newMaxUnavailablePodDisruptionBudget
(
t
*
testing
.
T
,
maxUnavailable
intstr
.
IntOrString
)
(
*
policy
.
PodDisruptionBudget
,
string
)
{
func
newMaxUnavailablePodDisruptionBudget
(
t
*
testing
.
T
,
maxUnavailable
intstr
.
IntOrString
)
(
*
policy
.
PodDisruptionBudget
,
string
)
{
pdb
:=
&
policy
.
PodDisruptionBudget
{
pdb
:=
&
policy
.
PodDisruptionBudget
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -210,7 +210,7 @@ func updatePodOwnerToSs(t *testing.T, pod *v1.Pod, ss *apps.StatefulSet) {
...
@@ -210,7 +210,7 @@ func updatePodOwnerToSs(t *testing.T, pod *v1.Pod, ss *apps.StatefulSet) {
func
newPod
(
t
*
testing
.
T
,
name
string
)
(
*
v1
.
Pod
,
string
)
{
func
newPod
(
t
*
testing
.
T
,
name
string
)
(
*
v1
.
Pod
,
string
)
{
pod
:=
&
v1
.
Pod
{
pod
:=
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Annotations
:
make
(
map
[
string
]
string
),
Annotations
:
make
(
map
[
string
]
string
),
...
@@ -237,7 +237,7 @@ func newPod(t *testing.T, name string) (*v1.Pod, string) {
...
@@ -237,7 +237,7 @@ func newPod(t *testing.T, name string) (*v1.Pod, string) {
func
newReplicationController
(
t
*
testing
.
T
,
size
int32
)
(
*
v1
.
ReplicationController
,
string
)
{
func
newReplicationController
(
t
*
testing
.
T
,
size
int32
)
(
*
v1
.
ReplicationController
,
string
)
{
rc
:=
&
v1
.
ReplicationController
{
rc
:=
&
v1
.
ReplicationController
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -261,7 +261,7 @@ func newReplicationController(t *testing.T, size int32) (*v1.ReplicationControll
...
@@ -261,7 +261,7 @@ func newReplicationController(t *testing.T, size int32) (*v1.ReplicationControll
func
newDeployment
(
t
*
testing
.
T
,
size
int32
)
(
*
extensions
.
Deployment
,
string
)
{
func
newDeployment
(
t
*
testing
.
T
,
size
int32
)
(
*
extensions
.
Deployment
,
string
)
{
d
:=
&
extensions
.
Deployment
{
d
:=
&
extensions
.
Deployment
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -285,7 +285,7 @@ func newDeployment(t *testing.T, size int32) (*extensions.Deployment, string) {
...
@@ -285,7 +285,7 @@ func newDeployment(t *testing.T, size int32) (*extensions.Deployment, string) {
func
newReplicaSet
(
t
*
testing
.
T
,
size
int32
)
(
*
extensions
.
ReplicaSet
,
string
)
{
func
newReplicaSet
(
t
*
testing
.
T
,
size
int32
)
(
*
extensions
.
ReplicaSet
,
string
)
{
rs
:=
&
extensions
.
ReplicaSet
{
rs
:=
&
extensions
.
ReplicaSet
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -309,7 +309,7 @@ func newReplicaSet(t *testing.T, size int32) (*extensions.ReplicaSet, string) {
...
@@ -309,7 +309,7 @@ func newReplicaSet(t *testing.T, size int32) (*extensions.ReplicaSet, string) {
func
newStatefulSet
(
t
*
testing
.
T
,
size
int32
)
(
*
apps
.
StatefulSet
,
string
)
{
func
newStatefulSet
(
t
*
testing
.
T
,
size
int32
)
(
*
apps
.
StatefulSet
,
string
)
{
ss
:=
&
apps
.
StatefulSet
{
ss
:=
&
apps
.
StatefulSet
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
...
pkg/controller/endpoint/endpoints_controller_test.go
View file @
a89291a5
...
@@ -48,7 +48,7 @@ var emptyNodeName string
...
@@ -48,7 +48,7 @@ var emptyNodeName string
func
addPods
(
store
cache
.
Store
,
namespace
string
,
nPods
int
,
nPorts
int
,
nNotReady
int
)
{
func
addPods
(
store
cache
.
Store
,
namespace
string
,
nPods
int
,
nPorts
int
,
nNotReady
int
)
{
for
i
:=
0
;
i
<
nPods
+
nNotReady
;
i
++
{
for
i
:=
0
;
i
<
nPods
+
nNotReady
;
i
++
{
p
:=
&
v1
.
Pod
{
p
:=
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Namespace
:
namespace
,
Namespace
:
namespace
,
Name
:
fmt
.
Sprintf
(
"pod%d"
,
i
),
Name
:
fmt
.
Sprintf
(
"pod%d"
,
i
),
...
@@ -81,7 +81,7 @@ func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotRea
...
@@ -81,7 +81,7 @@ func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotRea
func
addNotReadyPodsWithSpecifiedRestartPolicyAndPhase
(
store
cache
.
Store
,
namespace
string
,
nPods
int
,
nPorts
int
,
restartPolicy
v1
.
RestartPolicy
,
podPhase
v1
.
PodPhase
)
{
func
addNotReadyPodsWithSpecifiedRestartPolicyAndPhase
(
store
cache
.
Store
,
namespace
string
,
nPods
int
,
nPorts
int
,
restartPolicy
v1
.
RestartPolicy
,
podPhase
v1
.
PodPhase
)
{
for
i
:=
0
;
i
<
nPods
;
i
++
{
for
i
:=
0
;
i
<
nPods
;
i
++
{
p
:=
&
v1
.
Pod
{
p
:=
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Namespace
:
namespace
,
Namespace
:
namespace
,
Name
:
fmt
.
Sprintf
(
"pod%d"
,
i
),
Name
:
fmt
.
Sprintf
(
"pod%d"
,
i
),
...
@@ -138,7 +138,7 @@ type endpointController struct {
...
@@ -138,7 +138,7 @@ type endpointController struct {
}
}
func
newController
(
url
string
)
*
endpointController
{
func
newController
(
url
string
)
*
endpointController
{
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
url
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
url
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
informerFactory
:=
informers
.
NewSharedInformerFactory
(
client
,
controller
.
NoResyncPeriodFunc
())
informerFactory
:=
informers
.
NewSharedInformerFactory
(
client
,
controller
.
NoResyncPeriodFunc
())
endpoints
:=
NewEndpointController
(
informerFactory
.
Core
()
.
V1
()
.
Pods
(),
informerFactory
.
Core
()
.
V1
()
.
Services
(),
endpoints
:=
NewEndpointController
(
informerFactory
.
Core
()
.
V1
()
.
Pods
(),
informerFactory
.
Core
()
.
V1
()
.
Services
(),
informerFactory
.
Core
()
.
V1
()
.
Endpoints
(),
client
)
informerFactory
.
Core
()
.
V1
()
.
Endpoints
(),
client
)
...
...
pkg/controller/job/job_controller_test.go
View file @
a89291a5
This diff is collapsed.
Click to expand it.
pkg/controller/replicaset/replica_set_test.go
View file @
a89291a5
...
@@ -89,7 +89,7 @@ func getKey(rs *apps.ReplicaSet, t *testing.T) string {
...
@@ -89,7 +89,7 @@ func getKey(rs *apps.ReplicaSet, t *testing.T) string {
func
newReplicaSet
(
replicas
int
,
selectorMap
map
[
string
]
string
)
*
apps
.
ReplicaSet
{
func
newReplicaSet
(
replicas
int
,
selectorMap
map
[
string
]
string
)
*
apps
.
ReplicaSet
{
rs
:=
&
apps
.
ReplicaSet
{
rs
:=
&
apps
.
ReplicaSet
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
UID
:
uuid
.
NewUUID
(),
UID
:
uuid
.
NewUUID
(),
Name
:
"foobar"
,
Name
:
"foobar"
,
...
@@ -203,7 +203,7 @@ func validateSyncReplicaSet(t *testing.T, fakePodControl *controller.FakePodCont
...
@@ -203,7 +203,7 @@ func validateSyncReplicaSet(t *testing.T, fakePodControl *controller.FakePodCont
}
}
func
TestSyncReplicaSetDoesNothing
(
t
*
testing
.
T
)
{
func
TestSyncReplicaSetDoesNothing
(
t
*
testing
.
T
)
{
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
fakePodControl
:=
controller
.
FakePodControl
{}
fakePodControl
:=
controller
.
FakePodControl
{}
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
defer
close
(
stopCh
)
defer
close
(
stopCh
)
...
@@ -221,7 +221,7 @@ func TestSyncReplicaSetDoesNothing(t *testing.T) {
...
@@ -221,7 +221,7 @@ func TestSyncReplicaSetDoesNothing(t *testing.T) {
}
}
func
TestDeleteFinalStateUnknown
(
t
*
testing
.
T
)
{
func
TestDeleteFinalStateUnknown
(
t
*
testing
.
T
)
{
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
fakePodControl
:=
controller
.
FakePodControl
{}
fakePodControl
:=
controller
.
FakePodControl
{}
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
defer
close
(
stopCh
)
defer
close
(
stopCh
)
...
@@ -292,7 +292,7 @@ func TestSyncReplicaSetDormancy(t *testing.T) {
...
@@ -292,7 +292,7 @@ func TestSyncReplicaSetDormancy(t *testing.T) {
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
defer
testServer
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
testServer
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
testServer
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
fakePodControl
:=
controller
.
FakePodControl
{}
fakePodControl
:=
controller
.
FakePodControl
{}
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
...
@@ -353,7 +353,7 @@ func TestSyncReplicaSetDormancy(t *testing.T) {
...
@@ -353,7 +353,7 @@ func TestSyncReplicaSetDormancy(t *testing.T) {
func
TestPodControllerLookup
(
t
*
testing
.
T
)
{
func
TestPodControllerLookup
(
t
*
testing
.
T
)
{
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
defer
close
(
stopCh
)
defer
close
(
stopCh
)
manager
,
informers
:=
testNewReplicaSetControllerFromClient
(
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}}),
stopCh
,
BurstReplicas
)
manager
,
informers
:=
testNewReplicaSetControllerFromClient
(
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}}),
stopCh
,
BurstReplicas
)
testCases
:=
[]
struct
{
testCases
:=
[]
struct
{
inRSs
[]
*
apps
.
ReplicaSet
inRSs
[]
*
apps
.
ReplicaSet
pod
*
v1
.
Pod
pod
*
v1
.
Pod
...
@@ -881,7 +881,7 @@ func (fe FakeRSExpectations) SatisfiedExpectations(controllerKey string) bool {
...
@@ -881,7 +881,7 @@ func (fe FakeRSExpectations) SatisfiedExpectations(controllerKey string) bool {
// TestRSSyncExpectations tests that a pod cannot sneak in between counting active pods
// TestRSSyncExpectations tests that a pod cannot sneak in between counting active pods
// and checking expectations.
// and checking expectations.
func
TestRSSyncExpectations
(
t
*
testing
.
T
)
{
func
TestRSSyncExpectations
(
t
*
testing
.
T
)
{
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
fakePodControl
:=
controller
.
FakePodControl
{}
fakePodControl
:=
controller
.
FakePodControl
{}
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
defer
close
(
stopCh
)
defer
close
(
stopCh
)
...
@@ -962,7 +962,7 @@ func shuffle(controllers []*apps.ReplicaSet) []*apps.ReplicaSet {
...
@@ -962,7 +962,7 @@ func shuffle(controllers []*apps.ReplicaSet) []*apps.ReplicaSet {
}
}
func
TestOverlappingRSs
(
t
*
testing
.
T
)
{
func
TestOverlappingRSs
(
t
*
testing
.
T
)
{
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
labelMap
:=
map
[
string
]
string
{
"foo"
:
"bar"
}
labelMap
:=
map
[
string
]
string
{
"foo"
:
"bar"
}
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
...
@@ -1005,7 +1005,7 @@ func TestOverlappingRSs(t *testing.T) {
...
@@ -1005,7 +1005,7 @@ func TestOverlappingRSs(t *testing.T) {
}
}
func
TestDeletionTimestamp
(
t
*
testing
.
T
)
{
func
TestDeletionTimestamp
(
t
*
testing
.
T
)
{
c
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
c
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
""
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
labelMap
:=
map
[
string
]
string
{
"foo"
:
"bar"
}
labelMap
:=
map
[
string
]
string
{
"foo"
:
"bar"
}
stopCh
:=
make
(
chan
struct
{})
stopCh
:=
make
(
chan
struct
{})
defer
close
(
stopCh
)
defer
close
(
stopCh
)
...
...
pkg/kubectl/cmd/attach_test.go
View file @
a89291a5
...
@@ -147,7 +147,7 @@ func TestPodAndContainerAttach(t *testing.T) {
...
@@ -147,7 +147,7 @@ func TestPodAndContainerAttach(t *testing.T) {
ns
:=
legacyscheme
.
Codecs
ns
:=
legacyscheme
.
Codecs
tf
.
Client
=
&
fake
.
RESTClient
{
tf
.
Client
=
&
fake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
ns
,
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
if
test
.
obj
!=
nil
{
if
test
.
obj
!=
nil
{
...
@@ -184,7 +184,7 @@ func TestPodAndContainerAttach(t *testing.T) {
...
@@ -184,7 +184,7 @@ func TestPodAndContainerAttach(t *testing.T) {
}
}
func
TestAttach
(
t
*
testing
.
T
)
{
func
TestAttach
(
t
*
testing
.
T
)
{
version
:=
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
Version
version
:=
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
tests
:=
[]
struct
{
tests
:=
[]
struct
{
name
,
version
,
podPath
,
fetchPodPath
,
attachPath
,
container
string
name
,
version
,
podPath
,
fetchPodPath
,
attachPath
,
container
string
pod
*
api
.
Pod
pod
*
api
.
Pod
...
@@ -231,7 +231,7 @@ func TestAttach(t *testing.T) {
...
@@ -231,7 +231,7 @@ func TestAttach(t *testing.T) {
ns
:=
legacyscheme
.
Codecs
ns
:=
legacyscheme
.
Codecs
tf
.
Client
=
&
fake
.
RESTClient
{
tf
.
Client
=
&
fake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
ns
,
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
...
@@ -298,7 +298,7 @@ func TestAttach(t *testing.T) {
...
@@ -298,7 +298,7 @@ func TestAttach(t *testing.T) {
}
}
func
TestAttachWarnings
(
t
*
testing
.
T
)
{
func
TestAttachWarnings
(
t
*
testing
.
T
)
{
version
:=
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
Version
version
:=
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
tests
:=
[]
struct
{
tests
:=
[]
struct
{
name
,
container
,
version
,
podPath
,
fetchPodPath
,
expectedErr
string
name
,
container
,
version
,
podPath
,
fetchPodPath
,
expectedErr
string
pod
*
api
.
Pod
pod
*
api
.
Pod
...
@@ -324,7 +324,7 @@ func TestAttachWarnings(t *testing.T) {
...
@@ -324,7 +324,7 @@ func TestAttachWarnings(t *testing.T) {
ns
:=
legacyscheme
.
Codecs
ns
:=
legacyscheme
.
Codecs
tf
.
Client
=
&
fake
.
RESTClient
{
tf
.
Client
=
&
fake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
ns
,
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
...
...
pkg/kubectl/cmd/convert.go
View file @
a89291a5
...
@@ -199,7 +199,7 @@ func objectListToVersionedObject(objects []runtime.Object, specifiedOutputVersio
...
@@ -199,7 +199,7 @@ func objectListToVersionedObject(objects []runtime.Object, specifiedOutputVersio
if
!
specifiedOutputVersion
.
Empty
()
{
if
!
specifiedOutputVersion
.
Empty
()
{
targetVersions
=
append
(
targetVersions
,
specifiedOutputVersion
)
targetVersions
=
append
(
targetVersions
,
specifiedOutputVersion
)
}
}
targetVersions
=
append
(
targetVersions
,
scheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
targetVersions
=
append
(
targetVersions
,
scheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
converted
,
err
:=
tryConvert
(
scheme
.
Scheme
,
objectList
,
targetVersions
...
)
converted
,
err
:=
tryConvert
(
scheme
.
Scheme
,
objectList
,
targetVersions
...
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
@@ -226,7 +226,7 @@ func asVersionedObject(infos []*resource.Info, forceList bool, specifiedOutputVe
...
@@ -226,7 +226,7 @@ func asVersionedObject(infos []*resource.Info, forceList bool, specifiedOutputVe
if
!
specifiedOutputVersion
.
Empty
()
{
if
!
specifiedOutputVersion
.
Empty
()
{
targetVersions
=
append
(
targetVersions
,
specifiedOutputVersion
)
targetVersions
=
append
(
targetVersions
,
specifiedOutputVersion
)
}
}
targetVersions
=
append
(
targetVersions
,
scheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
targetVersions
=
append
(
targetVersions
,
scheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
converted
,
err
:=
tryConvert
(
scheme
.
Scheme
,
object
,
targetVersions
...
)
converted
,
err
:=
tryConvert
(
scheme
.
Scheme
,
object
,
targetVersions
...
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/kubectl/cmd/drain_test.go
View file @
a89291a5
...
@@ -158,7 +158,7 @@ func TestCordon(t *testing.T) {
...
@@ -158,7 +158,7 @@ func TestCordon(t *testing.T) {
new_node
:=
&
corev1
.
Node
{}
new_node
:=
&
corev1
.
Node
{}
updated
:=
false
updated
:=
false
tf
.
Client
=
&
fake
.
RESTClient
{
tf
.
Client
=
&
fake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
ns
,
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
m
:=
&
MyReq
{
req
}
m
:=
&
MyReq
{
req
}
...
@@ -610,7 +610,7 @@ func TestDrain(t *testing.T) {
...
@@ -610,7 +610,7 @@ func TestDrain(t *testing.T) {
ns
:=
legacyscheme
.
Codecs
ns
:=
legacyscheme
.
Codecs
tf
.
Client
=
&
fake
.
RESTClient
{
tf
.
Client
=
&
fake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
ns
,
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
m
:=
&
MyReq
{
req
}
m
:=
&
MyReq
{
req
}
...
...
pkg/kubectl/cmd/get/get_test.go
View file @
a89291a5
...
@@ -77,7 +77,7 @@ func defaultClientConfig() *restclient.Config {
...
@@ -77,7 +77,7 @@ func defaultClientConfig() *restclient.Config {
ContentConfig
:
restclient
.
ContentConfig
{
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
scheme
.
Codecs
,
NegotiatedSerializer
:
scheme
.
Codecs
,
ContentType
:
runtime
.
ContentTypeJSON
,
ContentType
:
runtime
.
ContentTypeJSON
,
GroupVersion
:
&
scheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
&
scheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
},
},
}
}
}
}
...
...
pkg/kubectl/cmd/testing/fake.go
View file @
a89291a5
...
@@ -179,7 +179,7 @@ func versionErrIfFalse(b bool) error {
...
@@ -179,7 +179,7 @@ func versionErrIfFalse(b bool) error {
return
versionErr
return
versionErr
}
}
var
ValidVersion
=
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
Version
var
ValidVersion
=
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
var
InternalGV
=
schema
.
GroupVersion
{
Group
:
"apitest"
,
Version
:
runtime
.
APIVersionInternal
}
var
InternalGV
=
schema
.
GroupVersion
{
Group
:
"apitest"
,
Version
:
runtime
.
APIVersionInternal
}
var
UnlikelyGV
=
schema
.
GroupVersion
{
Group
:
"apitest"
,
Version
:
"unlikelyversion"
}
var
UnlikelyGV
=
schema
.
GroupVersion
{
Group
:
"apitest"
,
Version
:
"unlikelyversion"
}
var
ValidVersionGV
=
schema
.
GroupVersion
{
Group
:
"apitest"
,
Version
:
ValidVersion
}
var
ValidVersionGV
=
schema
.
GroupVersion
{
Group
:
"apitest"
,
Version
:
ValidVersion
}
...
...
pkg/kubectl/cmd/util/helpers_test.go
View file @
a89291a5
...
@@ -52,7 +52,7 @@ func TestMerge(t *testing.T) {
...
@@ -52,7 +52,7 @@ func TestMerge(t *testing.T) {
Name
:
"foo"
,
Name
:
"foo"
,
},
},
},
},
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s" }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
()),
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s" }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()),
expected
:
&
api
.
Pod
{
expected
:
&
api
.
Pod
{
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"foo"
,
Name
:
"foo"
,
...
@@ -80,7 +80,7 @@ func TestMerge(t *testing.T) {
...
@@ -80,7 +80,7 @@ func TestMerge(t *testing.T) {
},
},
},
},
},
},
fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "containers": [ { "name": "c1", "image": "green-image" } ] } }`, legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.String()),
fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "containers": [ { "name": "c1", "image": "green-image" } ] } }`, legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion
s[0]
.String()),
expected: &api.Pod{
expected: &api.Pod{
ObjectMeta: metav1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: "foo",
...
@@ -105,7 +105,7 @@ func TestMerge(t *testing.T) {
...
@@ -105,7 +105,7 @@ func TestMerge(t *testing.T) {
Name
:
"foo"
,
Name
:
"foo"
,
},
},
},
},
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s", "spec": { "volumes": [ {"name": "v1"}, {"name": "v2"} ] } }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
()),
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s", "spec": { "volumes": [ {"name": "v1"}, {"name": "v2"} ] } }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()),
expected
:
&
api
.
Pod
{
expected
:
&
api
.
Pod
{
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"foo"
,
Name
:
"foo"
,
...
@@ -144,7 +144,7 @@ func TestMerge(t *testing.T) {
...
@@ -144,7 +144,7 @@ func TestMerge(t *testing.T) {
obj
:
&
api
.
Service
{
obj
:
&
api
.
Service
{
Spec
:
api
.
ServiceSpec
{},
Spec
:
api
.
ServiceSpec
{},
},
},
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s", "spec": { "ports": [ { "port": 0 } ] } }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
()),
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s", "spec": { "ports": [ { "port": 0 } ] } }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()),
expected
:
&
api
.
Service
{
expected
:
&
api
.
Service
{
Spec
:
api
.
ServiceSpec
{
Spec
:
api
.
ServiceSpec
{
SessionAffinity
:
"None"
,
SessionAffinity
:
"None"
,
...
@@ -166,7 +166,7 @@ func TestMerge(t *testing.T) {
...
@@ -166,7 +166,7 @@ func TestMerge(t *testing.T) {
},
},
},
},
},
},
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s", "spec": { "selector": { "version": "v2" } } }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
()),
fragment
:
fmt
.
Sprintf
(
`{ "apiVersion": "%s", "spec": { "selector": { "version": "v2" } } }`
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()),
expected
:
&
api
.
Service
{
expected
:
&
api
.
Service
{
Spec
:
api
.
ServiceSpec
{
Spec
:
api
.
ServiceSpec
{
SessionAffinity
:
"None"
,
SessionAffinity
:
"None"
,
...
...
pkg/kubectl/rolling_updater_test.go
View file @
a89291a5
...
@@ -1468,7 +1468,7 @@ func TestUpdateRcWithRetries(t *testing.T) {
...
@@ -1468,7 +1468,7 @@ func TestUpdateRcWithRetries(t *testing.T) {
{
StatusCode
:
200
,
Header
:
header
,
Body
:
objBody
(
codec
,
rc
)},
{
StatusCode
:
200
,
Header
:
header
,
Body
:
objBody
(
codec
,
rc
)},
}
}
fakeClient
:=
&
manualfake
.
RESTClient
{
fakeClient
:=
&
manualfake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
testapi
.
Default
.
NegotiatedSerializer
(),
NegotiatedSerializer
:
testapi
.
Default
.
NegotiatedSerializer
(),
Client
:
manualfake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
manualfake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
...
@@ -1495,7 +1495,7 @@ func TestUpdateRcWithRetries(t *testing.T) {
...
@@ -1495,7 +1495,7 @@ func TestUpdateRcWithRetries(t *testing.T) {
}
}
}),
}),
}
}
clientConfig
:=
&
restclient
.
Config
{
APIPath
:
"/api"
,
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
legacyscheme
.
Codecs
,
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
}}
clientConfig
:=
&
restclient
.
Config
{
APIPath
:
"/api"
,
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
legacyscheme
.
Codecs
,
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
}}
restClient
,
_
:=
restclient
.
RESTClientFor
(
clientConfig
)
restClient
,
_
:=
restclient
.
RESTClientFor
(
clientConfig
)
restClient
.
Client
=
fakeClient
.
Client
restClient
.
Client
=
fakeClient
.
Client
clientset
:=
internalclientset
.
New
(
restClient
)
clientset
:=
internalclientset
.
New
(
restClient
)
...
@@ -1561,7 +1561,7 @@ func TestAddDeploymentHash(t *testing.T) {
...
@@ -1561,7 +1561,7 @@ func TestAddDeploymentHash(t *testing.T) {
seen
:=
sets
.
String
{}
seen
:=
sets
.
String
{}
updatedRc
:=
false
updatedRc
:=
false
fakeClient
:=
&
manualfake
.
RESTClient
{
fakeClient
:=
&
manualfake
.
RESTClient
{
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
GroupVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
NegotiatedSerializer
:
testapi
.
Default
.
NegotiatedSerializer
(),
NegotiatedSerializer
:
testapi
.
Default
.
NegotiatedSerializer
(),
Client
:
manualfake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
manualfake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
header
:=
http
.
Header
{}
header
:=
http
.
Header
{}
...
@@ -1596,7 +1596,7 @@ func TestAddDeploymentHash(t *testing.T) {
...
@@ -1596,7 +1596,7 @@ func TestAddDeploymentHash(t *testing.T) {
}
}
}),
}),
}
}
clientConfig
:=
&
restclient
.
Config
{
APIPath
:
"/api"
,
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
legacyscheme
.
Codecs
,
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
}}
clientConfig
:=
&
restclient
.
Config
{
APIPath
:
"/api"
,
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
legacyscheme
.
Codecs
,
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
}}
restClient
,
_
:=
restclient
.
RESTClientFor
(
clientConfig
)
restClient
,
_
:=
restclient
.
RESTClientFor
(
clientConfig
)
restClient
.
Client
=
fakeClient
.
Client
restClient
.
Client
=
fakeClient
.
Client
clientset
:=
internalclientset
.
New
(
restClient
)
clientset
:=
internalclientset
.
New
(
restClient
)
...
...
pkg/kubelet/config/common.go
View file @
a89291a5
...
@@ -100,7 +100,7 @@ func getSelfLink(name, namespace string) string {
...
@@ -100,7 +100,7 @@ func getSelfLink(name, namespace string) string {
if
len
(
namespace
)
==
0
{
if
len
(
namespace
)
==
0
{
namespace
=
metav1
.
NamespaceDefault
namespace
=
metav1
.
NamespaceDefault
}
}
selfLink
=
fmt
.
Sprintf
(
"/api/"
+
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
Version
+
"/namespaces/%s/pods/%s"
,
namespace
,
name
)
selfLink
=
fmt
.
Sprintf
(
"/api/"
+
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
+
"/namespaces/%s/pods/%s"
,
namespace
,
name
)
return
selfLink
return
selfLink
}
}
...
...
pkg/kubelet/config/http_test.go
View file @
a89291a5
...
@@ -72,7 +72,7 @@ func TestExtractInvalidPods(t *testing.T) {
...
@@ -72,7 +72,7 @@ func TestExtractInvalidPods(t *testing.T) {
{
{
desc
:
"Invalid volume name"
,
desc
:
"Invalid volume name"
,
pod
:
&
v1
.
Pod
{
pod
:
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
Spec
:
v1
.
PodSpec
{
Spec
:
v1
.
PodSpec
{
Volumes
:
[]
v1
.
Volume
{{
Name
:
"_INVALID_"
}},
Volumes
:
[]
v1
.
Volume
{{
Name
:
"_INVALID_"
}},
},
},
...
@@ -81,7 +81,7 @@ func TestExtractInvalidPods(t *testing.T) {
...
@@ -81,7 +81,7 @@ func TestExtractInvalidPods(t *testing.T) {
{
{
desc
:
"Duplicate volume names"
,
desc
:
"Duplicate volume names"
,
pod
:
&
v1
.
Pod
{
pod
:
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
Spec
:
v1
.
PodSpec
{
Spec
:
v1
.
PodSpec
{
Volumes
:
[]
v1
.
Volume
{{
Name
:
"repeated"
},
{
Name
:
"repeated"
}},
Volumes
:
[]
v1
.
Volume
{{
Name
:
"repeated"
},
{
Name
:
"repeated"
}},
},
},
...
@@ -90,7 +90,7 @@ func TestExtractInvalidPods(t *testing.T) {
...
@@ -90,7 +90,7 @@ func TestExtractInvalidPods(t *testing.T) {
{
{
desc
:
"Unspecified container name"
,
desc
:
"Unspecified container name"
,
pod
:
&
v1
.
Pod
{
pod
:
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
Spec
:
v1
.
PodSpec
{
Spec
:
v1
.
PodSpec
{
Containers
:
[]
v1
.
Container
{{
Name
:
""
}},
Containers
:
[]
v1
.
Container
{{
Name
:
""
}},
},
},
...
@@ -99,7 +99,7 @@ func TestExtractInvalidPods(t *testing.T) {
...
@@ -99,7 +99,7 @@ func TestExtractInvalidPods(t *testing.T) {
{
{
desc
:
"Invalid container name"
,
desc
:
"Invalid container name"
,
pod
:
&
v1
.
Pod
{
pod
:
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()},
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()},
Spec
:
v1
.
PodSpec
{
Spec
:
v1
.
PodSpec
{
Containers
:
[]
v1
.
Container
{{
Name
:
"_INVALID_"
}},
Containers
:
[]
v1
.
Container
{{
Name
:
"_INVALID_"
}},
},
},
...
@@ -331,7 +331,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
...
@@ -331,7 +331,7 @@ func TestExtractPodsFromHTTP(t *testing.T) {
func
TestURLWithHeader
(
t
*
testing
.
T
)
{
func
TestURLWithHeader
(
t
*
testing
.
T
)
{
pod
:=
&
v1
.
Pod
{
pod
:=
&
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
TypeMeta
:
metav1
.
TypeMeta
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
Kind
:
"Pod"
,
Kind
:
"Pod"
,
},
},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
...
...
pkg/kubelet/container/ref_test.go
View file @
a89291a5
...
@@ -68,14 +68,14 @@ func TestGenerateContainerRef(t *testing.T) {
...
@@ -68,14 +68,14 @@ func TestGenerateContainerRef(t *testing.T) {
okPod
=
v1
.
Pod
{
okPod
=
v1
.
Pod
{
TypeMeta
:
metav1
.
TypeMeta
{
TypeMeta
:
metav1
.
TypeMeta
{
Kind
:
"Pod"
,
Kind
:
"Pod"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
},
},
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"ok"
,
Name
:
"ok"
,
Namespace
:
"test-ns"
,
Namespace
:
"test-ns"
,
UID
:
"bar"
,
UID
:
"bar"
,
ResourceVersion
:
"42"
,
ResourceVersion
:
"42"
,
SelfLink
:
"/api/"
+
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()
+
"/pods/foo"
,
SelfLink
:
"/api/"
+
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()
+
"/pods/foo"
,
},
},
Spec
:
v1
.
PodSpec
{
Spec
:
v1
.
PodSpec
{
Containers
:
[]
v1
.
Container
{
Containers
:
[]
v1
.
Container
{
...
@@ -92,7 +92,7 @@ func TestGenerateContainerRef(t *testing.T) {
...
@@ -92,7 +92,7 @@ func TestGenerateContainerRef(t *testing.T) {
noSelfLinkPod
.
Kind
=
""
noSelfLinkPod
.
Kind
=
""
noSelfLinkPod
.
APIVersion
=
""
noSelfLinkPod
.
APIVersion
=
""
noSelfLinkPod
.
ObjectMeta
.
SelfLink
=
""
noSelfLinkPod
.
ObjectMeta
.
SelfLink
=
""
defaultedSelfLinkPod
.
ObjectMeta
.
SelfLink
=
"/api/"
+
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
()
+
"/pods/ok"
defaultedSelfLinkPod
.
ObjectMeta
.
SelfLink
=
"/api/"
+
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
()
+
"/pods/ok"
cases
:=
[]
struct
{
cases
:=
[]
struct
{
name
string
name
string
...
@@ -109,7 +109,7 @@ func TestGenerateContainerRef(t *testing.T) {
...
@@ -109,7 +109,7 @@ func TestGenerateContainerRef(t *testing.T) {
},
},
expected
:
&
v1
.
ObjectReference
{
expected
:
&
v1
.
ObjectReference
{
Kind
:
"Pod"
,
Kind
:
"Pod"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
Name
:
"ok"
,
Name
:
"ok"
,
Namespace
:
"test-ns"
,
Namespace
:
"test-ns"
,
UID
:
"bar"
,
UID
:
"bar"
,
...
@@ -124,7 +124,7 @@ func TestGenerateContainerRef(t *testing.T) {
...
@@ -124,7 +124,7 @@ func TestGenerateContainerRef(t *testing.T) {
container
:
&
v1
.
Container
{},
container
:
&
v1
.
Container
{},
expected
:
&
v1
.
ObjectReference
{
expected
:
&
v1
.
ObjectReference
{
Kind
:
"Pod"
,
Kind
:
"Pod"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
Name
:
"ok"
,
Name
:
"ok"
,
Namespace
:
"test-ns"
,
Namespace
:
"test-ns"
,
UID
:
"bar"
,
UID
:
"bar"
,
...
@@ -148,7 +148,7 @@ func TestGenerateContainerRef(t *testing.T) {
...
@@ -148,7 +148,7 @@ func TestGenerateContainerRef(t *testing.T) {
},
},
expected
:
&
v1
.
ObjectReference
{
expected
:
&
v1
.
ObjectReference
{
Kind
:
"Pod"
,
Kind
:
"Pod"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
Name
:
"ok"
,
Name
:
"ok"
,
Namespace
:
"test-ns"
,
Namespace
:
"test-ns"
,
UID
:
"bar"
,
UID
:
"bar"
,
...
@@ -165,7 +165,7 @@ func TestGenerateContainerRef(t *testing.T) {
...
@@ -165,7 +165,7 @@ func TestGenerateContainerRef(t *testing.T) {
},
},
expected
:
&
v1
.
ObjectReference
{
expected
:
&
v1
.
ObjectReference
{
Kind
:
"Pod"
,
Kind
:
"Pod"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
Name
:
"ok"
,
Name
:
"ok"
,
Namespace
:
"test-ns"
,
Namespace
:
"test-ns"
,
UID
:
"bar"
,
UID
:
"bar"
,
...
...
pkg/kubelet/kubelet_pods_test.go
View file @
a89291a5
...
@@ -38,7 +38,7 @@ import (
...
@@ -38,7 +38,7 @@ import (
core
"k8s.io/client-go/testing"
core
"k8s.io/client-go/testing"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/record"
// TODO: remove this import if
// TODO: remove this import if
// api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() is changed
// api.Registry.GroupOrDie(v1.GroupName).GroupVersion
s[0]
.String() is changed
// to "v1"?
// to "v1"?
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"
_
"k8s.io/kubernetes/pkg/apis/core/install"
_
"k8s.io/kubernetes/pkg/apis/core/install"
...
@@ -997,7 +997,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -997,7 +997,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"POD_NAME"
,
Name
:
"POD_NAME"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
},
},
...
@@ -1006,7 +1006,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -1006,7 +1006,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"POD_NAMESPACE"
,
Name
:
"POD_NAMESPACE"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.namespace"
,
FieldPath
:
"metadata.namespace"
,
},
},
},
},
...
@@ -1015,7 +1015,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -1015,7 +1015,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"POD_NODE_NAME"
,
Name
:
"POD_NODE_NAME"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"spec.nodeName"
,
FieldPath
:
"spec.nodeName"
,
},
},
},
},
...
@@ -1024,7 +1024,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -1024,7 +1024,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"POD_SERVICE_ACCOUNT_NAME"
,
Name
:
"POD_SERVICE_ACCOUNT_NAME"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"spec.serviceAccountName"
,
FieldPath
:
"spec.serviceAccountName"
,
},
},
},
},
...
@@ -1033,7 +1033,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -1033,7 +1033,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"POD_IP"
,
Name
:
"POD_IP"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"status.podIP"
,
FieldPath
:
"status.podIP"
,
},
},
},
},
...
@@ -1042,7 +1042,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -1042,7 +1042,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"HOST_IP"
,
Name
:
"HOST_IP"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"status.hostIP"
,
FieldPath
:
"status.hostIP"
,
},
},
},
},
...
@@ -1073,7 +1073,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
...
@@ -1073,7 +1073,7 @@ func TestMakeEnvironmentVariables(t *testing.T) {
Name
:
"POD_NAME"
,
Name
:
"POD_NAME"
,
ValueFrom
:
&
v1
.
EnvVarSource
{
ValueFrom
:
&
v1
.
EnvVarSource
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
FieldRef
:
&
v1
.
ObjectFieldSelector
{
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
FieldPath
:
"metadata.name"
,
FieldPath
:
"metadata.name"
,
},
},
},
},
...
...
pkg/master/master_test.go
View file @
a89291a5
...
@@ -78,7 +78,7 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, informers.SharedI
...
@@ -78,7 +78,7 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, informers.SharedI
}
}
resourceEncoding
:=
serverstorage
.
NewDefaultResourceEncodingConfig
(
legacyscheme
.
Registry
)
resourceEncoding
:=
serverstorage
.
NewDefaultResourceEncodingConfig
(
legacyscheme
.
Registry
)
resourceEncoding
.
SetVersionEncoding
(
api
.
GroupName
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
schema
.
GroupVersion
{
Group
:
api
.
GroupName
,
Version
:
runtime
.
APIVersionInternal
})
resourceEncoding
.
SetVersionEncoding
(
api
.
GroupName
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
schema
.
GroupVersion
{
Group
:
api
.
GroupName
,
Version
:
runtime
.
APIVersionInternal
})
resourceEncoding
.
SetVersionEncoding
(
autoscaling
.
GroupName
,
*
testapi
.
Autoscaling
.
GroupVersion
(),
schema
.
GroupVersion
{
Group
:
autoscaling
.
GroupName
,
Version
:
runtime
.
APIVersionInternal
})
resourceEncoding
.
SetVersionEncoding
(
autoscaling
.
GroupName
,
*
testapi
.
Autoscaling
.
GroupVersion
(),
schema
.
GroupVersion
{
Group
:
autoscaling
.
GroupName
,
Version
:
runtime
.
APIVersionInternal
})
resourceEncoding
.
SetVersionEncoding
(
batch
.
GroupName
,
*
testapi
.
Batch
.
GroupVersion
(),
schema
.
GroupVersion
{
Group
:
batch
.
GroupName
,
Version
:
runtime
.
APIVersionInternal
})
resourceEncoding
.
SetVersionEncoding
(
batch
.
GroupName
,
*
testapi
.
Batch
.
GroupVersion
(),
schema
.
GroupVersion
{
Group
:
batch
.
GroupName
,
Version
:
runtime
.
APIVersionInternal
})
// FIXME (soltysh): this GroupVersionResource override should be configurable
// FIXME (soltysh): this GroupVersionResource override should be configurable
...
...
pkg/printers/internalversion/printers_test.go
View file @
a89291a5
...
@@ -55,7 +55,7 @@ import (
...
@@ -55,7 +55,7 @@ import (
func
init
()
{
func
init
()
{
legacyscheme
.
Scheme
.
AddKnownTypes
(
testapi
.
Default
.
InternalGroupVersion
(),
&
TestPrintType
{})
legacyscheme
.
Scheme
.
AddKnownTypes
(
testapi
.
Default
.
InternalGroupVersion
(),
&
TestPrintType
{})
legacyscheme
.
Scheme
.
AddKnownTypes
(
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
&
TestPrintType
{})
legacyscheme
.
Scheme
.
AddKnownTypes
(
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
&
TestPrintType
{})
}
}
var
testData
=
TestStruct
{
var
testData
=
TestStruct
{
...
@@ -92,7 +92,7 @@ func TestVersionedPrinter(t *testing.T) {
...
@@ -92,7 +92,7 @@ func TestVersionedPrinter(t *testing.T) {
}),
}),
legacyscheme
.
Scheme
,
legacyscheme
.
Scheme
,
legacyscheme
.
Scheme
,
legacyscheme
.
Scheme
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
,
)
)
if
err
:=
p
.
PrintObj
(
original
,
nil
);
err
!=
nil
{
if
err
:=
p
.
PrintObj
(
original
,
nil
);
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
t
.
Errorf
(
"unexpected error: %v"
,
err
)
...
@@ -240,7 +240,7 @@ func TestPrinter(t *testing.T) {
...
@@ -240,7 +240,7 @@ func TestPrinter(t *testing.T) {
},
},
}
}
emptyListTest
:=
&
api
.
PodList
{}
emptyListTest
:=
&
api
.
PodList
{}
testapi
,
err
:=
legacyscheme
.
Scheme
.
ConvertToVersion
(
podTest
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
testapi
,
err
:=
legacyscheme
.
Scheme
.
ConvertToVersion
(
podTest
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
}
}
...
@@ -587,7 +587,7 @@ func TestTemplateStrings(t *testing.T) {
...
@@ -587,7 +587,7 @@ func TestTemplateStrings(t *testing.T) {
t
.
Fatalf
(
"tmpl fail: %v"
,
err
)
t
.
Fatalf
(
"tmpl fail: %v"
,
err
)
}
}
printer
:=
printers
.
NewVersionedPrinter
(
p
,
legacyscheme
.
Scheme
,
legacyscheme
.
Scheme
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
)
printer
:=
printers
.
NewVersionedPrinter
(
p
,
legacyscheme
.
Scheme
,
legacyscheme
.
Scheme
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
)
for
name
,
item
:=
range
table
{
for
name
,
item
:=
range
table
{
buffer
:=
&
bytes
.
Buffer
{}
buffer
:=
&
bytes
.
Buffer
{}
...
...
pkg/registry/admissionregistration/rest/storage_apiserver.go
View file @
a89291a5
...
@@ -39,11 +39,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -39,11 +39,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
admissionregistrationv1alpha1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
admissionregistrationv1alpha1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
admissionregistrationv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
admissionregistrationv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
admissionregistrationv1alpha1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
admissionregistrationv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
admissionregistrationv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
admissionregistrationv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
admissionregistrationv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
admissionregistrationv1beta1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
}
}
...
...
pkg/registry/apps/rest/storage_apps.go
View file @
a89291a5
...
@@ -42,15 +42,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -42,15 +42,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
appsapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
appsapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
appsapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
appsapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
appsapiv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
appsapiv1beta2
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
appsapiv1beta2
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
appsapiv1beta2
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta2Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
appsapiv1beta2
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta2Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
appsapiv1beta2
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
appsapiv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
appsapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
appsapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
appsapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
appsapiv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/authentication/rest/storage_authentication.go
View file @
a89291a5
...
@@ -45,11 +45,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -45,11 +45,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
authenticationv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
authenticationv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
authenticationv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
authenticationv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
authenticationv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
authenticationv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
authenticationv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
authenticationv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
authenticationv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
authenticationv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/authorization/rest/storage_authorization.go
View file @
a89291a5
...
@@ -48,12 +48,10 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -48,12 +48,10 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
authorizationv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
authorizationv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
authorizationv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
authorizationv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
authorizationv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
authorizationv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
authorizationv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
authorizationv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
authorizationv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
authorizationv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/autoscaling/rest/storage_autoscaling.go
View file @
a89291a5
...
@@ -37,11 +37,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -37,11 +37,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
autoscalingapiv2beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
autoscalingapiv2beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
autoscalingapiv2beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v2beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
autoscalingapiv2beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v2beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
autoscalingapiv2beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
autoscalingapiv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
autoscalingapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
autoscalingapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
autoscalingapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
autoscalingapiv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/batch/rest/storage_batch.go
View file @
a89291a5
...
@@ -39,15 +39,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -39,15 +39,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
batchapiv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
batchapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
batchapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
batchapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
batchapiv1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
batchapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
batchapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
batchapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
batchapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
batchapiv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
batchapiv2alpha1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
batchapiv2alpha1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
batchapiv2alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v2alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
batchapiv2alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v2alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
batchapiv2alpha1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/certificates/rest/storage_certificates.go
View file @
a89291a5
...
@@ -36,7 +36,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -36,7 +36,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
certificatesapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
certificatesapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
certificatesapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
certificatesapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
certificatesapiv1beta1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/core/event/strategy_test.go
View file @
a89291a5
...
@@ -42,7 +42,7 @@ func TestGetAttrs(t *testing.T) {
...
@@ -42,7 +42,7 @@ func TestGetAttrs(t *testing.T) {
Name
:
"foo"
,
Name
:
"foo"
,
Namespace
:
"baz"
,
Namespace
:
"baz"
,
UID
:
"long uid string"
,
UID
:
"long uid string"
,
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
APIVersion
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
ResourceVersion
:
"0"
,
ResourceVersion
:
"0"
,
FieldPath
:
""
,
FieldPath
:
""
,
},
},
...
@@ -58,7 +58,7 @@ func TestGetAttrs(t *testing.T) {
...
@@ -58,7 +58,7 @@ func TestGetAttrs(t *testing.T) {
"involvedObject.name"
:
"foo"
,
"involvedObject.name"
:
"foo"
,
"involvedObject.namespace"
:
"baz"
,
"involvedObject.namespace"
:
"baz"
,
"involvedObject.uid"
:
"long uid string"
,
"involvedObject.uid"
:
"long uid string"
,
"involvedObject.apiVersion"
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
"involvedObject.apiVersion"
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"involvedObject.resourceVersion"
:
"0"
,
"involvedObject.resourceVersion"
:
"0"
,
"involvedObject.fieldPath"
:
""
,
"involvedObject.fieldPath"
:
""
,
"reason"
:
"ForTesting"
,
"reason"
:
"ForTesting"
,
...
@@ -73,7 +73,7 @@ func TestGetAttrs(t *testing.T) {
...
@@ -73,7 +73,7 @@ func TestGetAttrs(t *testing.T) {
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
fset
:=
EventToSelectableFields
(
&
api
.
Event
{})
fset
:=
EventToSelectableFields
(
&
api
.
Event
{})
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"Event"
,
"Event"
,
fset
,
fset
,
nil
,
nil
,
...
...
pkg/registry/core/namespace/strategy_test.go
View file @
a89291a5
...
@@ -139,7 +139,7 @@ func TestNamespaceFinalizeStrategy(t *testing.T) {
...
@@ -139,7 +139,7 @@ func TestNamespaceFinalizeStrategy(t *testing.T) {
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"Namespace"
,
"Namespace"
,
NamespaceToSelectableFields
(
&
api
.
Namespace
{}),
NamespaceToSelectableFields
(
&
api
.
Namespace
{}),
map
[
string
]
string
{
"name"
:
"metadata.name"
},
map
[
string
]
string
{
"name"
:
"metadata.name"
},
...
...
pkg/registry/core/node/strategy_test.go
View file @
a89291a5
...
@@ -52,7 +52,7 @@ func TestMatchNode(t *testing.T) {
...
@@ -52,7 +52,7 @@ func TestMatchNode(t *testing.T) {
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"Node"
,
"Node"
,
NodeToSelectableFields
(
&
api
.
Node
{}),
NodeToSelectableFields
(
&
api
.
Node
{}),
nil
,
nil
,
...
...
pkg/registry/core/persistentvolume/strategy_test.go
View file @
a89291a5
...
@@ -29,7 +29,7 @@ import (
...
@@ -29,7 +29,7 @@ import (
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"PersistentVolume"
,
"PersistentVolume"
,
PersistentVolumeToSelectableFields
(
&
api
.
PersistentVolume
{}),
PersistentVolumeToSelectableFields
(
&
api
.
PersistentVolume
{}),
map
[
string
]
string
{
"name"
:
"metadata.name"
},
map
[
string
]
string
{
"name"
:
"metadata.name"
},
...
...
pkg/registry/core/persistentvolumeclaim/strategy_test.go
View file @
a89291a5
...
@@ -29,7 +29,7 @@ import (
...
@@ -29,7 +29,7 @@ import (
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"PersistentVolumeClaim"
,
"PersistentVolumeClaim"
,
PersistentVolumeClaimToSelectableFields
(
&
api
.
PersistentVolumeClaim
{}),
PersistentVolumeClaimToSelectableFields
(
&
api
.
PersistentVolumeClaim
{}),
map
[
string
]
string
{
"name"
:
"metadata.name"
},
map
[
string
]
string
{
"name"
:
"metadata.name"
},
...
...
pkg/registry/core/pod/strategy_test.go
View file @
a89291a5
...
@@ -371,7 +371,7 @@ func TestCheckLogLocation(t *testing.T) {
...
@@ -371,7 +371,7 @@ func TestCheckLogLocation(t *testing.T) {
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"Pod"
,
"Pod"
,
PodToSelectableFields
(
&
api
.
Pod
{}),
PodToSelectableFields
(
&
api
.
Pod
{}),
nil
,
nil
,
...
...
pkg/registry/core/replicationcontroller/strategy_test.go
View file @
a89291a5
...
@@ -149,7 +149,7 @@ func TestControllerStatusStrategy(t *testing.T) {
...
@@ -149,7 +149,7 @@ func TestControllerStatusStrategy(t *testing.T) {
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"ReplicationController"
,
"ReplicationController"
,
ControllerToSelectableFields
(
&
api
.
ReplicationController
{}),
ControllerToSelectableFields
(
&
api
.
ReplicationController
{}),
nil
,
nil
,
...
...
pkg/registry/core/secret/strategy_test.go
View file @
a89291a5
...
@@ -107,7 +107,7 @@ func TestExportSecret(t *testing.T) {
...
@@ -107,7 +107,7 @@ func TestExportSecret(t *testing.T) {
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
func
TestSelectableFieldLabelConversions
(
t
*
testing
.
T
)
{
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
apitesting
.
TestSelectableFieldLabelConversionsOfKind
(
t
,
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
String
(),
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
String
(),
"Secret"
,
"Secret"
,
SelectableFields
(
&
api
.
Secret
{}),
SelectableFields
(
&
api
.
Secret
{}),
nil
,
nil
,
...
...
pkg/registry/events/rest/storage_events.go
View file @
a89291a5
...
@@ -40,7 +40,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -40,7 +40,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
eventsapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
eventsapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
eventsapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
eventsapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
eventsapiv1beta1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/extensions/rest/storage_extensions.go
View file @
a89291a5
...
@@ -42,7 +42,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -42,7 +42,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
extensionsapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
extensionsapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
extensionsapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
extensionsapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
extensionsapiv1beta1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/networking/rest/storage_settings.go
View file @
a89291a5
...
@@ -36,7 +36,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -36,7 +36,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
networkingapiv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
networkingapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
networkingapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
networkingapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
networkingapiv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/policy/rest/storage_policy.go
View file @
a89291a5
...
@@ -37,7 +37,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -37,7 +37,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
policyapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
policyapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
policyapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
policyapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
policyapiv1beta1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
}
}
...
...
pkg/registry/rbac/rest/storage_rbac.go
View file @
a89291a5
...
@@ -72,15 +72,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -72,15 +72,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
rbacapiv1alpha1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
rbacapiv1alpha1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
rbacapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
storage
(
rbacapiv1alpha1
.
SchemeGroupVersion
,
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
rbacapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
storage
(
rbacapiv1alpha1
.
SchemeGroupVersion
,
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
rbacapiv1alpha1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
rbacapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
rbacapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
rbacapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
storage
(
rbacapiv1beta1
.
SchemeGroupVersion
,
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
rbacapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
storage
(
rbacapiv1beta1
.
SchemeGroupVersion
,
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
rbacapiv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
rbacapiv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
rbacapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
rbacapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
storage
(
rbacapiv1
.
SchemeGroupVersion
,
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
rbacapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
storage
(
rbacapiv1
.
SchemeGroupVersion
,
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
rbacapiv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/scheduling/rest/storage_scheduling.go
View file @
a89291a5
...
@@ -48,7 +48,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -48,7 +48,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
schedulingapiv1alpha1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
schedulingapiv1alpha1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
schedulingapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
schedulingapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
schedulingapiv1alpha1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/settings/rest/storage_settings.go
View file @
a89291a5
...
@@ -36,7 +36,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -36,7 +36,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
settingsapiv1alpha1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
settingsapiv1alpha1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
settingsapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
settingsapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
settingsapiv1alpha1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/registry/storage/rest/storage_storage.go
View file @
a89291a5
...
@@ -40,15 +40,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -40,15 +40,12 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
if
apiResourceConfigSource
.
VersionEnabled
(
storageapiv1alpha1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
storageapiv1alpha1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1alpha1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1alpha1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
storageapiv1alpha1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
storageapiv1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
storageapiv1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1beta1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1beta1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
storageapiv1beta1
.
SchemeGroupVersion
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
storageapiv1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
storageapiv1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
VersionedResourcesStorageMap
[
storageapiv1
.
SchemeGroupVersion
.
Version
]
=
p
.
v1Storage
(
apiResourceConfigSource
,
restOptionsGetter
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
storageapiv1
.
SchemeGroupVersion
}
}
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
...
...
pkg/scheduler/algorithmprovider/defaults/compatibility_test.go
View file @
a89291a5
...
@@ -635,7 +635,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
...
@@ -635,7 +635,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
informerFactory
:=
informers
.
NewSharedInformerFactory
(
client
,
0
)
informerFactory
:=
informers
.
NewSharedInformerFactory
(
client
,
0
)
if
_
,
err
:=
factory
.
NewConfigFactory
(
if
_
,
err
:=
factory
.
NewConfigFactory
(
...
...
pkg/scheduler/factory/factory_test.go
View file @
a89291a5
...
@@ -59,7 +59,7 @@ func TestCreate(t *testing.T) {
...
@@ -59,7 +59,7 @@ func TestCreate(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
.
Create
()
factory
.
Create
()
}
}
...
@@ -77,7 +77,7 @@ func TestCreateFromConfig(t *testing.T) {
...
@@ -77,7 +77,7 @@ func TestCreateFromConfig(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
// Pre-register some predicate and priority functions
// Pre-register some predicate and priority functions
...
@@ -122,7 +122,7 @@ func TestCreateFromConfigWithHardPodAffinitySymmetricWeight(t *testing.T) {
...
@@ -122,7 +122,7 @@ func TestCreateFromConfigWithHardPodAffinitySymmetricWeight(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
// Pre-register some predicate and priority functions
// Pre-register some predicate and priority functions
...
@@ -168,7 +168,7 @@ func TestCreateFromEmptyConfig(t *testing.T) {
...
@@ -168,7 +168,7 @@ func TestCreateFromEmptyConfig(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
configData
=
[]
byte
(
`{}`
)
configData
=
[]
byte
(
`{}`
)
...
@@ -190,7 +190,7 @@ func TestCreateFromConfigWithUnspecifiedPredicatesOrPriorities(t *testing.T) {
...
@@ -190,7 +190,7 @@ func TestCreateFromConfigWithUnspecifiedPredicatesOrPriorities(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
RegisterFitPredicate
(
"PredicateOne"
,
PredicateOne
)
RegisterFitPredicate
(
"PredicateOne"
,
PredicateOne
)
...
@@ -230,7 +230,7 @@ func TestCreateFromConfigWithEmptyPredicatesOrPriorities(t *testing.T) {
...
@@ -230,7 +230,7 @@ func TestCreateFromConfigWithEmptyPredicatesOrPriorities(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
RegisterFitPredicate
(
"PredicateOne"
,
PredicateOne
)
RegisterFitPredicate
(
"PredicateOne"
,
PredicateOne
)
...
@@ -293,7 +293,7 @@ func TestDefaultErrorFunc(t *testing.T) {
...
@@ -293,7 +293,7 @@ func TestDefaultErrorFunc(t *testing.T) {
mux
.
Handle
(
util
.
Test
.
ResourcePath
(
string
(
v1
.
ResourcePods
),
"bar"
,
"foo"
),
&
handler
)
mux
.
Handle
(
util
.
Test
.
ResourcePath
(
string
(
v1
.
ResourcePods
),
"bar"
,
"foo"
),
&
handler
)
server
:=
httptest
.
NewServer
(
mux
)
server
:=
httptest
.
NewServer
(
mux
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
factory
:=
newConfigFactory
(
client
,
v1
.
DefaultHardPodAffinitySymmetricWeight
)
queue
:=
&
core
.
FIFO
{
FIFO
:
cache
.
NewFIFO
(
cache
.
MetaNamespaceKeyFunc
)}
queue
:=
&
core
.
FIFO
{
FIFO
:
cache
.
NewFIFO
(
cache
.
MetaNamespaceKeyFunc
)}
podBackoff
:=
util
.
CreatePodBackoff
(
1
*
time
.
Millisecond
,
1
*
time
.
Second
)
podBackoff
:=
util
.
CreatePodBackoff
(
1
*
time
.
Millisecond
,
1
*
time
.
Second
)
...
@@ -364,7 +364,7 @@ func TestBind(t *testing.T) {
...
@@ -364,7 +364,7 @@ func TestBind(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
b
:=
binder
{
client
}
b
:=
binder
{
client
}
if
err
:=
b
.
Bind
(
item
.
binding
);
err
!=
nil
{
if
err
:=
b
.
Bind
(
item
.
binding
);
err
!=
nil
{
...
@@ -386,7 +386,7 @@ func TestInvalidHardPodAffinitySymmetricWeight(t *testing.T) {
...
@@ -386,7 +386,7 @@ func TestInvalidHardPodAffinitySymmetricWeight(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
// factory of "default-scheduler"
// factory of "default-scheduler"
factory
:=
newConfigFactory
(
client
,
-
1
)
factory
:=
newConfigFactory
(
client
,
-
1
)
_
,
err
:=
factory
.
Create
()
_
,
err
:=
factory
.
Create
()
...
@@ -403,7 +403,7 @@ func TestInvalidFactoryArgs(t *testing.T) {
...
@@ -403,7 +403,7 @@ func TestInvalidFactoryArgs(t *testing.T) {
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
defer
server
.
Close
()
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
}})
client
:=
clientset
.
NewForConfigOrDie
(
&
restclient
.
Config
{
Host
:
server
.
URL
,
ContentConfig
:
restclient
.
ContentConfig
{
GroupVersion
:
&
legacyscheme
.
Registry
.
GroupOrDie
(
v1
.
GroupName
)
.
GroupVersion
s
[
0
]
}})
testCases
:=
[]
struct
{
testCases
:=
[]
struct
{
hardPodAffinitySymmetricWeight
int32
hardPodAffinitySymmetricWeight
int32
...
...
pkg/scheduler/util/testutil.go
View file @
a89291a5
...
@@ -84,7 +84,7 @@ func init() {
...
@@ -84,7 +84,7 @@ func init() {
}
}
if
_
,
ok
:=
Groups
[
api
.
GroupName
];
!
ok
{
if
_
,
ok
:=
Groups
[
api
.
GroupName
];
!
ok
{
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
api
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
.
Version
}
externalGroupVersion
:=
schema
.
GroupVersion
{
Group
:
api
.
GroupName
,
Version
:
legacyscheme
.
Registry
.
GroupOrDie
(
api
.
GroupName
)
.
GroupVersion
s
[
0
]
.
Version
}
Groups
[
api
.
GroupName
]
=
TestGroup
{
Groups
[
api
.
GroupName
]
=
TestGroup
{
externalGroupVersion
:
externalGroupVersion
,
externalGroupVersion
:
externalGroupVersion
,
internalGroupVersion
:
api
.
SchemeGroupVersion
,
internalGroupVersion
:
api
.
SchemeGroupVersion
,
...
...
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go
View file @
a89291a5
...
@@ -133,7 +133,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
...
@@ -133,7 +133,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
apiResourceConfig
:=
c
.
GenericConfig
.
MergedResourceConfig
apiResourceConfig
:=
c
.
GenericConfig
.
MergedResourceConfig
apiGroupInfo
:=
genericapiserver
.
NewDefaultAPIGroupInfo
(
apiextensions
.
GroupName
,
Registry
,
Scheme
,
metav1
.
ParameterCodec
,
Codecs
)
apiGroupInfo
:=
genericapiserver
.
NewDefaultAPIGroupInfo
(
apiextensions
.
GroupName
,
Registry
,
Scheme
,
metav1
.
ParameterCodec
,
Codecs
)
if
apiResourceConfig
.
VersionEnabled
(
v1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfig
.
VersionEnabled
(
v1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
v1beta1
.
SchemeGroupVersion
storage
:=
map
[
string
]
rest
.
Storage
{}
storage
:=
map
[
string
]
rest
.
Storage
{}
// customresourcedefinitions
// customresourcedefinitions
customResourceDefintionStorage
:=
customresourcedefinition
.
NewREST
(
Scheme
,
c
.
GenericConfig
.
RESTOptionsGetter
)
customResourceDefintionStorage
:=
customresourcedefinition
.
NewREST
(
Scheme
,
c
.
GenericConfig
.
RESTOptionsGetter
)
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/announced/group_factory.go
View file @
a89291a5
...
@@ -153,11 +153,9 @@ func (gmf *GroupMetaFactory) Register(m *registered.APIRegistrationManager, sche
...
@@ -153,11 +153,9 @@ func (gmf *GroupMetaFactory) Register(m *registered.APIRegistrationManager, sche
gmf
.
GroupArgs
.
AddInternalObjectsToScheme
(
scheme
)
gmf
.
GroupArgs
.
AddInternalObjectsToScheme
(
scheme
)
}
}
preferredExternalVersion
:=
externalVersions
[
0
]
accessor
:=
meta
.
NewAccessor
()
accessor
:=
meta
.
NewAccessor
()
groupMeta
:=
&
apimachinery
.
GroupMeta
{
groupMeta
:=
&
apimachinery
.
GroupMeta
{
GroupVersion
:
preferredExternalVersion
,
GroupVersions
:
externalVersions
,
GroupVersions
:
externalVersions
,
SelfLinker
:
runtime
.
SelfLinker
(
accessor
),
SelfLinker
:
runtime
.
SelfLinker
(
accessor
),
}
}
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go
View file @
a89291a5
...
@@ -92,7 +92,7 @@ func (m *APIRegistrationManager) RegisterVersions(availableVersions []schema.Gro
...
@@ -92,7 +92,7 @@ func (m *APIRegistrationManager) RegisterVersions(availableVersions []schema.Gro
// RegisterGroup adds the given group to the list of registered groups.
// RegisterGroup adds the given group to the list of registered groups.
func
(
m
*
APIRegistrationManager
)
RegisterGroup
(
groupMeta
apimachinery
.
GroupMeta
)
error
{
func
(
m
*
APIRegistrationManager
)
RegisterGroup
(
groupMeta
apimachinery
.
GroupMeta
)
error
{
groupName
:=
groupMeta
.
GroupVersion
.
Group
groupName
:=
groupMeta
.
GroupVersion
s
[
0
]
.
Group
if
_
,
found
:=
m
.
groupMetaMap
[
groupName
];
found
{
if
_
,
found
:=
m
.
groupMetaMap
[
groupName
];
found
{
return
fmt
.
Errorf
(
"group %q is already registered in groupsMap: %v"
,
groupName
,
m
.
groupMetaMap
)
return
fmt
.
Errorf
(
"group %q is already registered in groupsMap: %v"
,
groupName
,
m
.
groupMetaMap
)
}
}
...
@@ -281,7 +281,7 @@ func (m *APIRegistrationManager) AllPreferredGroupVersions() string {
...
@@ -281,7 +281,7 @@ func (m *APIRegistrationManager) AllPreferredGroupVersions() string {
}
}
var
defaults
[]
string
var
defaults
[]
string
for
_
,
groupMeta
:=
range
m
.
groupMetaMap
{
for
_
,
groupMeta
:=
range
m
.
groupMetaMap
{
defaults
=
append
(
defaults
,
groupMeta
.
GroupVersion
.
String
())
defaults
=
append
(
defaults
,
groupMeta
.
GroupVersion
s
[
0
]
.
String
())
}
}
sort
.
Strings
(
defaults
)
sort
.
Strings
(
defaults
)
return
strings
.
Join
(
defaults
,
","
)
return
strings
.
Join
(
defaults
,
","
)
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/registered/registered_test.go
View file @
a89291a5
...
@@ -31,13 +31,13 @@ func TestAllPreferredGroupVersions(t *testing.T) {
...
@@ -31,13 +31,13 @@ func TestAllPreferredGroupVersions(t *testing.T) {
{
{
groupMetas
:
[]
apimachinery
.
GroupMeta
{
groupMetas
:
[]
apimachinery
.
GroupMeta
{
{
{
GroupVersion
:
schema
.
GroupVersion
{
Group
:
"group1"
,
Version
:
"v1"
},
GroupVersion
s
:
[]
schema
.
GroupVersion
{{
Group
:
"group1"
,
Version
:
"v1"
}
},
},
},
{
{
GroupVersion
:
schema
.
GroupVersion
{
Group
:
"group2"
,
Version
:
"v2"
},
GroupVersion
s
:
[]
schema
.
GroupVersion
{{
Group
:
"group2"
,
Version
:
"v2"
}
},
},
},
{
{
GroupVersion
:
schema
.
GroupVersion
{
Group
:
""
,
Version
:
"v1"
},
GroupVersion
s
:
[]
schema
.
GroupVersion
{{
Group
:
""
,
Version
:
"v1"
}
},
},
},
},
},
expect
:
"group1/v1,group2/v2,v1"
,
expect
:
"group1/v1,group2/v2,v1"
,
...
@@ -45,7 +45,7 @@ func TestAllPreferredGroupVersions(t *testing.T) {
...
@@ -45,7 +45,7 @@ func TestAllPreferredGroupVersions(t *testing.T) {
{
{
groupMetas
:
[]
apimachinery
.
GroupMeta
{
groupMetas
:
[]
apimachinery
.
GroupMeta
{
{
{
GroupVersion
:
schema
.
GroupVersion
{
Group
:
""
,
Version
:
"v1"
},
GroupVersion
s
:
[]
schema
.
GroupVersion
{{
Group
:
""
,
Version
:
"v1"
}
},
},
},
},
},
expect
:
"v1"
,
expect
:
"v1"
,
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/types.go
View file @
a89291a5
...
@@ -26,9 +26,6 @@ import (
...
@@ -26,9 +26,6 @@ import (
// GroupMeta stores the metadata of a group.
// GroupMeta stores the metadata of a group.
type
GroupMeta
struct
{
type
GroupMeta
struct
{
// GroupVersion represents the preferred version of the group.
GroupVersion
schema
.
GroupVersion
// GroupVersions is Group + all versions in that group.
// GroupVersions is Group + all versions in that group.
GroupVersions
[]
schema
.
GroupVersion
GroupVersions
[]
schema
.
GroupVersion
...
@@ -68,7 +65,7 @@ func (gm *GroupMeta) DefaultInterfacesFor(version schema.GroupVersion) (*meta.Ve
...
@@ -68,7 +65,7 @@ func (gm *GroupMeta) DefaultInterfacesFor(version schema.GroupVersion) (*meta.Ve
// TODO: remove the "Interfaces" suffix and make this also maintain the
// TODO: remove the "Interfaces" suffix and make this also maintain the
// .GroupVersions member.
// .GroupVersions member.
func
(
gm
*
GroupMeta
)
AddVersionInterfaces
(
version
schema
.
GroupVersion
,
interfaces
*
meta
.
VersionInterfaces
)
error
{
func
(
gm
*
GroupMeta
)
AddVersionInterfaces
(
version
schema
.
GroupVersion
,
interfaces
*
meta
.
VersionInterfaces
)
error
{
if
e
,
a
:=
gm
.
GroupVersion
.
Group
,
version
.
Group
;
a
!=
e
{
if
e
,
a
:=
gm
.
GroupVersion
s
[
0
]
.
Group
,
version
.
Group
;
a
!=
e
{
return
fmt
.
Errorf
(
"got a version in group %v, but am in group %v"
,
a
,
e
)
return
fmt
.
Errorf
(
"got a version in group %v, but am in group %v"
,
a
,
e
)
}
}
if
gm
.
InterfacesByVersion
==
nil
{
if
gm
.
InterfacesByVersion
==
nil
{
...
...
staging/src/k8s.io/apimachinery/pkg/apimachinery/types_test.go
View file @
a89291a5
...
@@ -24,10 +24,6 @@ import (
...
@@ -24,10 +24,6 @@ import (
func
TestAdd
(
t
*
testing
.
T
)
{
func
TestAdd
(
t
*
testing
.
T
)
{
gm
:=
GroupMeta
{
gm
:=
GroupMeta
{
GroupVersion
:
schema
.
GroupVersion
{
Group
:
"test"
,
Version
:
"v1"
,
},
GroupVersions
:
[]
schema
.
GroupVersion
{{
Group
:
"test"
,
Version
:
"v1"
}},
GroupVersions
:
[]
schema
.
GroupVersion
{{
Group
:
"test"
,
Version
:
"v1"
}},
}
}
...
...
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View file @
a89291a5
...
@@ -358,10 +358,10 @@ func (s *GenericAPIServer) InstallLegacyAPIGroup(apiPrefix string, apiGroupInfo
...
@@ -358,10 +358,10 @@ func (s *GenericAPIServer) InstallLegacyAPIGroup(apiPrefix string, apiGroupInfo
func
(
s
*
GenericAPIServer
)
InstallAPIGroup
(
apiGroupInfo
*
APIGroupInfo
)
error
{
func
(
s
*
GenericAPIServer
)
InstallAPIGroup
(
apiGroupInfo
*
APIGroupInfo
)
error
{
// Do not register empty group or empty version. Doing so claims /apis/ for the wrong entity to be returned.
// Do not register empty group or empty version. Doing so claims /apis/ for the wrong entity to be returned.
// Catching these here places the error much closer to its origin
// Catching these here places the error much closer to its origin
if
len
(
apiGroupInfo
.
GroupMeta
.
GroupVersion
.
Group
)
==
0
{
if
len
(
apiGroupInfo
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Group
)
==
0
{
return
fmt
.
Errorf
(
"cannot register handler with an empty group for %#v"
,
*
apiGroupInfo
)
return
fmt
.
Errorf
(
"cannot register handler with an empty group for %#v"
,
*
apiGroupInfo
)
}
}
if
len
(
apiGroupInfo
.
GroupMeta
.
GroupVersion
.
Version
)
==
0
{
if
len
(
apiGroupInfo
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Version
)
==
0
{
return
fmt
.
Errorf
(
"cannot register handler with an empty version for %#v"
,
*
apiGroupInfo
)
return
fmt
.
Errorf
(
"cannot register handler with an empty version for %#v"
,
*
apiGroupInfo
)
}
}
...
@@ -384,11 +384,11 @@ func (s *GenericAPIServer) InstallAPIGroup(apiGroupInfo *APIGroupInfo) error {
...
@@ -384,11 +384,11 @@ func (s *GenericAPIServer) InstallAPIGroup(apiGroupInfo *APIGroupInfo) error {
})
})
}
}
preferredVersionForDiscovery
:=
metav1
.
GroupVersionForDiscovery
{
preferredVersionForDiscovery
:=
metav1
.
GroupVersionForDiscovery
{
GroupVersion
:
apiGroupInfo
.
GroupMeta
.
GroupVersion
.
String
(),
GroupVersion
:
apiGroupInfo
.
GroupMeta
.
GroupVersion
s
[
0
]
.
String
(),
Version
:
apiGroupInfo
.
GroupMeta
.
GroupVersion
.
Version
,
Version
:
apiGroupInfo
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Version
,
}
}
apiGroup
:=
metav1
.
APIGroup
{
apiGroup
:=
metav1
.
APIGroup
{
Name
:
apiGroupInfo
.
GroupMeta
.
GroupVersion
.
Group
,
Name
:
apiGroupInfo
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Group
,
Versions
:
apiVersionsForDiscovery
,
Versions
:
apiVersionsForDiscovery
,
PreferredVersion
:
preferredVersionForDiscovery
,
PreferredVersion
:
preferredVersionForDiscovery
,
}
}
...
...
staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go
View file @
a89291a5
...
@@ -164,7 +164,6 @@ func TestInstallAPIGroups(t *testing.T) {
...
@@ -164,7 +164,6 @@ func TestInstallAPIGroups(t *testing.T) {
mapper
.
Add
(
gv
.
WithKind
(
kind
),
meta
.
RESTScopeNamespace
)
mapper
.
Add
(
gv
.
WithKind
(
kind
),
meta
.
RESTScopeNamespace
)
}
}
groupMeta
:=
apimachinery
.
GroupMeta
{
groupMeta
:=
apimachinery
.
GroupMeta
{
GroupVersion
:
gv
,
GroupVersions
:
[]
schema
.
GroupVersion
{
gv
},
GroupVersions
:
[]
schema
.
GroupVersion
{
gv
},
RESTMapper
:
mapper
,
RESTMapper
:
mapper
,
InterfacesFor
:
interfacesFor
,
InterfacesFor
:
interfacesFor
,
...
@@ -199,7 +198,7 @@ func TestInstallAPIGroups(t *testing.T) {
...
@@ -199,7 +198,7 @@ func TestInstallAPIGroups(t *testing.T) {
for
_
,
api
:=
range
apis
[
1
:
]
{
for
_
,
api
:=
range
apis
[
1
:
]
{
err
=
s
.
InstallAPIGroup
(
&
api
)
err
=
s
.
InstallAPIGroup
(
&
api
)
assert
.
NoError
(
err
)
assert
.
NoError
(
err
)
groupPaths
=
append
(
groupPaths
,
APIGroupPrefix
+
"/"
+
api
.
GroupMeta
.
GroupVersion
.
Group
)
// /apis/<group>
groupPaths
=
append
(
groupPaths
,
APIGroupPrefix
+
"/"
+
api
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Group
)
// /apis/<group>
}
}
server
:=
httptest
.
NewServer
(
s
.
Handler
)
server
:=
httptest
.
NewServer
(
s
.
Handler
)
...
@@ -240,19 +239,19 @@ func TestInstallAPIGroups(t *testing.T) {
...
@@ -240,19 +239,19 @@ func TestInstallAPIGroups(t *testing.T) {
continue
continue
}
}
if
got
,
expected
:=
group
.
Name
,
info
.
GroupMeta
.
GroupVersion
.
Group
;
got
!=
expected
{
if
got
,
expected
:=
group
.
Name
,
info
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Group
;
got
!=
expected
{
t
.
Errorf
(
"[%d] unexpected group name at path %q: got=%q expected=%q"
,
i
,
path
,
got
,
expected
)
t
.
Errorf
(
"[%d] unexpected group name at path %q: got=%q expected=%q"
,
i
,
path
,
got
,
expected
)
continue
continue
}
}
if
got
,
expected
:=
group
.
PreferredVersion
.
Version
,
info
.
GroupMeta
.
GroupVersion
.
Version
;
got
!=
expected
{
if
got
,
expected
:=
group
.
PreferredVersion
.
Version
,
info
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Version
;
got
!=
expected
{
t
.
Errorf
(
"[%d] unexpected group version at path %q: got=%q expected=%q"
,
i
,
path
,
got
,
expected
)
t
.
Errorf
(
"[%d] unexpected group version at path %q: got=%q expected=%q"
,
i
,
path
,
got
,
expected
)
continue
continue
}
}
}
}
// should serve APIResourceList at group path + /<group-version>
// should serve APIResourceList at group path + /<group-version>
path
=
path
+
"/"
+
info
.
GroupMeta
.
GroupVersion
.
Version
path
=
path
+
"/"
+
info
.
GroupMeta
.
GroupVersion
s
[
0
]
.
Version
resp
,
err
=
http
.
Get
(
server
.
URL
+
path
)
resp
,
err
=
http
.
Get
(
server
.
URL
+
path
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"[%d] unexpected error getting path %q path: %v"
,
i
,
path
,
err
)
t
.
Errorf
(
"[%d] unexpected error getting path %q path: %v"
,
i
,
path
,
err
)
...
@@ -274,7 +273,7 @@ func TestInstallAPIGroups(t *testing.T) {
...
@@ -274,7 +273,7 @@ func TestInstallAPIGroups(t *testing.T) {
continue
continue
}
}
if
got
,
expected
:=
resources
.
GroupVersion
,
info
.
GroupMeta
.
GroupVersion
.
String
();
got
!=
expected
{
if
got
,
expected
:=
resources
.
GroupVersion
,
info
.
GroupMeta
.
GroupVersion
s
[
0
]
.
String
();
got
!=
expected
{
t
.
Errorf
(
"[%d] unexpected groupVersion at path %q: got=%q expected=%q"
,
i
,
path
,
got
,
expected
)
t
.
Errorf
(
"[%d] unexpected groupVersion at path %q: got=%q expected=%q"
,
i
,
path
,
got
,
expected
)
continue
continue
}
}
...
...
staging/src/k8s.io/apiserver/pkg/server/resourceconfig/helpers_test.go
View file @
a89291a5
...
@@ -169,11 +169,9 @@ func newFakeRegistry() *registered.APIRegistrationManager {
...
@@ -169,11 +169,9 @@ func newFakeRegistry() *registered.APIRegistrationManager {
registry
:=
registered
.
NewOrDie
(
""
)
registry
:=
registered
.
NewOrDie
(
""
)
registry
.
RegisterGroup
(
apimachinery
.
GroupMeta
{
registry
.
RegisterGroup
(
apimachinery
.
GroupMeta
{
GroupVersion
:
apiv1
.
SchemeGroupVersion
,
GroupVersions
:
[]
schema
.
GroupVersion
{
apiv1
.
SchemeGroupVersion
},
GroupVersions
:
[]
schema
.
GroupVersion
{
apiv1
.
SchemeGroupVersion
},
})
})
registry
.
RegisterGroup
(
apimachinery
.
GroupMeta
{
registry
.
RegisterGroup
(
apimachinery
.
GroupMeta
{
GroupVersion
:
extensionsapiv1beta1
.
SchemeGroupVersion
,
GroupVersions
:
[]
schema
.
GroupVersion
{
extensionsapiv1beta1
.
SchemeGroupVersion
},
GroupVersions
:
[]
schema
.
GroupVersion
{
extensionsapiv1beta1
.
SchemeGroupVersion
},
})
})
registry
.
RegisterVersions
([]
schema
.
GroupVersion
{
apiv1
.
SchemeGroupVersion
,
extensionsapiv1beta1
.
SchemeGroupVersion
})
registry
.
RegisterVersions
([]
schema
.
GroupVersion
{
apiv1
.
SchemeGroupVersion
,
extensionsapiv1beta1
.
SchemeGroupVersion
})
...
...
staging/src/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go
View file @
a89291a5
...
@@ -89,7 +89,7 @@ func (o *DefaultResourceEncodingConfig) StorageEncodingFor(resource schema.Group
...
@@ -89,7 +89,7 @@ func (o *DefaultResourceEncodingConfig) StorageEncodingFor(resource schema.Group
if
!
groupExists
{
if
!
groupExists
{
// return the most preferred external version for the group
// return the most preferred external version for the group
return
groupMeta
.
GroupVersion
,
nil
return
groupMeta
.
GroupVersion
s
[
0
]
,
nil
}
}
resourceOverride
,
resourceExists
:=
groupEncoding
.
ExternalResourceEncodings
[
resource
.
Resource
]
resourceOverride
,
resourceExists
:=
groupEncoding
.
ExternalResourceEncodings
[
resource
.
Resource
]
...
...
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go
View file @
a89291a5
...
@@ -219,8 +219,8 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
...
@@ -219,8 +219,8 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
if config.UserAgent == "" {
if config.UserAgent == "" {
config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
}
}
if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group {
if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion
s[0]
.Group {
gv := g.GroupVersion
gv := g.GroupVersion
s[0]
config.GroupVersion = &gv
config.GroupVersion = &gv
}
}
config.NegotiatedSerializer = scheme.Codecs
config.NegotiatedSerializer = scheme.Codecs
...
...
staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/rest/storage_apiservice.go
View file @
a89291a5
...
@@ -35,7 +35,6 @@ func NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSourc
...
@@ -35,7 +35,6 @@ func NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSourc
apiGroupInfo
:=
genericapiserver
.
NewDefaultAPIGroupInfo
(
apiregistration
.
GroupName
,
aggregatorscheme
.
Registry
,
aggregatorscheme
.
Scheme
,
metav1
.
ParameterCodec
,
aggregatorscheme
.
Codecs
)
apiGroupInfo
:=
genericapiserver
.
NewDefaultAPIGroupInfo
(
apiregistration
.
GroupName
,
aggregatorscheme
.
Registry
,
aggregatorscheme
.
Scheme
,
metav1
.
ParameterCodec
,
aggregatorscheme
.
Codecs
)
if
apiResourceConfigSource
.
VersionEnabled
(
v1beta1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
v1beta1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
v1beta1
.
SchemeGroupVersion
storage
:=
map
[
string
]
rest
.
Storage
{}
storage
:=
map
[
string
]
rest
.
Storage
{}
apiServiceREST
:=
apiservicestorage
.
NewREST
(
aggregatorscheme
.
Scheme
,
restOptionsGetter
)
apiServiceREST
:=
apiservicestorage
.
NewREST
(
aggregatorscheme
.
Scheme
,
restOptionsGetter
)
storage
[
"apiservices"
]
=
apiServiceREST
storage
[
"apiservices"
]
=
apiServiceREST
...
@@ -44,7 +43,6 @@ func NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSourc
...
@@ -44,7 +43,6 @@ func NewRESTStorage(apiResourceConfigSource serverstorage.APIResourceConfigSourc
}
}
if
apiResourceConfigSource
.
VersionEnabled
(
v1
.
SchemeGroupVersion
)
{
if
apiResourceConfigSource
.
VersionEnabled
(
v1
.
SchemeGroupVersion
)
{
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
v1
.
SchemeGroupVersion
storage
:=
map
[
string
]
rest
.
Storage
{}
storage
:=
map
[
string
]
rest
.
Storage
{}
apiServiceREST
:=
apiservicestorage
.
NewREST
(
aggregatorscheme
.
Scheme
,
restOptionsGetter
)
apiServiceREST
:=
apiservicestorage
.
NewREST
(
aggregatorscheme
.
Scheme
,
restOptionsGetter
)
storage
[
"apiservices"
]
=
apiServiceREST
storage
[
"apiservices"
]
=
apiServiceREST
...
...
staging/src/k8s.io/sample-apiserver/pkg/apiserver/apiserver.go
View file @
a89291a5
...
@@ -28,7 +28,6 @@ import (
...
@@ -28,7 +28,6 @@ import (
"k8s.io/sample-apiserver/pkg/apis/wardle"
"k8s.io/sample-apiserver/pkg/apis/wardle"
"k8s.io/sample-apiserver/pkg/apis/wardle/install"
"k8s.io/sample-apiserver/pkg/apis/wardle/install"
"k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
wardleregistry
"k8s.io/sample-apiserver/pkg/registry"
wardleregistry
"k8s.io/sample-apiserver/pkg/registry"
fischerstorage
"k8s.io/sample-apiserver/pkg/registry/wardle/fischer"
fischerstorage
"k8s.io/sample-apiserver/pkg/registry/wardle/fischer"
flunderstorage
"k8s.io/sample-apiserver/pkg/registry/wardle/flunder"
flunderstorage
"k8s.io/sample-apiserver/pkg/registry/wardle/flunder"
...
@@ -109,7 +108,6 @@ func (c completedConfig) New() (*WardleServer, error) {
...
@@ -109,7 +108,6 @@ func (c completedConfig) New() (*WardleServer, error) {
}
}
apiGroupInfo
:=
genericapiserver
.
NewDefaultAPIGroupInfo
(
wardle
.
GroupName
,
registry
,
Scheme
,
metav1
.
ParameterCodec
,
Codecs
)
apiGroupInfo
:=
genericapiserver
.
NewDefaultAPIGroupInfo
(
wardle
.
GroupName
,
registry
,
Scheme
,
metav1
.
ParameterCodec
,
Codecs
)
apiGroupInfo
.
GroupMeta
.
GroupVersion
=
v1alpha1
.
SchemeGroupVersion
v1alpha1storage
:=
map
[
string
]
rest
.
Storage
{}
v1alpha1storage
:=
map
[
string
]
rest
.
Storage
{}
v1alpha1storage
[
"flunders"
]
=
wardleregistry
.
RESTInPeace
(
flunderstorage
.
NewREST
(
Scheme
,
c
.
GenericConfig
.
RESTOptionsGetter
))
v1alpha1storage
[
"flunders"
]
=
wardleregistry
.
RESTInPeace
(
flunderstorage
.
NewREST
(
Scheme
,
c
.
GenericConfig
.
RESTOptionsGetter
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment