From 43c05e98ca4fad8e170cf9037aa0afa0a05b7a49 Mon Sep 17 00:00:00 2001 From: Junhao Zou Date: Fri, 8 Sep 2023 11:57:46 +0800 Subject: [PATCH 1/2] cleanup: Replace the deprecated NewMemCacheClient with memory.NewMemCacheClient --- cmd/kube-controller-manager/app/controllermanager.go | 2 +- staging/src/k8s.io/cloud-provider/app/controllermanager.go | 2 +- test/integration/scheduler_perf/scheduler_perf_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index b60dba90e20..9da7a3b3e1e 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -39,7 +39,7 @@ import ( "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" utilfeature "k8s.io/apiserver/pkg/util/feature" - cacheddiscovery "k8s.io/client-go/discovery/cached" + cacheddiscovery "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/informers" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/metadata" diff --git a/staging/src/k8s.io/cloud-provider/app/controllermanager.go b/staging/src/k8s.io/cloud-provider/app/controllermanager.go index 56fd0053136..12a21adca50 100644 --- a/staging/src/k8s.io/cloud-provider/app/controllermanager.go +++ b/staging/src/k8s.io/cloud-provider/app/controllermanager.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server/healthz" utilfeature "k8s.io/apiserver/pkg/util/feature" - cacheddiscovery "k8s.io/client-go/discovery/cached" + cacheddiscovery "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/informers" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/metadata" diff --git a/test/integration/scheduler_perf/scheduler_perf_test.go b/test/integration/scheduler_perf/scheduler_perf_test.go index 58b671b9c63..1c60e877cce 100644 --- a/test/integration/scheduler_perf/scheduler_perf_test.go +++ b/test/integration/scheduler_perf/scheduler_perf_test.go @@ -41,7 +41,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" - cacheddiscovery "k8s.io/client-go/discovery/cached" + cacheddiscovery "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/dynamic" "k8s.io/client-go/informers" coreinformers "k8s.io/client-go/informers/core/v1" From 2dd7db306a6a2c8a974f8af4fd5aba08050e78ac Mon Sep 17 00:00:00 2001 From: Junhao Zou Date: Mon, 11 Sep 2023 16:33:16 +0800 Subject: [PATCH 2/2] Update modules.txt --- vendor/modules.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index e691c22a6fc..ac766306efe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1653,7 +1653,6 @@ k8s.io/client-go/applyconfigurations/storage/v1 k8s.io/client-go/applyconfigurations/storage/v1alpha1 k8s.io/client-go/applyconfigurations/storage/v1beta1 k8s.io/client-go/discovery -k8s.io/client-go/discovery/cached k8s.io/client-go/discovery/cached/disk k8s.io/client-go/discovery/cached/memory k8s.io/client-go/discovery/fake