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

pkg/api/legacyscheme: fixup imports

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-10-16 13:41:50 +02:00
parent a31075b1b3
commit 7773a30f67
308 changed files with 1298 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubectl/cmd/cmd_test.go
View File

@@ -37,6 +37,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -61,9 +62,9 @@ func defaultClientConfig() *restclient.Config {
return &restclient.Config{
APIPath: "/api",
ContentConfig: restclient.ContentConfig{
NegotiatedSerializer: api.Codecs,
NegotiatedSerializer: legacyscheme.Codecs,
ContentType: runtime.ContentTypeJSON,
GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
GroupVersion: &legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion,
},
}
}
@@ -72,7 +73,7 @@ func defaultClientConfigForVersion(version *schema.GroupVersion) *restclient.Con
return &restclient.Config{
APIPath: "/api",
ContentConfig: restclient.ContentConfig{
NegotiatedSerializer: api.Codecs,
NegotiatedSerializer: legacyscheme.Codecs,
ContentType: runtime.ContentTypeJSON,
GroupVersion: version,
},
@@ -162,7 +163,7 @@ func Example_printReplicationControllerWithNamespace() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -215,7 +216,7 @@ func Example_printMultiContainersReplicationControllerWithWide() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -269,7 +270,7 @@ func Example_printReplicationController() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -324,7 +325,7 @@ func Example_printPodWithWideFormat() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -367,7 +368,7 @@ func Example_printPodWithShowLabels() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -504,7 +505,7 @@ func Example_printPodHideTerminated() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -540,7 +541,7 @@ func Example_printPodShowAll() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}
@@ -569,7 +570,7 @@ func Example_printServiceWithNamespacesAndLabels() {
printersinternal.AddHandlers(p)
tf.Printer = p
tf.Client = &fake.RESTClient{
APIRegistry: api.Registry,
APIRegistry: legacyscheme.Registry,
NegotiatedSerializer: ns,
Client: nil,
}