From 81cd728c66d319492bacb4e6a8e29fadd0a46d6e Mon Sep 17 00:00:00 2001 From: Richa Banker Date: Fri, 18 Oct 2024 21:59:56 -0700 Subject: [PATCH] Move k8s.io/apiserver/pkg/util/version to component-base --- cmd/kube-apiserver/app/options/options_test.go | 2 +- cmd/kube-apiserver/app/options/validation.go | 2 +- cmd/kube-apiserver/app/testing/testserver.go | 2 +- cmd/kube-controller-manager/app/controllermanager.go | 2 +- cmd/kube-controller-manager/app/options/options.go | 2 +- cmd/kube-controller-manager/app/options/options_test.go | 2 +- cmd/kube-scheduler/app/options/options.go | 2 +- cmd/kube-scheduler/app/options/options_test.go | 2 +- cmd/kube-scheduler/app/server.go | 2 +- cmd/kube-scheduler/app/server_test.go | 2 +- pkg/controlplane/apiserver/options/options_test.go | 2 +- pkg/controlplane/apiserver/options/validation_test.go | 2 +- pkg/controlplane/instance_test.go | 2 +- pkg/kubeapiserver/default_storage_factory_builder.go | 2 +- .../src/k8s.io/apiextensions-apiserver/pkg/cmd/server/server.go | 2 +- .../pkg/cmd/server/testing/testserver.go | 2 +- staging/src/k8s.io/apiserver/pkg/cel/environment/base.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/config.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/config_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go | 2 +- .../src/k8s.io/apiserver/pkg/server/genericapiserver_test.go | 2 +- .../k8s.io/apiserver/pkg/server/options/server_run_options.go | 2 +- .../apiserver/pkg/server/options/server_run_options_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go | 2 +- .../apiserver/pkg/server/storage/resource_encoding_config.go | 2 +- .../k8s.io/apiserver/pkg/server/storage/storage_factory_test.go | 2 +- .../pkg/util/version => component-base/registry}/registry.go | 0 .../util/version => component-base/registry}/registry_test.go | 0 .../pkg/util/version => component-base/registry}/version.go | 0 .../util/version => component-base/registry}/version_test.go | 0 staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go | 2 +- staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go | 2 +- .../src/k8s.io/sample-apiserver/pkg/cmd/server/start_test.go | 2 +- test/integration/apiserver/apiserver_test.go | 2 +- test/integration/client/client_test.go | 2 +- test/integration/examples/apiserver_test.go | 2 +- 36 files changed, 32 insertions(+), 32 deletions(-) rename staging/src/k8s.io/{apiserver/pkg/util/version => component-base/registry}/registry.go (100%) rename staging/src/k8s.io/{apiserver/pkg/util/version => component-base/registry}/registry_test.go (100%) rename staging/src/k8s.io/{apiserver/pkg/util/version => component-base/registry}/version.go (100%) rename staging/src/k8s.io/{apiserver/pkg/util/version => component-base/registry}/version_test.go (100%) diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index e2731f45ddc..ce89d18ba97 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -32,13 +32,13 @@ import ( apiserveroptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/storagebackend" - utilversion "k8s.io/apiserver/pkg/util/version" auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered" audittruncate "k8s.io/apiserver/plugin/pkg/audit/truncate" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/featuregate" "k8s.io/component-base/logs" "k8s.io/component-base/metrics" + utilversion "k8s.io/component-base/registry" kapi "k8s.io/kubernetes/pkg/apis/core" controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" "k8s.io/kubernetes/pkg/controlplane/reconcilers" diff --git a/cmd/kube-apiserver/app/options/validation.go b/cmd/kube-apiserver/app/options/validation.go index e87f5f9dcb8..86a58eed21c 100644 --- a/cmd/kube-apiserver/app/options/validation.go +++ b/cmd/kube-apiserver/app/options/validation.go @@ -24,7 +24,7 @@ import ( genericoptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" netutils "k8s.io/utils/net" controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" diff --git a/cmd/kube-apiserver/app/testing/testserver.go b/cmd/kube-apiserver/app/testing/testserver.go index af2d2f752a0..7577ca10466 100644 --- a/cmd/kube-apiserver/app/testing/testserver.go +++ b/cmd/kube-apiserver/app/testing/testserver.go @@ -50,7 +50,6 @@ import ( "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/apiserver/pkg/storageversion" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" clientgotransport "k8s.io/client-go/transport" @@ -58,6 +57,7 @@ import ( "k8s.io/client-go/util/keyutil" featuregatetesting "k8s.io/component-base/featuregate/testing" logsapi "k8s.io/component-base/logs/api/v1" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2" "k8s.io/kube-aggregator/pkg/apiserver" "k8s.io/kubernetes/pkg/features" diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 99332e92b9f..7fd7abbc28d 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -41,7 +41,6 @@ import ( "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" cacheddiscovery "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/informers" v1core "k8s.io/client-go/kubernetes/typed/core/v1" @@ -63,6 +62,7 @@ import ( metricsfeatures "k8s.io/component-base/metrics/features" controllersmetrics "k8s.io/component-base/metrics/prometheus/controllers" "k8s.io/component-base/metrics/prometheus/slis" + utilversion "k8s.io/component-base/registry" "k8s.io/component-base/term" "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 9497fa1f27f..e54c6ae75bc 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -26,7 +26,6 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" apiserveroptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" clientgofeaturegate "k8s.io/client-go/features" clientset "k8s.io/client-go/kubernetes" clientgokubescheme "k8s.io/client-go/kubernetes/scheme" @@ -40,6 +39,7 @@ import ( "k8s.io/component-base/logs" logsapi "k8s.io/component-base/logs/api/v1" "k8s.io/component-base/metrics" + utilversion "k8s.io/component-base/registry" cmoptions "k8s.io/controller-manager/options" "k8s.io/klog/v2" kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" diff --git a/cmd/kube-controller-manager/app/options/options_test.go b/cmd/kube-controller-manager/app/options/options_test.go index 82638720ca1..726734f8ac3 100644 --- a/cmd/kube-controller-manager/app/options/options_test.go +++ b/cmd/kube-controller-manager/app/options/options_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/apis/apiserver" apiserveroptions "k8s.io/apiserver/pkg/server/options" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/featuregate" diff --git a/cmd/kube-scheduler/app/options/options.go b/cmd/kube-scheduler/app/options/options.go index 05c4f05b00e..efaa5c4c734 100644 --- a/cmd/kube-scheduler/app/options/options.go +++ b/cmd/kube-scheduler/app/options/options.go @@ -29,7 +29,6 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" apiserveroptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic/dynamicinformer" clientset "k8s.io/client-go/kubernetes" @@ -45,6 +44,7 @@ import ( "k8s.io/component-base/logs" logsapi "k8s.io/component-base/logs/api/v1" "k8s.io/component-base/metrics" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2" schedulerappconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config" "k8s.io/kubernetes/pkg/scheduler" diff --git a/cmd/kube-scheduler/app/options/options_test.go b/cmd/kube-scheduler/app/options/options_test.go index d4c406dcb37..7dc03ab3f12 100644 --- a/cmd/kube-scheduler/app/options/options_test.go +++ b/cmd/kube-scheduler/app/options/options_test.go @@ -32,9 +32,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" apiserveroptions "k8s.io/apiserver/pkg/server/options" - utilversion "k8s.io/apiserver/pkg/util/version" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/logs" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2/ktesting" v1 "k8s.io/kube-scheduler/config/v1" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 7b08b119b4b..24f26b5ad23 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -40,7 +40,6 @@ import ( "k8s.io/apiserver/pkg/server/mux" "k8s.io/apiserver/pkg/server/routes" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/events" @@ -54,6 +53,7 @@ import ( "k8s.io/component-base/metrics/features" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/prometheus/slis" + utilversion "k8s.io/component-base/registry" "k8s.io/component-base/term" "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" diff --git a/cmd/kube-scheduler/app/server_test.go b/cmd/kube-scheduler/app/server_test.go index 8b23584ec9e..6f5ca044d67 100644 --- a/cmd/kube-scheduler/app/server_test.go +++ b/cmd/kube-scheduler/app/server_test.go @@ -35,10 +35,10 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/version" "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + utilversion "k8s.io/component-base/registry" configv1 "k8s.io/kube-scheduler/config/v1" "k8s.io/kubernetes/cmd/kube-scheduler/app/options" "k8s.io/kubernetes/pkg/features" diff --git a/pkg/controlplane/apiserver/options/options_test.go b/pkg/controlplane/apiserver/options/options_test.go index 54488d3b700..6d4d0adafe0 100644 --- a/pkg/controlplane/apiserver/options/options_test.go +++ b/pkg/controlplane/apiserver/options/options_test.go @@ -31,13 +31,13 @@ import ( apiserveroptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/storage/etcd3" "k8s.io/apiserver/pkg/storage/storagebackend" - utilversion "k8s.io/apiserver/pkg/util/version" auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered" audittruncate "k8s.io/apiserver/plugin/pkg/audit/truncate" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/featuregate" "k8s.io/component-base/logs" "k8s.io/component-base/metrics" + utilversion "k8s.io/component-base/registry" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" netutils "k8s.io/utils/net" ) diff --git a/pkg/controlplane/apiserver/options/validation_test.go b/pkg/controlplane/apiserver/options/validation_test.go index 518d8a547d2..7b7e8b00041 100644 --- a/pkg/controlplane/apiserver/options/validation_test.go +++ b/pkg/controlplane/apiserver/options/validation_test.go @@ -23,9 +23,9 @@ import ( kubeapiserveradmission "k8s.io/apiserver/pkg/admission" genericoptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/component-base/featuregate" basemetrics "k8s.io/component-base/metrics" + utilversion "k8s.io/component-base/registry" "k8s.io/kubernetes/pkg/features" peerreconcilers "k8s.io/apiserver/pkg/reconcilers" diff --git a/pkg/controlplane/instance_test.go b/pkg/controlplane/instance_test.go index cf7bea07742..24a6820ddb8 100644 --- a/pkg/controlplane/instance_test.go +++ b/pkg/controlplane/instance_test.go @@ -56,11 +56,11 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/apiserver/pkg/util/openapi" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/discovery" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + utilversion "k8s.io/component-base/registry" kubeversion "k8s.io/component-base/version" aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme" netutils "k8s.io/utils/net" diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index 9dc7d74eacb..a5f49224a1d 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -25,7 +25,7 @@ import ( "k8s.io/apiserver/pkg/server/resourceconfig" serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/apiserver/pkg/util/version" + version "k8s.io/component-base/registry" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/certificates" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/server.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/server.go index 39be3d19a0e..2733cedc329 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/server.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/server.go @@ -24,7 +24,7 @@ import ( "k8s.io/apiextensions-apiserver/pkg/cmd/server/options" genericapiserver "k8s.io/apiserver/pkg/server" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" ) func NewServerCommand(ctx context.Context, out, errOut io.Writer) *cobra.Command { diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go index 2e5f7db1fc9..03b300b8fc6 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go @@ -38,10 +38,10 @@ import ( "k8s.io/apiserver/pkg/storage/storagebackend" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/apiserver/pkg/util/openapi" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" logsapi "k8s.io/component-base/logs/api/v1" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2" ) diff --git a/staging/src/k8s.io/apiserver/pkg/cel/environment/base.go b/staging/src/k8s.io/apiserver/pkg/cel/environment/base.go index 588173a26c5..21a4c9419fb 100644 --- a/staging/src/k8s.io/apiserver/pkg/cel/environment/base.go +++ b/staging/src/k8s.io/apiserver/pkg/cel/environment/base.go @@ -33,7 +33,7 @@ import ( "k8s.io/apiserver/pkg/cel/library" genericfeatures "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" ) // DefaultCompatibilityVersion returns a default compatibility version for use with EnvSet diff --git a/staging/src/k8s.io/apiserver/pkg/server/config.go b/staging/src/k8s.io/apiserver/pkg/server/config.go index 6da89491928..a958a921032 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/config.go @@ -71,13 +71,13 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" utilflowcontrol "k8s.io/apiserver/pkg/util/flowcontrol" flowcontrolrequest "k8s.io/apiserver/pkg/util/flowcontrol/request" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/informers" restclient "k8s.io/client-go/rest" "k8s.io/component-base/featuregate" "k8s.io/component-base/logs" "k8s.io/component-base/metrics/features" "k8s.io/component-base/metrics/prometheus/slis" + utilversion "k8s.io/component-base/registry" "k8s.io/component-base/tracing" "k8s.io/klog/v2" openapicommon "k8s.io/kube-openapi/pkg/common" diff --git a/staging/src/k8s.io/apiserver/pkg/server/config_test.go b/staging/src/k8s.io/apiserver/pkg/server/config_test.go index 75314e2cafa..49f110e5b3d 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/config_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/config_test.go @@ -42,10 +42,10 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/healthz" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/rest" + utilversion "k8s.io/component-base/registry" "k8s.io/component-base/tracing" "k8s.io/klog/v2/ktesting" netutils "k8s.io/utils/net" diff --git a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go index 52fb449ac6e..9102d83e03c 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go +++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go @@ -51,9 +51,9 @@ import ( "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/routes" "k8s.io/apiserver/pkg/storageversion" - utilversion "k8s.io/apiserver/pkg/util/version" restclient "k8s.io/client-go/rest" "k8s.io/component-base/featuregate" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2" openapibuilder3 "k8s.io/kube-openapi/pkg/builder3" openapicommon "k8s.io/kube-openapi/pkg/common" diff --git a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go index c6a7cbdcff0..ddfecb08136 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go @@ -48,11 +48,11 @@ import ( openapinamer "k8s.io/apiserver/pkg/endpoints/openapi" "k8s.io/apiserver/pkg/registry/rest" genericfilters "k8s.io/apiserver/pkg/server/filters" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/apiserver/pkg/warning" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" restclient "k8s.io/client-go/rest" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2/ktesting" kubeopenapi "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/validation/spec" diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go index 9246366dd63..90d020f50d0 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go @@ -28,7 +28,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/server" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" "github.com/spf13/pflag" ) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options_test.go index 7bfcf0245f1..bccc728c483 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options_test.go @@ -26,7 +26,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" netutils "k8s.io/utils/net" ) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go index dc87524efcf..6f69f9af5c1 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving_test.go @@ -43,10 +43,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/version" "k8s.io/apiserver/pkg/server" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/discovery" restclient "k8s.io/client-go/rest" cliflag "k8s.io/component-base/cli/flag" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2/ktesting" netutils "k8s.io/utils/net" ) diff --git a/staging/src/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go b/staging/src/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go index f53fdb832c4..e25dc7f3b4c 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" apimachineryversion "k8s.io/apimachinery/pkg/util/version" - "k8s.io/apiserver/pkg/util/version" + version "k8s.io/component-base/registry" ) type ResourceEncodingConfig interface { diff --git a/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go b/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go index b8628f0506c..457952341df 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/storage/storage_factory_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apiserver/pkg/apis/example2" example2install "k8s.io/apiserver/pkg/apis/example2/install" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/apiserver/pkg/util/version" + version "k8s.io/component-base/registry" ) var ( diff --git a/staging/src/k8s.io/apiserver/pkg/util/version/registry.go b/staging/src/k8s.io/component-base/registry/registry.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/util/version/registry.go rename to staging/src/k8s.io/component-base/registry/registry.go diff --git a/staging/src/k8s.io/apiserver/pkg/util/version/registry_test.go b/staging/src/k8s.io/component-base/registry/registry_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/util/version/registry_test.go rename to staging/src/k8s.io/component-base/registry/registry_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/util/version/version.go b/staging/src/k8s.io/component-base/registry/version.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/util/version/version.go rename to staging/src/k8s.io/component-base/registry/version.go diff --git a/staging/src/k8s.io/apiserver/pkg/util/version/version_test.go b/staging/src/k8s.io/component-base/registry/version_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/util/version/version_test.go rename to staging/src/k8s.io/component-base/registry/version_test.go diff --git a/staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go b/staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go index d081702d246..3221060cf1b 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go @@ -31,7 +31,7 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/filters" genericoptions "k8s.io/apiserver/pkg/server/options" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" "k8s.io/kube-aggregator/pkg/apiserver" aggregatorscheme "k8s.io/kube-aggregator/pkg/apiserver/scheme" diff --git a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go index 0ae2690b4b8..fe7ce7bffea 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go @@ -34,8 +34,8 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/component-base/featuregate" + utilversion "k8s.io/component-base/registry" baseversion "k8s.io/component-base/version" "k8s.io/sample-apiserver/pkg/admission/plugin/banflunder" "k8s.io/sample-apiserver/pkg/admission/wardleinitializer" diff --git a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start_test.go b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start_test.go index ab460815083..d2a4ab5aaf8 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start_test.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/util/version" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" "github.com/stretchr/testify/assert" ) diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index 5c4152915a5..40f49f4c9dc 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/test/integration/apiserver/apiserver_test.go @@ -56,7 +56,6 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/endpoints/handlers" "k8s.io/apiserver/pkg/storage/storagebackend" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" @@ -65,6 +64,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/restmapper" "k8s.io/client-go/tools/pager" + utilversion "k8s.io/component-base/registry" "k8s.io/klog/v2" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 02b56c6a64f..820029ed8e5 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -48,7 +48,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/utils/pointer" - utilversion "k8s.io/apiserver/pkg/util/version" + utilversion "k8s.io/component-base/registry" "k8s.io/component-base/version" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" diff --git a/test/integration/examples/apiserver_test.go b/test/integration/examples/apiserver_test.go index e5caa54dd4d..415cf271f34 100644 --- a/test/integration/examples/apiserver_test.go +++ b/test/integration/examples/apiserver_test.go @@ -47,7 +47,6 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/dynamiccertificates" genericapiserveroptions "k8s.io/apiserver/pkg/server/options" - utilversion "k8s.io/apiserver/pkg/util/version" client "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -55,6 +54,7 @@ import ( "k8s.io/client-go/transport" "k8s.io/client-go/util/cert" "k8s.io/component-base/featuregate" + utilversion "k8s.io/component-base/registry" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/cmd/kube-apiserver/app"