Skip to content

Commit d8f0146

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#72214 from caesarxuchao/move-discovery
Move cached discovery clients to their own packages
2 parents b13438a + 6382023 commit d8f0146

File tree

43 files changed

+195
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+195
-206
lines changed

‎cmd/kube-controller-manager/app/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ go_library(
120120
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
121121
"//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
122122
"//staging/src/k8s.io/apiserver/pkg/util/globalflag:go_default_library",
123-
"//staging/src/k8s.io/client-go/discovery/cached:go_default_library",
123+
"//staging/src/k8s.io/client-go/discovery/cached/memory:go_default_library",
124124
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
125125
"//staging/src/k8s.io/client-go/informers:go_default_library",
126126
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",

‎cmd/kube-controller-manager/app/controllermanager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"k8s.io/apiserver/pkg/server/mux"
4242
apiserverflag "k8s.io/apiserver/pkg/util/flag"
4343
"k8s.io/apiserver/pkg/util/globalflag"
44-
cacheddiscovery "k8s.io/client-go/discovery/cached"
44+
cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
4545
"k8s.io/client-go/informers"
4646
restclient "k8s.io/client-go/rest"
4747
"k8s.io/client-go/restmapper"

‎cmd/kube-controller-manager/app/core.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/api/core/v1"
3434
"k8s.io/apimachinery/pkg/runtime/schema"
3535
utilfeature "k8s.io/apiserver/pkg/util/feature"
36-
cacheddiscovery "k8s.io/client-go/discovery/cached"
36+
cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
3737
"k8s.io/client-go/dynamic"
3838
clientset "k8s.io/client-go/kubernetes"
3939
restclient "k8s.io/client-go/rest"

‎pkg/kubeapiserver/admission/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ go_library(
1919
"//staging/src/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library",
2020
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
2121
"//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",
22-
"//staging/src/k8s.io/client-go/discovery/cached:go_default_library",
22+
"//staging/src/k8s.io/client-go/discovery/cached/memory:go_default_library",
2323
"//staging/src/k8s.io/client-go/informers:go_default_library",
2424
"//staging/src/k8s.io/client-go/rest:go_default_library",
2525
"//staging/src/k8s.io/client-go/restmapper:go_default_library",

‎pkg/kubeapiserver/admission/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/apiserver/pkg/server"
3030
genericapiserver "k8s.io/apiserver/pkg/server"
3131
"k8s.io/apiserver/pkg/util/webhook"
32-
cacheddiscovery "k8s.io/client-go/discovery/cached"
32+
cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
3333
externalinformers "k8s.io/client-go/informers"
3434
"k8s.io/client-go/rest"
3535
"k8s.io/client-go/restmapper"

‎pkg/kubectl/cmd/testing/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ go_library(
2626
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
2727
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource:go_default_library",
2828
"//staging/src/k8s.io/client-go/discovery:go_default_library",
29+
"//staging/src/k8s.io/client-go/discovery/cached/disk:go_default_library",
2930
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
3031
"//staging/src/k8s.io/client-go/dynamic/fake:go_default_library",
3132
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",

‎pkg/kubectl/cmd/testing/fake.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"k8s.io/cli-runtime/pkg/genericclioptions"
3535
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
3636
"k8s.io/client-go/discovery"
37+
diskcached "k8s.io/client-go/discovery/cached/disk"
3738
"k8s.io/client-go/dynamic"
3839
fakedynamic "k8s.io/client-go/dynamic/fake"
3940
"k8s.io/client-go/kubernetes"
@@ -458,7 +459,7 @@ func (f *TestFactory) DiscoveryClient() (discovery.CachedDiscoveryInterface, err
458459
fakeClient := f.Client.(*fake.RESTClient)
459460

460461
cacheDir := filepath.Join("", ".kube", "cache", "discovery")
461-
cachedClient, err := discovery.NewCachedDiscoveryClientForConfig(f.ClientConfigVal, cacheDir, "", time.Duration(10*time.Minute))
462+
cachedClient, err := diskcached.NewCachedDiscoveryClientForConfig(f.ClientConfigVal, cacheDir, "", time.Duration(10*time.Minute))
462463
if err != nil {
463464
return nil, err
464465
}

‎staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json‎

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/Godeps/Godeps.json‎

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cli-runtime/Godeps/Godeps.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)