scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-27 03:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix dynamic client name

Browse Source
This commit is contained in:
David Eads
2018-05-09 12:58:12 -04:00
parent d8924bc1c9
commit fd044d152e
35 changed files with 96 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/BUILD
View File

@@ -206,7 +206,6 @@ filegroup(
"//pkg/kubectl/metricsutil:all-srcs",
"//pkg/kubectl/plugins:all-srcs",
"//pkg/kubectl/proxy:all-srcs",
"//pkg/kubectl/resource:all-srcs",
"//pkg/kubectl/scheme:all-srcs",
"//pkg/kubectl/util:all-srcs",
"//pkg/kubectl/validation:all-srcs",

8
pkg/kubectl/cmd/apply.go
View File

@@ -82,7 +82,7 @@ type ApplyOptions struct {
Builder *resource.Builder
Mapper meta.RESTMapper
Scaler scaleclient.ScalesGetter
DynamicClient dynamic.DynamicInterface
DynamicClient dynamic.Interface
ClientSetFunc func() (internalclientset.Interface, error)
OpenAPISchema openapi.Resources
@@ -580,7 +580,7 @@ func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (n
type pruner struct {
mapper meta.RESTMapper
dynamicClient dynamic.DynamicInterface
dynamicClient dynamic.Interface
clientsetFunc func() (internalclientset.Interface, error)
visitedUids sets.String
@@ -649,7 +649,7 @@ func (p *pruner) delete(namespace, name string, mapping *meta.RESTMapping, scale
return runDelete(namespace, name, mapping, p.dynamicClient, p.cascade, p.gracePeriod, p.clientsetFunc, scaleClient)
}
func runDelete(namespace, name string, mapping *meta.RESTMapping, c dynamic.DynamicInterface, cascade bool, gracePeriod int, clientsetFunc func() (internalclientset.Interface, error), scaleClient scaleclient.ScalesGetter) error {
func runDelete(namespace, name string, mapping *meta.RESTMapping, c dynamic.Interface, cascade bool, gracePeriod int, clientsetFunc func() (internalclientset.Interface, error), scaleClient scaleclient.ScalesGetter) error {
if !cascade {
return c.Resource(mapping.Resource).Namespace(namespace).Delete(name, nil)
}
@@ -681,7 +681,7 @@ func (p *patcher) delete(namespace, name string) error {
type patcher struct {
mapping *meta.RESTMapping
helper *resource.Helper
dynamicClient dynamic.DynamicInterface
dynamicClient dynamic.Interface
clientsetFunc func() (internalclientset.Interface, error)
overwrite bool

2
pkg/kubectl/cmd/create/BUILD
View File

@@ -82,7 +82,7 @@ go_test(
"//pkg/kubectl/cmd/testing:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/genericclioptions:go_default_library",
"//pkg/kubectl/resource:go_default_library",
"//pkg/kubectl/genericclioptions/resource:go_default_library",
"//pkg/kubectl/scheme:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",

2
pkg/kubectl/cmd/create/create.go
View File

@@ -348,7 +348,7 @@ type CreateSubcommandOptions struct {
EnforceNamespace bool
Mapper meta.RESTMapper
DynamicClient dynamic.DynamicInterface
DynamicClient dynamic.Interface
PrintObj func(obj kruntime.Object) error

2
pkg/kubectl/cmd/create/create_test.go
View File

@@ -29,7 +29,7 @@ import (
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
"k8s.io/kubernetes/pkg/kubectl/scheme"
)

2
pkg/kubectl/cmd/expose.go
View File

@@ -100,7 +100,7 @@ type ExposeServiceOptions struct {
Namespace string
Mapper meta.RESTMapper
DynamicClient dynamic.DynamicInterface
DynamicClient dynamic.Interface
Builder *resource.Builder
Recorder genericclioptions.Recorder

2
pkg/kubectl/cmd/get/BUILD
View File

@@ -75,7 +75,7 @@ go_test(
"//pkg/kubectl/cmd/util/openapi:go_default_library",
"//pkg/kubectl/cmd/util/openapi/testing:go_default_library",
"//pkg/kubectl/genericclioptions:go_default_library",
"//pkg/kubectl/resource:go_default_library",
"//pkg/kubectl/genericclioptions/resource:go_default_library",
"//pkg/kubectl/scheme:go_default_library",
"//pkg/printers:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",

2
pkg/kubectl/cmd/get/get_test.go
View File

@@ -48,7 +48,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
"k8s.io/kubernetes/pkg/kubectl/scheme"
)

2
pkg/kubectl/cmd/run.go
View File

@@ -107,7 +107,7 @@ type RunOptions struct {
PrintObj func(runtime.Object) error
Recorder genericclioptions.Recorder
DynamicClient dynamic.DynamicInterface
DynamicClient dynamic.Interface
ArgsLenAtDash int
Attach bool

2
pkg/kubectl/cmd/testing/fake.go
View File

@@ -398,7 +398,7 @@ func (f *TestFactory) ClientSet() (internalclientset.Interface, error) {
return clientset, nil
}
func (f *TestFactory) DynamicClient() (dynamic.DynamicInterface, error) {
func (f *TestFactory) DynamicClient() (dynamic.Interface, error) {
if f.FakeDynamicClient != nil {
return f.FakeDynamicClient, nil
}

2
pkg/kubectl/cmd/util/factory.go
View File

@@ -85,7 +85,7 @@ type ClientAccessFactory interface {
ClientSet() (internalclientset.Interface, error)
// DynamicClient returns a dynamic client ready for use
DynamicClient() (dynamic.DynamicInterface, error)
DynamicClient() (dynamic.Interface, error)
// KubernetesClientSet gives you back an external clientset
KubernetesClientSet() (*kubernetes.Clientset, error)

2
pkg/kubectl/cmd/util/factory_client_access.go
View File

@@ -114,7 +114,7 @@ func (f *ring0Factory) ClientSet() (internalclientset.Interface, error) {
return internalclientset.NewForConfig(clientConfig)
}
func (f *ring0Factory) DynamicClient() (dynamic.DynamicInterface, error) {
func (f *ring0Factory) DynamicClient() (dynamic.Interface, error) {
clientConfig, err := f.ClientConfig()
if err != nil {
return nil, err

2
pkg/kubectl/genericclioptions/resource/BUILD
View File

@@ -11,6 +11,7 @@ go_library(
"interfaces.go",
"mapper.go",
"result.go",
"scheme.go",
"selector.go",
"visitor.go",
],
@@ -36,6 +37,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/discovery:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/restmapper:go_default_library",
],

0
pkg/kubectl/resource/scheme.go → pkg/kubectl/genericclioptions/resource/scheme.go
View File