github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.go
View File

@ -33,7 +33,7 @@ import (
// ClientBackedDryRunGetter implements the DryRunGetter interface for use in NewDryRunClient() and proxies all GET and LIST requests to the backing API server reachable via rest.Config // ClientBackedDryRunGetter implements the DryRunGetter interface for use in NewDryRunClient() and proxies all GET and LIST requests to the backing API server reachable via rest.Config
type ClientBackedDryRunGetter struct { type ClientBackedDryRunGetter struct {
client clientset.Interface client clientset.Interface
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
} }
// InitDryRunGetter should implement the DryRunGetter interface // InitDryRunGetter should implement the DryRunGetter interface

4
pkg/controller/garbagecollector/garbagecollector.go
View File

@ -60,7 +60,7 @@ const ResourceResyncTime time.Duration = 0
// up to date as the notification is sent. // up to date as the notification is sent.
type GarbageCollector struct { type GarbageCollector struct {
restMapper resettableRESTMapper restMapper resettableRESTMapper
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
// garbage collector attempts to delete the items in attemptToDelete queue when the time is ripe. // garbage collector attempts to delete the items in attemptToDelete queue when the time is ripe.
attemptToDelete workqueue.RateLimitingInterface attemptToDelete workqueue.RateLimitingInterface
// garbage collector attempts to orphan the dependents of the items in the attemptToOrphan queue, then deletes the items. // garbage collector attempts to orphan the dependents of the items in the attemptToOrphan queue, then deletes the items.
@ -74,7 +74,7 @@ type GarbageCollector struct {
} }
func NewGarbageCollector( func NewGarbageCollector(
dynamicClient dynamic.DynamicInterface, dynamicClient dynamic.Interface,
mapper resettableRESTMapper, mapper resettableRESTMapper,
deletableResources map[schema.GroupVersionResource]struct{}, deletableResources map[schema.GroupVersionResource]struct{},
ignoredResources map[schema.GroupResource]struct{}, ignoredResources map[schema.GroupResource]struct{},

4
pkg/controller/garbagecollector/graph_builder.go
View File

@ -91,7 +91,7 @@ type GraphBuilder struct {
// it is protected by monitorLock. // it is protected by monitorLock.
running bool running bool
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
// monitors are the producer of the graphChanges queue, graphBuilder alters // monitors are the producer of the graphChanges queue, graphBuilder alters
// the in-memory graph according to the changes. // the in-memory graph according to the changes.
graphChanges workqueue.RateLimitingInterface graphChanges workqueue.RateLimitingInterface
@ -125,7 +125,7 @@ func (m *monitor) Run() {
type monitors map[schema.GroupVersionResource]*monitor type monitors map[schema.GroupVersionResource]*monitor
func listWatcher(client dynamic.DynamicInterface, resource schema.GroupVersionResource) *cache.ListWatch { func listWatcher(client dynamic.Interface, resource schema.GroupVersionResource) *cache.ListWatch {
return &cache.ListWatch{ return &cache.ListWatch{
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
// We want to list this resource in all namespaces if it's namespace scoped, so not passing namespace is ok. // We want to list this resource in all namespaces if it's namespace scoped, so not passing namespace is ok.

4
pkg/controller/namespace/deletion/namespaced_resources_deleter.go
View File

@ -43,7 +43,7 @@ type NamespacedResourcesDeleterInterface interface {
} }
func NewNamespacedResourcesDeleter(nsClient v1clientset.NamespaceInterface, func NewNamespacedResourcesDeleter(nsClient v1clientset.NamespaceInterface,
dynamicClient dynamic.DynamicInterface, podsGetter v1clientset.PodsGetter, dynamicClient dynamic.Interface, podsGetter v1clientset.PodsGetter,
discoverResourcesFn func() ([]*metav1.APIResourceList, error), discoverResourcesFn func() ([]*metav1.APIResourceList, error),
finalizerToken v1.FinalizerName, deleteNamespaceWhenDone bool) NamespacedResourcesDeleterInterface { finalizerToken v1.FinalizerName, deleteNamespaceWhenDone bool) NamespacedResourcesDeleterInterface {
d := &namespacedResourcesDeleter{ d := &namespacedResourcesDeleter{
@ -68,7 +68,7 @@ type namespacedResourcesDeleter struct {
// Client to manipulate the namespace. // Client to manipulate the namespace.
nsClient v1clientset.NamespaceInterface nsClient v1clientset.NamespaceInterface
// Dynamic client to list and delete all namespaced resources. // Dynamic client to list and delete all namespaced resources.
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
// Interface to get PodInterface. // Interface to get PodInterface.
podsGetter v1clientset.PodsGetter podsGetter v1clientset.PodsGetter
// Cache of what operations are not supported on each group version resource. // Cache of what operations are not supported on each group version resource.

2
pkg/controller/namespace/namespace_controller.go
View File

@ -63,7 +63,7 @@ type NamespaceController struct {
// NewNamespaceController creates a new NamespaceController // NewNamespaceController creates a new NamespaceController
func NewNamespaceController( func NewNamespaceController(
kubeClient clientset.Interface, kubeClient clientset.Interface,
dynamicClient dynamic.DynamicInterface, dynamicClient dynamic.Interface,
discoverResourcesFn func() ([]*metav1.APIResourceList, error), discoverResourcesFn func() ([]*metav1.APIResourceList, error),
namespaceInformer coreinformers.NamespaceInformer, namespaceInformer coreinformers.NamespaceInformer,
resyncPeriod time.Duration, resyncPeriod time.Duration,

1
pkg/kubectl/BUILD
View File

@ -206,7 +206,6 @@ filegroup(
"//pkg/kubectl/metricsutil:all-srcs", "//pkg/kubectl/metricsutil:all-srcs",
"//pkg/kubectl/plugins:all-srcs", "//pkg/kubectl/plugins:all-srcs",
"//pkg/kubectl/proxy:all-srcs", "//pkg/kubectl/proxy:all-srcs",
"//pkg/kubectl/resource:all-srcs",
"//pkg/kubectl/scheme:all-srcs", "//pkg/kubectl/scheme:all-srcs",
"//pkg/kubectl/util:all-srcs", "//pkg/kubectl/util:all-srcs",
"//pkg/kubectl/validation: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 Builder *resource.Builder
Mapper meta.RESTMapper Mapper meta.RESTMapper
Scaler scaleclient.ScalesGetter Scaler scaleclient.ScalesGetter
DynamicClient dynamic.DynamicInterface DynamicClient dynamic.Interface
ClientSetFunc func() (internalclientset.Interface, error) ClientSetFunc func() (internalclientset.Interface, error)
OpenAPISchema openapi.Resources OpenAPISchema openapi.Resources
@ -580,7 +580,7 @@ func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (n
type pruner struct { type pruner struct {
mapper meta.RESTMapper mapper meta.RESTMapper
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
clientsetFunc func() (internalclientset.Interface, error) clientsetFunc func() (internalclientset.Interface, error)
visitedUids sets.String 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) 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 { if !cascade {
return c.Resource(mapping.Resource).Namespace(namespace).Delete(name, nil) 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 { type patcher struct {
mapping *meta.RESTMapping mapping *meta.RESTMapping
helper *resource.Helper helper *resource.Helper
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
clientsetFunc func() (internalclientset.Interface, error) clientsetFunc func() (internalclientset.Interface, error)
overwrite bool 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/testing:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/genericclioptions: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/kubectl/scheme:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/api/batch/v1: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 EnforceNamespace bool
Mapper meta.RESTMapper Mapper meta.RESTMapper
DynamicClient dynamic.DynamicInterface DynamicClient dynamic.Interface
PrintObj func(obj kruntime.Object) error 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" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions" "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" "k8s.io/kubernetes/pkg/kubectl/scheme"
) )

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

@ -100,7 +100,7 @@ type ExposeServiceOptions struct {
Namespace string Namespace string
Mapper meta.RESTMapper Mapper meta.RESTMapper
DynamicClient dynamic.DynamicInterface DynamicClient dynamic.Interface
Builder *resource.Builder Builder *resource.Builder
Recorder genericclioptions.Recorder 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:go_default_library",
"//pkg/kubectl/cmd/util/openapi/testing:go_default_library", "//pkg/kubectl/cmd/util/openapi/testing:go_default_library",
"//pkg/kubectl/genericclioptions: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/kubectl/scheme:go_default_library",
"//pkg/printers:go_default_library", "//pkg/printers:go_default_library",
"//vendor/k8s.io/api/core/v1: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" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing" openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions" "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" "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 PrintObj func(runtime.Object) error
Recorder genericclioptions.Recorder Recorder genericclioptions.Recorder
DynamicClient dynamic.DynamicInterface DynamicClient dynamic.Interface
ArgsLenAtDash int ArgsLenAtDash int
Attach bool 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 return clientset, nil
} }
func (f *TestFactory) DynamicClient() (dynamic.DynamicInterface, error) { func (f *TestFactory) DynamicClient() (dynamic.Interface, error) {
if f.FakeDynamicClient != nil { if f.FakeDynamicClient != nil {
return 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) ClientSet() (internalclientset.Interface, error)
// DynamicClient returns a dynamic client ready for use // DynamicClient returns a dynamic client ready for use
DynamicClient() (dynamic.DynamicInterface, error) DynamicClient() (dynamic.Interface, error)
// KubernetesClientSet gives you back an external clientset // KubernetesClientSet gives you back an external clientset
KubernetesClientSet() (*kubernetes.Clientset, error) 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) return internalclientset.NewForConfig(clientConfig)
} }
func (f *ring0Factory) DynamicClient() (dynamic.DynamicInterface, error) { func (f *ring0Factory) DynamicClient() (dynamic.Interface, error) {
clientConfig, err := f.ClientConfig() clientConfig, err := f.ClientConfig()
if err != nil { if err != nil {
return nil, err return nil, err

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

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

4
pkg/printers/internalversion/describe.go
View File

@ -192,13 +192,13 @@ func DescriberFor(kind schema.GroupKind, clientConfig *rest.Config) (printers.De
// GenericDescriberFor returns a generic describer for the specified mapping // GenericDescriberFor returns a generic describer for the specified mapping
// that uses only information available from runtime.Unstructured // that uses only information available from runtime.Unstructured
func GenericDescriberFor(mapping *meta.RESTMapping, dynamic dynamic.DynamicInterface, events coreclient.EventsGetter) printers.Describer { func GenericDescriberFor(mapping *meta.RESTMapping, dynamic dynamic.Interface, events coreclient.EventsGetter) printers.Describer {
return &genericDescriber{mapping, dynamic, events} return &genericDescriber{mapping, dynamic, events}
} }
type genericDescriber struct { type genericDescriber struct {
mapping *meta.RESTMapping mapping *meta.RESTMapping
dynamic dynamic.DynamicInterface dynamic dynamic.Interface
events coreclient.EventsGetter events coreclient.EventsGetter
} }

6
staging/src/k8s.io/apiextensions-apiserver/test/integration/basic_test.go
View File

@ -79,7 +79,7 @@ func TestClusterScopedCRUD(t *testing.T) {
testFieldSelector(t, ns, noxuDefinition, dynamicClient) testFieldSelector(t, ns, noxuDefinition, dynamicClient)
} }
func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition, dynamicClient dynamic.DynamicInterface) { func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition, dynamicClient dynamic.Interface) {
noxuResourceClient := NewNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition) noxuResourceClient := NewNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
initialList, err := noxuResourceClient.List(metav1.ListOptions{}) initialList, err := noxuResourceClient.List(metav1.ListOptions{})
if err != nil { if err != nil {
@ -201,7 +201,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta
} }
} }
func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition, dynamicClient dynamic.DynamicInterface) { func testFieldSelector(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition, dynamicClient dynamic.Interface) {
noxuResourceClient := NewNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition) noxuResourceClient := NewNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
initialList, err := noxuResourceClient.List(metav1.ListOptions{}) initialList, err := noxuResourceClient.List(metav1.ListOptions{})
if err != nil { if err != nil {
@ -703,7 +703,7 @@ func TestCrossNamespaceListWatch(t *testing.T) {
checkNamespacesWatchHelper(t, ns2, noxuNamespacesWatch2) checkNamespacesWatchHelper(t, ns2, noxuNamespacesWatch2)
} }
func createInstanceWithNamespaceHelper(t *testing.T, ns string, name string, noxuNamespacedResourceClient dynamic.DynamicResourceInterface, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition) *unstructured.Unstructured { func createInstanceWithNamespaceHelper(t *testing.T, ns string, name string, noxuNamespacedResourceClient dynamic.ResourceInterface, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition) *unstructured.Unstructured {
createdInstance, err := instantiateCustomResource(t, testserver.NewNoxuInstance(ns, name), noxuNamespacedResourceClient, noxuDefinition) createdInstance, err := instantiateCustomResource(t, testserver.NewNoxuInstance(ns, name), noxuNamespacedResourceClient, noxuDefinition)
if err != nil { if err != nil {
t.Fatalf("unable to create noxu Instance:%v", err) t.Fatalf("unable to create noxu Instance:%v", err)

4
staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go
View File

@ -41,7 +41,7 @@ import (
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"
) )
func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unstructured, client dynamic.DynamicResourceInterface, definition *apiextensionsv1beta1.CustomResourceDefinition) (*unstructured.Unstructured, error) { func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unstructured, client dynamic.ResourceInterface, definition *apiextensionsv1beta1.CustomResourceDefinition) (*unstructured.Unstructured, error) {
createdInstance, err := client.Create(instanceToCreate) createdInstance, err := client.Create(instanceToCreate)
if err != nil { if err != nil {
t.Logf("%#v", createdInstance) t.Logf("%#v", createdInstance)
@ -68,7 +68,7 @@ func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unst
return createdInstance, nil return createdInstance, nil
} }
func NewNamespacedCustomResourceClient(ns string, client dynamic.DynamicInterface, crd *apiextensionsv1beta1.CustomResourceDefinition) dynamic.DynamicResourceInterface { func NewNamespacedCustomResourceClient(ns string, client dynamic.Interface, crd *apiextensionsv1beta1.CustomResourceDefinition) dynamic.ResourceInterface {
gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Version, Resource: crd.Spec.Names.Plural} gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Version, Resource: crd.Spec.Names.Plural}
if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped { if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped {

6
staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/resources.go
View File

@ -178,7 +178,7 @@ func CreateNewCustomResourceDefinitionWatchUnsafe(crd *apiextensionsv1beta1.Cust
return err return err
} }
func CreateNewCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceDefinition, apiExtensionsClient clientset.Interface, dynamicClientSet dynamic.DynamicInterface) error { func CreateNewCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceDefinition, apiExtensionsClient clientset.Interface, dynamicClientSet dynamic.Interface) error {
err := CreateNewCustomResourceDefinitionWatchUnsafe(crd, apiExtensionsClient) err := CreateNewCustomResourceDefinitionWatchUnsafe(crd, apiExtensionsClient)
if err != nil { if err != nil {
return err return err
@ -209,14 +209,14 @@ func CreateNewCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceD
return nil return nil
} }
func checkForWatchCachePrimed(crd *apiextensionsv1beta1.CustomResourceDefinition, dynamicClientSet dynamic.DynamicInterface) error { func checkForWatchCachePrimed(crd *apiextensionsv1beta1.CustomResourceDefinition, dynamicClientSet dynamic.Interface) error {
ns := "" ns := ""
if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped { if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped {
ns = "aval" ns = "aval"
} }
gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Version, Resource: crd.Spec.Names.Plural} gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Version, Resource: crd.Spec.Names.Plural}
var resourceClient dynamic.DynamicResourceInterface var resourceClient dynamic.ResourceInterface
if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped { if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped {
resourceClient = dynamicClientSet.Resource(gvr).Namespace(ns) resourceClient = dynamicClientSet.Resource(gvr).Namespace(ns)
} else { } else {

2
staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/start.go
View File

@ -139,7 +139,7 @@ func StartDefaultServer() (chan struct{}, *rest.Config, error) {
return StartServer(config) return StartServer(config)
} }
func StartDefaultServerWithClients() (chan struct{}, clientset.Interface, dynamic.DynamicInterface, error) { func StartDefaultServerWithClients() (chan struct{}, clientset.Interface, dynamic.Interface, error) {
stopCh, config, err := StartDefaultServer() stopCh, config, err := StartDefaultServer()
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err

20
staging/src/k8s.io/client-go/deprecated-dynamic/client.go
View File

@ -66,7 +66,7 @@ type ResourceInterface interface {
// and manipulate metadata of a Kubernetes API group, and implements Interface. // and manipulate metadata of a Kubernetes API group, and implements Interface.
type Client struct { type Client struct {
version schema.GroupVersion version schema.GroupVersion
delegate dynamic.DynamicInterface delegate dynamic.Interface
} }
// NewClient returns a new client based on the passed in config. The // NewClient returns a new client based on the passed in config. The
@ -97,35 +97,35 @@ func (c *Client) Resource(resource *metav1.APIResource, namespace string) Resour
} }
// the old interfaces used the wrong type for lists. this fixes that // the old interfaces used the wrong type for lists. this fixes that
func oldResourceShim(in dynamic.DynamicResourceInterface, subresources []string) ResourceInterface { func oldResourceShim(in dynamic.ResourceInterface, subresources []string) ResourceInterface {
return oldResourceShimType{DynamicResourceInterface: in, subresources: subresources} return oldResourceShimType{ResourceInterface: in, subresources: subresources}
} }
type oldResourceShimType struct { type oldResourceShimType struct {
dynamic.DynamicResourceInterface dynamic.ResourceInterface
subresources []string subresources []string
} }
func (s oldResourceShimType) Create(obj *unstructured.Unstructured) (*unstructured.Unstructured, error) { func (s oldResourceShimType) Create(obj *unstructured.Unstructured) (*unstructured.Unstructured, error) {
return s.DynamicResourceInterface.Create(obj, s.subresources...) return s.ResourceInterface.Create(obj, s.subresources...)
} }
func (s oldResourceShimType) Update(obj *unstructured.Unstructured) (*unstructured.Unstructured, error) { func (s oldResourceShimType) Update(obj *unstructured.Unstructured) (*unstructured.Unstructured, error) {
return s.DynamicResourceInterface.Update(obj, s.subresources...) return s.ResourceInterface.Update(obj, s.subresources...)
} }
func (s oldResourceShimType) Delete(name string, opts *metav1.DeleteOptions) error { func (s oldResourceShimType) Delete(name string, opts *metav1.DeleteOptions) error {
return s.DynamicResourceInterface.Delete(name, opts, s.subresources...) return s.ResourceInterface.Delete(name, opts, s.subresources...)
} }
func (s oldResourceShimType) Get(name string, opts metav1.GetOptions) (*unstructured.Unstructured, error) { func (s oldResourceShimType) Get(name string, opts metav1.GetOptions) (*unstructured.Unstructured, error) {
return s.DynamicResourceInterface.Get(name, opts, s.subresources...) return s.ResourceInterface.Get(name, opts, s.subresources...)
} }
func (s oldResourceShimType) List(opts metav1.ListOptions) (runtime.Object, error) { func (s oldResourceShimType) List(opts metav1.ListOptions) (runtime.Object, error) {
return s.DynamicResourceInterface.List(opts) return s.ResourceInterface.List(opts)
} }
func (s oldResourceShimType) Patch(name string, pt types.PatchType, data []byte) (*unstructured.Unstructured, error) { func (s oldResourceShimType) Patch(name string, pt types.PatchType, data []byte) (*unstructured.Unstructured, error) {
return s.DynamicResourceInterface.Patch(name, pt, data, s.subresources...) return s.ResourceInterface.Patch(name, pt, data, s.subresources...)
} }

2
staging/src/k8s.io/client-go/dynamic/client_test.go
View File

@ -58,7 +58,7 @@ func getObject(version, kind, name string) *unstructured.Unstructured {
} }
} }
func getClientServer(h func(http.ResponseWriter, *http.Request)) (DynamicInterface, *httptest.Server, error) { func getClientServer(h func(http.ResponseWriter, *http.Request)) (Interface, *httptest.Server, error) {
srv := httptest.NewServer(http.HandlerFunc(h)) srv := httptest.NewServer(http.HandlerFunc(h))
cl, err := NewForConfig(&restclient.Config{ cl, err := NewForConfig(&restclient.Config{
Host: srv.URL, Host: srv.URL,

6
staging/src/k8s.io/client-go/dynamic/fake/simple.go
View File

@ -70,13 +70,13 @@ type dynamicResourceClient struct {
resource schema.GroupVersionResource resource schema.GroupVersionResource
} }
var _ dynamic.DynamicInterface = &FakeDynamicClient{} var _ dynamic.Interface = &FakeDynamicClient{}
func (c *FakeDynamicClient) Resource(resource schema.GroupVersionResource) dynamic.NamespaceableDynamicResourceInterface { func (c *FakeDynamicClient) Resource(resource schema.GroupVersionResource) dynamic.NamespaceableResourceInterface {
return &dynamicResourceClient{client: c, resource: resource} return &dynamicResourceClient{client: c, resource: resource}
} }
func (c *dynamicResourceClient) Namespace(ns string) dynamic.DynamicResourceInterface { func (c *dynamicResourceClient) Namespace(ns string) dynamic.ResourceInterface {
ret := *c ret := *c
ret.namespace = ns ret.namespace = ns
return &ret return &ret

25
staging/src/k8s.io/client-go/dynamic/interface.go
View File

@ -17,9 +17,34 @@ limitations under the License.
package dynamic package dynamic
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/watch"
) )
type Interface interface {
Resource(resource schema.GroupVersionResource) NamespaceableResourceInterface
}
type ResourceInterface interface {
Create(obj *unstructured.Unstructured, subresources ...string) (*unstructured.Unstructured, error)
Update(obj *unstructured.Unstructured, subresources ...string) (*unstructured.Unstructured, error)
UpdateStatus(obj *unstructured.Unstructured) (*unstructured.Unstructured, error)
Delete(name string, options *metav1.DeleteOptions, subresources ...string) error
DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error
Get(name string, options metav1.GetOptions, subresources ...string) (*unstructured.Unstructured, error)
List(opts metav1.ListOptions) (*unstructured.UnstructuredList, error)
Watch(opts metav1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*unstructured.Unstructured, error)
}
type NamespaceableResourceInterface interface {
Namespace(string) ResourceInterface
ResourceInterface
}
// APIPathResolverFunc knows how to convert a groupVersion to its API path. The Kind field is optional. // APIPathResolverFunc knows how to convert a groupVersion to its API path. The Kind field is optional.
// TODO find a better place to move this for existing callers // TODO find a better place to move this for existing callers
type APIPathResolverFunc func(kind schema.GroupVersionKind) string type APIPathResolverFunc func(kind schema.GroupVersionKind) string

33
staging/src/k8s.io/client-go/dynamic/simple.go
View File

@ -30,34 +30,13 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
) )
type DynamicInterface interface {
Resource(resource schema.GroupVersionResource) NamespaceableDynamicResourceInterface
}
type DynamicResourceInterface interface {
Create(obj *unstructured.Unstructured, subresources ...string) (*unstructured.Unstructured, error)
Update(obj *unstructured.Unstructured, subresources ...string) (*unstructured.Unstructured, error)
UpdateStatus(obj *unstructured.Unstructured) (*unstructured.Unstructured, error)
Delete(name string, options *metav1.DeleteOptions, subresources ...string) error
DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error
Get(name string, options metav1.GetOptions, subresources ...string) (*unstructured.Unstructured, error)
List(opts metav1.ListOptions) (*unstructured.UnstructuredList, error)
Watch(opts metav1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*unstructured.Unstructured, error)
}
type NamespaceableDynamicResourceInterface interface {
Namespace(string) DynamicResourceInterface
DynamicResourceInterface
}
type dynamicClient struct { type dynamicClient struct {
client *rest.RESTClient client *rest.RESTClient
} }
var _ DynamicInterface = &dynamicClient{} var _ Interface = &dynamicClient{}
func NewForConfig(inConfig *rest.Config) (DynamicInterface, error) { func NewForConfig(inConfig *rest.Config) (Interface, error) {
config := rest.CopyConfig(inConfig) config := rest.CopyConfig(inConfig)
// for serializing the options // for serializing the options
config.GroupVersion = &schema.GroupVersion{} config.GroupVersion = &schema.GroupVersion{}
@ -83,11 +62,11 @@ type dynamicResourceClient struct {
resource schema.GroupVersionResource resource schema.GroupVersionResource
} }
func (c *dynamicClient) Resource(resource schema.GroupVersionResource) NamespaceableDynamicResourceInterface { func (c *dynamicClient) Resource(resource schema.GroupVersionResource) NamespaceableResourceInterface {
return &dynamicResourceClient{client: c, resource: resource} return &dynamicResourceClient{client: c, resource: resource}
} }
func (c *dynamicResourceClient) Namespace(ns string) DynamicResourceInterface { func (c *dynamicResourceClient) Namespace(ns string) ResourceInterface {
ret := *c ret := *c
ret.namespace = ns ret.namespace = ns
return &ret return &ret
@ -161,6 +140,10 @@ func (c *dynamicResourceClient) UpdateStatus(obj *unstructured.Unstructured) (*u
} }
result := c.client.client.Put().AbsPath(append(c.makeURLSegments(accessor.GetName()), "status")...).Body(outBytes).Do() result := c.client.client.Put().AbsPath(append(c.makeURLSegments(accessor.GetName()), "status")...).Body(outBytes).Do()
if err := result.Error(); err != nil {
return nil, err
}
retBytes, err := result.Raw() retBytes, err := result.Raw()
if err != nil { if err != nil {
return nil, err return nil, err

8
test/e2e/apimachinery/crd_watch.go
View File

@ -115,7 +115,7 @@ var _ = SIGDescribe("CustomResourceDefinition Watch", func() {
}) })
}) })
func watchCRWithName(crdResourceClient dynamic.DynamicResourceInterface, name string) (watch.Interface, error) { func watchCRWithName(crdResourceClient dynamic.ResourceInterface, name string) (watch.Interface, error) {
return crdResourceClient.Watch( return crdResourceClient.Watch(
metav1.ListOptions{ metav1.ListOptions{
FieldSelector: "metadata.name=" + name, FieldSelector: "metadata.name=" + name,
@ -124,7 +124,7 @@ func watchCRWithName(crdResourceClient dynamic.DynamicResourceInterface, name st
) )
} }
func instantiateCustomResource(instanceToCreate *unstructured.Unstructured, client dynamic.DynamicResourceInterface, definition *apiextensionsv1beta1.CustomResourceDefinition) (*unstructured.Unstructured, error) { func instantiateCustomResource(instanceToCreate *unstructured.Unstructured, client dynamic.ResourceInterface, definition *apiextensionsv1beta1.CustomResourceDefinition) (*unstructured.Unstructured, error) {
createdInstance, err := client.Create(instanceToCreate) createdInstance, err := client.Create(instanceToCreate)
if err != nil { if err != nil {
return nil, err return nil, err
@ -150,11 +150,11 @@ func instantiateCustomResource(instanceToCreate *unstructured.Unstructured, clie
return createdInstance, nil return createdInstance, nil
} }
func deleteCustomResource(client dynamic.DynamicResourceInterface, name string) error { func deleteCustomResource(client dynamic.ResourceInterface, name string) error {
return client.Delete(name, &metav1.DeleteOptions{}) return client.Delete(name, &metav1.DeleteOptions{})
} }
func newNamespacedCustomResourceClient(ns string, client dynamic.DynamicInterface, crd *apiextensionsv1beta1.CustomResourceDefinition) dynamic.DynamicResourceInterface { func newNamespacedCustomResourceClient(ns string, client dynamic.Interface, crd *apiextensionsv1beta1.CustomResourceDefinition) dynamic.ResourceInterface {
gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Version, Resource: crd.Spec.Names.Plural} gvr := schema.GroupVersionResource{Group: crd.Spec.Group, Version: crd.Spec.Version, Resource: crd.Spec.Names.Plural}
if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped { if crd.Spec.Scope != apiextensionsv1beta1.ClusterScoped {

4
test/e2e/apimachinery/webhook.go
View File

@ -1081,7 +1081,7 @@ func registerMutatingWebhookForCustomResource(f *framework.Framework, context *c
return func() { client.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Delete(configName, nil) } return func() { client.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Delete(configName, nil) }
} }
func testCustomResourceWebhook(f *framework.Framework, crd *apiextensionsv1beta1.CustomResourceDefinition, customResourceClient dynamic.DynamicResourceInterface) { func testCustomResourceWebhook(f *framework.Framework, crd *apiextensionsv1beta1.CustomResourceDefinition, customResourceClient dynamic.ResourceInterface) {
By("Creating a custom resource that should be denied by the webhook") By("Creating a custom resource that should be denied by the webhook")
crInstance := &unstructured.Unstructured{ crInstance := &unstructured.Unstructured{
Object: map[string]interface{}{ Object: map[string]interface{}{
@ -1104,7 +1104,7 @@ func testCustomResourceWebhook(f *framework.Framework, crd *apiextensionsv1beta1
} }
} }
func testMutatingCustomResourceWebhook(f *framework.Framework, crd *apiextensionsv1beta1.CustomResourceDefinition, customResourceClient dynamic.DynamicResourceInterface) { func testMutatingCustomResourceWebhook(f *framework.Framework, crd *apiextensionsv1beta1.CustomResourceDefinition, customResourceClient dynamic.ResourceInterface) {
By("Creating a custom resource that should be mutated by the webhook") By("Creating a custom resource that should be mutated by the webhook")
cr := &unstructured.Unstructured{ cr := &unstructured.Unstructured{
Object: map[string]interface{}{ Object: map[string]interface{}{

2
test/e2e/framework/crd_util.go
View File

@ -38,7 +38,7 @@ type TestCrd struct {
ApiVersion string ApiVersion string
ApiExtensionClient *crdclientset.Clientset ApiExtensionClient *crdclientset.Clientset
Crd *apiextensionsv1beta1.CustomResourceDefinition Crd *apiextensionsv1beta1.CustomResourceDefinition
DynamicClient dynamic.DynamicResourceInterface DynamicClient dynamic.ResourceInterface
CleanUp CleanCrdFn CleanUp CleanCrdFn
} }

2
test/e2e/framework/framework.go
View File

@ -70,7 +70,7 @@ type Framework struct {
InternalClientset *internalclientset.Clientset InternalClientset *internalclientset.Clientset
AggregatorClient *aggregatorclient.Clientset AggregatorClient *aggregatorclient.Clientset
DynamicClient dynamic.DynamicInterface DynamicClient dynamic.Interface
ScalesGetter scaleclient.ScalesGetter ScalesGetter scaleclient.ScalesGetter

6
test/e2e/framework/util.go
View File

@ -506,7 +506,7 @@ func SkipUnlessServerVersionGTE(v *utilversion.Version, c discovery.ServerVersio
} }
} }
func SkipIfMissingResource(dynamicClient dynamic.DynamicInterface, gvr schema.GroupVersionResource, namespace string) { func SkipIfMissingResource(dynamicClient dynamic.Interface, gvr schema.GroupVersionResource, namespace string) {
resourceClient := dynamicClient.Resource(gvr).Namespace(namespace) resourceClient := dynamicClient.Resource(gvr).Namespace(namespace)
_, err := resourceClient.List(metav1.ListOptions{}) _, err := resourceClient.List(metav1.ListOptions{})
if err != nil { if err != nil {
@ -1086,7 +1086,7 @@ func CheckTestingNSDeletedExcept(c clientset.Interface, skip string) error {
// deleteNS deletes the provided namespace, waits for it to be completely deleted, and then checks // deleteNS deletes the provided namespace, waits for it to be completely deleted, and then checks
// whether there are any pods remaining in a non-terminating state. // whether there are any pods remaining in a non-terminating state.
func deleteNS(c clientset.Interface, dynamicClient dynamic.DynamicInterface, namespace string, timeout time.Duration) error { func deleteNS(c clientset.Interface, dynamicClient dynamic.Interface, namespace string, timeout time.Duration) error {
startTime := time.Now() startTime := time.Now()
if err := c.CoreV1().Namespaces().Delete(namespace, nil); err != nil { if err := c.CoreV1().Namespaces().Delete(namespace, nil); err != nil {
return err return err
@ -1232,7 +1232,7 @@ func isDynamicDiscoveryError(err error) bool {
} }
// hasRemainingContent checks if there is remaining content in the namespace via API discovery // hasRemainingContent checks if there is remaining content in the namespace via API discovery
func hasRemainingContent(c clientset.Interface, dynamicClient dynamic.DynamicInterface, namespace string) (bool, error) { func hasRemainingContent(c clientset.Interface, dynamicClient dynamic.Interface, namespace string) (bool, error) {
// some tests generate their own framework.Client rather than the default // some tests generate their own framework.Client rather than the default
// TODO: ensure every test call has a configured dynamicClient // TODO: ensure every test call has a configured dynamicClient
if dynamicClient == nil { if dynamicClient == nil {

6
test/integration/garbagecollector/garbage_collector_test.go
View File

@ -168,9 +168,9 @@ func link(t *testing.T, owner, dependent metav1.Object) {
func createRandomCustomResourceDefinition( func createRandomCustomResourceDefinition(
t *testing.T, apiExtensionClient apiextensionsclientset.Interface, t *testing.T, apiExtensionClient apiextensionsclientset.Interface,
dynamicClient dynamic.DynamicInterface, dynamicClient dynamic.Interface,
namespace string, namespace string,
) (*apiextensionsv1beta1.CustomResourceDefinition, dynamic.DynamicResourceInterface) { ) (*apiextensionsv1beta1.CustomResourceDefinition, dynamic.ResourceInterface) {
// Create a random custom resource definition and ensure it's available for // Create a random custom resource definition and ensure it's available for
// use. // use.
definition := apiextensionstestserver.NewRandomNameCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) definition := apiextensionstestserver.NewRandomNameCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped)
@ -193,7 +193,7 @@ type testContext struct {
gc *garbagecollector.GarbageCollector gc *garbagecollector.GarbageCollector
clientSet clientset.Interface clientSet clientset.Interface
apiExtensionClient apiextensionsclientset.Interface apiExtensionClient apiextensionsclientset.Interface
dynamicClient dynamic.DynamicInterface dynamicClient dynamic.Interface
startGC func(workers int) startGC func(workers int)
// syncPeriod is how often the GC started with startGC will be resynced. // syncPeriod is how often the GC started with startGC will be resynced.
syncPeriod time.Duration syncPeriod time.Duration