From c04494563e4b479bd9f37188b54b0c796357da72 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 11 Jul 2018 14:55:14 -0400 Subject: [PATCH] Gopkg.*,pkg/generator/templates.go: update to kubernetes 1.11.2 --- .travis.yml | 2 +- Gopkg.lock | 147 +++++++++++++++++++------------- Gopkg.toml | 12 +-- pkg/generator/templates.go | 22 ++--- pkg/k8sclient/client.go | 51 +++++------ pkg/test/framework.go | 7 +- test/e2e/framework/framework.go | 5 +- 7 files changed, 135 insertions(+), 111 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95bab8d30a..5c586e72dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ services: - docker go: -- 1.10.1 +- 1.10.3 jobs: include: diff --git a/Gopkg.lock b/Gopkg.lock index 99d5ecdf96..f2ba034310 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -10,12 +10,12 @@ revision = "3a771d992973f24aa725d07868b467d1ddfceafb" [[projects]] - digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" + digest = "1:0deddd908b6b4b768cfc272c16ee61e7088a60f7fe2f06c547bd3d8e1f8b8e77" name = "github.com/davecgh/go-spew" packages = ["spew"] pruneopts = "" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" [[projects]] digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22" @@ -26,15 +26,15 @@ version = "v1.0.0" [[projects]] - digest = "1:0a3f6a0c68ab8f3d455f8892295503b179e571b7fefe47cc6c556405d1f83411" + digest = "1:6e73003ecd35f4487a5e88270d3ca0a81bc80dc88053ac7e4dcfec5fba30d918" name = "github.com/gogo/protobuf" packages = [ "proto", "sortkeys", ] pruneopts = "" - revision = "1adfc126b41513cc696b209667c8656ea7aac67c" - version = "v1.0.0" + revision = "636bf0302bc95575d69441b25a2603156ffdddf1" + version = "v1.1.1" [[projects]] branch = "master" @@ -45,7 +45,7 @@ revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] - digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b" + digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18" name = "github.com/golang/protobuf" packages = [ "proto", @@ -55,8 +55,16 @@ "ptypes/timestamp", ] pruneopts = "" - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" + revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" + version = "v1.2.0" + +[[projects]] + branch = "master" + digest = "1:1e5b1e14524ed08301977b7b8e10c719ed853cbf3f24ecb66fae783a46f207a6" + name = "github.com/google/btree" + packages = ["."] + pruneopts = "" + revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" [[projects]] branch = "master" @@ -80,30 +88,33 @@ [[projects]] branch = "master" - digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94" - name = "github.com/hashicorp/golang-lru" + digest = "1:009a1928b8c096338b68b5822d838a72b4d8520715c1463614476359f3282ec8" + name = "github.com/gregjones/httpcache" packages = [ ".", - "simplelru", + "diskcache", ] pruneopts = "" - revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" + revision = "9cad4c3443a7200dd6400aef47183728de563a38" [[projects]] - branch = "master" - digest = "1:f81c8d7354cc0c6340f2f7a48724ee6c2b3db3e918ecd441c985b4d2d97dd3e7" - name = "github.com/howeyc/gopass" - packages = ["."] + digest = "1:3313a63031ae281e5f6fd7b0bbca733dfa04d2429df86519e3b4d4c016ccb836" + name = "github.com/hashicorp/golang-lru" + packages = [ + ".", + "simplelru", + ] pruneopts = "" - revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8" + revision = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768" + version = "v0.5.0" [[projects]] - digest = "1:302c6eb8e669c997bec516a138b8fc496018faa1ece4c13e445a2749fbe079bb" + digest = "1:7ab38c15bd21e056e3115c8b526d201eaf74e0308da9370997c6b3c187115d36" name = "github.com/imdario/mergo" packages = ["."] pruneopts = "" - revision = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58" - version = "v0.3.5" + revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4" + version = "v0.3.6" [[projects]] digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" @@ -114,12 +125,12 @@ version = "v1.0" [[projects]] - digest = "1:53ac4e911e12dde0ab68655e2006449d207a5a681f084974da2b06e5dbeaca72" + digest = "1:b79fc583e4dc7055ed86742e22164ac41bf8c0940722dbcb600f1a3ace1a8cb5" name = "github.com/json-iterator/go" packages = ["."] pruneopts = "" - revision = "ab8a2e0c74be9d3be70b3184d9acc634935ded82" - version = "1.1.4" + revision = "1624edc4454b8682399def8740d46db5e4362ba4" + version = "v1.1.5" [[projects]] digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28" @@ -153,6 +164,22 @@ pruneopts = "" revision = "cca7078d478f8520f85629ad7c68962d31ed7682" +[[projects]] + branch = "master" + digest = "1:c24598ffeadd2762552269271b3b1510df2d83ee6696c1e543a0ff653af494bc" + name = "github.com/petar/GoLLRB" + packages = ["llrb"] + pruneopts = "" + revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + +[[projects]] + digest = "1:b46305723171710475f2dd37547edd57b67b9de9f2a6267cafdd98331fd6897f" + name = "github.com/peterbourgon/diskv" + packages = ["."] + pruneopts = "" + revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" + version = "v2.0.1" + [[projects]] digest = "1:4142d94383572e74b42352273652c62afec5b23f325222ed09198f46009022d1" name = "github.com/prometheus/client_golang" @@ -166,15 +193,15 @@ [[projects]] branch = "master" - digest = "1:60aca47f4eeeb972f1b9da7e7db51dee15ff6c59f7b401c1588b8e6771ba15ef" + digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561" name = "github.com/prometheus/client_model" packages = ["go"] pruneopts = "" - revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" + revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" [[projects]] branch = "master" - digest = "1:bfbc121ef802d245ef67421cff206615357d9202337a3d492b8f668906b485a8" + digest = "1:f477ef7b65d94fb17574fc6548cef0c99a69c1634ea3b6da248b63a61ebe0498" name = "github.com/prometheus/common" packages = [ "expfmt", @@ -182,11 +209,11 @@ "model", ] pruneopts = "" - revision = "7600349dcfe1abd18d72d3a1770870d9800a7801" + revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" [[projects]] branch = "master" - digest = "1:b694a6bdecdace488f507cff872b30f6f490fdaf988abd74d87ea56406b23b6e" + digest = "1:e04aaa0e8f8da0ed3d6c0700bd77eda52a47f38510063209d72d62f0ef807d5e" name = "github.com/prometheus/procfs" packages = [ ".", @@ -195,7 +222,7 @@ "xfs", ] pruneopts = "" - revision = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a" + revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" [[projects]] digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" @@ -206,12 +233,12 @@ version = "v1.0.0" [[projects]] - digest = "1:8cf46b6c18a91068d446e26b67512cf16f1540b45d90b28b9533706a127f0ca6" + digest = "1:3fcbf733a8d810a21265a7f2fe08a3353db2407da052b233f8b204b5afc03d9b" name = "github.com/sirupsen/logrus" packages = ["."] pruneopts = "" - revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc" - version = "v1.0.5" + revision = "3e01752db0189b9157070a0e1668a620f9a85da2" + version = "v1.0.6" [[projects]] digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6" @@ -222,24 +249,24 @@ version = "v0.0.3" [[projects]] - digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d" + digest = "1:0a52bcb568386d98f4894575d53ce3e456f56471de6897bb8b9de13c33d9340e" name = "github.com/spf13/pflag" packages = ["."] pruneopts = "" - revision = "583c0c0531f06d5278b7d917446061adc344b5cd" - version = "v1.0.1" + revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" + version = "v1.0.2" [[projects]] branch = "master" - digest = "1:6ef14be530be39b6b9d75d54ce1d546ae9231e652d9e3eef198cbb19ce8ed3e7" + digest = "1:61a86f0be8b466d6e3fbdabb155aaa4006137cb5e3fd3b949329d103fa0ceb0f" name = "golang.org/x/crypto" packages = ["ssh/terminal"] pruneopts = "" - revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602" + revision = "0e37d006457bf46f9e6692014ba72ef82c33022c" [[projects]] branch = "master" - digest = "1:4c719bca528f83d5d42fd271bec965a9b10b8592c59ddd8acb19f381ec657016" + digest = "1:fbdbb6cf8db3278412c9425ad78b26bb8eb788181f26a3ffb3e4f216b314f86a" name = "golang.org/x/net" packages = [ "context", @@ -251,18 +278,18 @@ "idna", ] pruneopts = "" - revision = "6a8eb5e2b1816b30aa88d7e3ecf9eb7c4559d9e6" + revision = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2" [[projects]] branch = "master" - digest = "1:19f072f12708aaafef9064b49432953e3f813a98fcb356b30831cf2b0f5272b3" + digest = "1:ed900376500543ca05f2a2383e1f541b4606f19cd22f34acb81b17a0b90c7f3e" name = "golang.org/x/sys" packages = [ "unix", "windows", ] pruneopts = "" - revision = "1b2967e3c290b7c545b3db0deeda16e9be4f98a2" + revision = "d0be0721c37eeb5299f245a996a483160fc36940" [[projects]] digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4" @@ -312,7 +339,7 @@ version = "v2.2.1" [[projects]] - digest = "1:4d235221f43d5243b4929e098993fba365cd9a6448c613f4f8e59ea869ac094f" + digest = "1:2fe7efa9ea3052443378383d27c15ba088d03babe69a89815ce7fe9ec1d9aeb4" name = "k8s.io/api" packages = [ "admissionregistration/v1alpha1", @@ -339,17 +366,18 @@ "rbac/v1alpha1", "rbac/v1beta1", "scheduling/v1alpha1", + "scheduling/v1beta1", "settings/v1alpha1", "storage/v1", "storage/v1alpha1", "storage/v1beta1", ] pruneopts = "" - revision = "73d903622b7391f3312dcbac6483fed484e185f8" - version = "kubernetes-1.10.1" + revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:34dff545860050793802bc3245899316d11ea036d37d3b396deff3785a66196a" + digest = "1:d04bb4b31e495fa35739550e4dec2dd4c6f45c57f6d7fccb830a6ab75762efaa" name = "k8s.io/apiextensions-apiserver" packages = [ "pkg/apis/apiextensions", @@ -359,11 +387,11 @@ "pkg/client/clientset/clientset/typed/apiextensions/v1beta1", ] pruneopts = "" - revision = "4347b330d0ff094db860f2f75fa725b4f4b53618" - version = "kubernetes-1.10.1" + revision = "408db4a50408e2149acbd657bceb2480c13cb0a4" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:9b07c796baf391a2dfa8c64bd5ddc28cbeb00723389f2f3da2e3d09b961f2e31" + digest = "1:b6b2fb7b4da1ac973b64534ace2299a02504f16bc7820cb48edb8ca4077183e1" name = "k8s.io/apimachinery" packages = [ "pkg/api/errors", @@ -409,11 +437,11 @@ "third_party/forked/golang/reflect", ] pruneopts = "" - revision = "302974c03f7e50f16561ba237db776ab93594ef6" - version = "kubernetes-1.10.1" + revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:28504a7311d90506af4c62697951d66173c1b95b5b87368c42b06c143ce13e4a" + digest = "1:da788b52eda4a8cd4c564a69051b029f310f4ec232cfa3ec0e49b80b0e7b6616" name = "k8s.io/client-go" packages = [ "discovery", @@ -445,16 +473,19 @@ "kubernetes/typed/rbac/v1alpha1", "kubernetes/typed/rbac/v1beta1", "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/scheduling/v1beta1", "kubernetes/typed/settings/v1alpha1", "kubernetes/typed/storage/v1", "kubernetes/typed/storage/v1alpha1", "kubernetes/typed/storage/v1beta1", "pkg/apis/clientauthentication", "pkg/apis/clientauthentication/v1alpha1", + "pkg/apis/clientauthentication/v1beta1", "pkg/version", "plugin/pkg/client/auth/exec", "rest", "rest/watch", + "restmapper", "tools/auth", "tools/cache", "tools/clientcmd", @@ -467,6 +498,7 @@ "transport", "util/buffer", "util/cert", + "util/connrotation", "util/flowcontrol", "util/homedir", "util/integer", @@ -474,18 +506,19 @@ "util/workqueue", ] pruneopts = "" - revision = "989be4278f353e42f26c416c53757d16fcff77db" - version = "kubernetes-1.10.1" + revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1" + version = "kubernetes-1.11.2" [[projects]] - digest = "1:33b8dd2f2532df51be174418a1971fbaca14c1730b8d8476f33e2232787e057d" + digest = "1:207e862b55f9399362c667ce30f1ac8b2180d282bc7bb5749fc81122944aa2b5" name = "sigs.k8s.io/controller-runtime" packages = [ "pkg/client", "pkg/client/apiutil", ] pruneopts = "" - revision = "60bb251ad86f9b313653618aad0c2c53f41a6625" + revision = "79f06014d49b565e2d980fcd9519b33874ddb8d6" + version = "v0.1.3" [solve-meta] analyzer-name = "dep" @@ -514,12 +547,12 @@ "k8s.io/apimachinery/pkg/util/proxy", "k8s.io/apimachinery/pkg/util/wait", "k8s.io/apimachinery/pkg/watch", - "k8s.io/client-go/discovery", "k8s.io/client-go/discovery/cached", "k8s.io/client-go/dynamic", "k8s.io/client-go/kubernetes", "k8s.io/client-go/kubernetes/scheme", "k8s.io/client-go/rest", + "k8s.io/client-go/restmapper", "k8s.io/client-go/tools/cache", "k8s.io/client-go/tools/clientcmd", "k8s.io/client-go/transport", diff --git a/Gopkg.toml b/Gopkg.toml index a71e178248..88fbf04a46 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -4,23 +4,23 @@ [[constraint]] name = "github.com/spf13/cobra" - version = "0.0.2" + version = "0.0.3" [[override]] name = "k8s.io/api" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" [[override]] name = "k8s.io/apimachinery" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" [[override]] name = "k8s.io/apiextensions-apiserver" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" [[override]] name = "k8s.io/client-go" - version = "kubernetes-1.10.1" + version = "kubernetes-1.11.2" [[constraint]] name = "github.com/sergi/go-diff" @@ -28,4 +28,4 @@ [[constraint]] name = "sigs.k8s.io/controller-runtime" - revision = "60bb251ad86f9b313653618aad0c2c53f41a6625" + version = "v0.1.3" diff --git a/pkg/generator/templates.go b/pkg/generator/templates.go index 9c377b8ba5..b4318591a8 100644 --- a/pkg/generator/templates.go +++ b/pkg/generator/templates.go @@ -255,32 +255,32 @@ required = [ [[override]] name = "k8s.io/code-generator" - # revision for tag "kubernetes-1.10.1" - revision = "7ead8f38b01cf8653249f5af80ce7b2c8aba12e2" + # revision for tag "kubernetes-1.11.2" + revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a" [[override]] name = "k8s.io/api" - # revision for tag "kubernetes-1.10.1" - revision = "73d903622b7391f3312dcbac6483fed484e185f8" + # revision for tag "kubernetes-1.11.2" + revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa" [[override]] name = "k8s.io/apiextensions-apiserver" - # revision for tag "kubernetes-1.10.1" - revision = "4347b330d0ff094db860f2f75fa725b4f4b53618" + # revision for tag "kubernetes-1.11.2" + revision = "408db4a50408e2149acbd657bceb2480c13cb0a4" [[override]] name = "k8s.io/apimachinery" - # revision for tag "kubernetes-1.10.1" - revision = "302974c03f7e50f16561ba237db776ab93594ef6" + # revision for tag "kubernetes-1.11.2" + revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae" [[override]] name = "k8s.io/client-go" - # revision for tag "kubernetes-1.10.1" - revision = "989be4278f353e42f26c416c53757d16fcff77db" + # revision for tag "kubernetes-1.11.2" + revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1" [[override]] name = "sigs.k8s.io/controller-runtime" - revision = "60bb251ad86f9b313653618aad0c2c53f41a6625" + version = "v0.1.3" [prune] go-tests = true diff --git a/pkg/k8sclient/client.go b/pkg/k8sclient/client.go index fc78f67952..466bd3bdee 100644 --- a/pkg/k8sclient/client.go +++ b/pkg/k8sclient/client.go @@ -23,22 +23,20 @@ import ( "github.com/operator-framework/operator-sdk/pkg/util/k8sutil" - "k8s.io/apimachinery/pkg/api/meta" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/discovery" "k8s.io/client-go/discovery/cached" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "k8s.io/client-go/restmapper" "k8s.io/client-go/tools/clientcmd" ) type resourceClientFactory struct { - restMapper *discovery.DeferredDiscoveryRESTMapper - clientPool dynamic.ClientPool - kubeClient kubernetes.Interface - kubeConfig *rest.Config + dynamicClient dynamic.Interface + restMapper *restmapper.DeferredDiscoveryRESTMapper + kubeClient kubernetes.Interface + kubeConfig *rest.Config } var ( @@ -51,16 +49,19 @@ var ( func newSingletonFactory() { kubeClient, kubeConfig := mustNewKubeClientAndConfig() cachedDiscoveryClient := cached.NewMemCacheClient(kubeClient.Discovery()) - restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient, meta.InterfacesForUnstructured) + restMapper := restmapper.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient) restMapper.Reset() - kubeConfig.ContentConfig = dynamic.ContentConfig() - clientPool := dynamic.NewClientPool(kubeConfig, restMapper, dynamic.LegacyAPIPathResolverFunc) + + dynamicClient, err := dynamic.NewForConfig(kubeConfig) + if err != nil { + panic(err) + } singletonFactory = &resourceClientFactory{ - kubeClient: kubeClient, - kubeConfig: kubeConfig, - restMapper: restMapper, - clientPool: clientPool, + kubeClient: kubeClient, + kubeConfig: kubeConfig, + dynamicClient: dynamicClient, + restMapper: restMapper, } singletonFactory.runBackgroundCacheReset(1 * time.Minute) } @@ -95,31 +96,23 @@ func (c *resourceClientFactory) GetResourceClient(apiVersion, kind, namespace st Kind: kind, } - client, err := c.clientPool.ClientForGroupVersionKind(gvk) - if err != nil { - return nil, "", fmt.Errorf("failed to get client for GroupVersionKind(%s): %v", gvk.String(), err) - } - resource, err := apiResource(gvk, c.restMapper) + gvr, err := gvkToGVR(gvk, c.restMapper) if err != nil { return nil, "", fmt.Errorf("failed to get resource type: %v", err) } - pluralName := resource.Name - resourceClient := client.Resource(resource, namespace) + pluralName := gvr.Resource + + resourceClient := c.dynamicClient.Resource(*gvr).Namespace(namespace) return resourceClient, pluralName, nil } -// apiResource consults the REST mapper to translate an tuple to a metav1.APIResource struct. -func apiResource(gvk schema.GroupVersionKind, restMapper *discovery.DeferredDiscoveryRESTMapper) (*metav1.APIResource, error) { +// apiResource consults the REST mapper to translate an tuple to a GroupVersionResource +func gvkToGVR(gvk schema.GroupVersionKind, restMapper *restmapper.DeferredDiscoveryRESTMapper) (*schema.GroupVersionResource, error) { mapping, err := restMapper.RESTMapping(gvk.GroupKind(), gvk.Version) if err != nil { return nil, fmt.Errorf("failed to get the resource REST mapping for GroupVersionKind(%s): %v", gvk.String(), err) } - resource := &metav1.APIResource{ - Name: mapping.Resource, - Namespaced: mapping.Scope == meta.RESTScopeNamespace, - Kind: gvk.Kind, - } - return resource, nil + return &mapping.Resource, nil } // mustNewKubeClientAndConfig returns the in-cluster config and kubernetes client diff --git a/pkg/test/framework.go b/pkg/test/framework.go index 2edb1b806f..37669b1819 100644 --- a/pkg/test/framework.go +++ b/pkg/test/framework.go @@ -22,15 +22,14 @@ import ( extensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" extscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" - "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/discovery" "k8s.io/client-go/discovery/cached" "k8s.io/client-go/kubernetes" cgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" + "k8s.io/client-go/restmapper" "k8s.io/client-go/tools/clientcmd" dynclient "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -47,7 +46,7 @@ type Framework struct { KubeClient kubernetes.Interface ExtensionsClient *extensions.Clientset Scheme *runtime.Scheme - RestMapper *discovery.DeferredDiscoveryRESTMapper + RestMapper *restmapper.DeferredDiscoveryRESTMapper DynamicClient dynclient.Client DynamicDecoder runtime.Decoder NamespacedManPath *string @@ -110,7 +109,7 @@ func AddToFrameworkScheme(addToScheme addToSchemeFunc, obj runtime.Object) error return err } cachedDiscoveryClient := cached.NewMemCacheClient(Global.KubeClient.Discovery()) - Global.RestMapper = discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient, meta.InterfacesForUnstructured) + Global.RestMapper = restmapper.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient) Global.RestMapper.Reset() Global.DynamicClient, err = dynclient.New(Global.KubeConfig, dynclient.Options{Scheme: Global.Scheme, Mapper: Global.RestMapper}) err = wait.PollImmediate(time.Second, time.Second*10, func() (done bool, err error) { diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 377ffaeab7..77c6cfe7e1 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -24,15 +24,14 @@ import ( "time" extscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" - "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/discovery" "k8s.io/client-go/discovery/cached" "k8s.io/client-go/kubernetes" cgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" + "k8s.io/client-go/restmapper" "k8s.io/client-go/tools/clientcmd" dynclient "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -102,7 +101,7 @@ func AddToFrameworkScheme(addToScheme addToSchemeFunc, obj runtime.Object) error return err } cachedDiscoveryClient := cached.NewMemCacheClient(Global.KubeClient.Discovery()) - restMapper := discovery.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient, meta.InterfacesForUnstructured) + restMapper := restmapper.NewDeferredDiscoveryRESTMapper(cachedDiscoveryClient) restMapper.Reset() Global.DynamicClient, err = dynclient.New(Global.KubeConfig, dynclient.Options{Scheme: Global.Scheme, Mapper: restMapper}) err = wait.PollImmediate(time.Second, time.Second*10, func() (done bool, err error) {