diff --git a/cmd/cloud-controller-manager/.import-restrictions b/cmd/cloud-controller-manager/.import-restrictions index 117a31f7e17..3b6eb1a11c7 100644 --- a/cmd/cloud-controller-manager/.import-restrictions +++ b/cmd/cloud-controller-manager/.import-restrictions @@ -42,4 +42,4 @@ rules: - k8s.io/kubernetes/pkg/proxy/util - k8s.io/kubernetes/pkg/proxy/util/testing - k8s.io/kubernetes/pkg/util/sysctl - - k8s.io/kubernetes/test/utils/ktesting + - k8s.io/ktesting diff --git a/cmd/kube-apiserver/app/testing/testserver.go b/cmd/kube-apiserver/app/testing/testserver.go index 4f39d369ffc..6b09a579efa 100644 --- a/cmd/kube-apiserver/app/testing/testserver.go +++ b/cmd/kube-apiserver/app/testing/testserver.go @@ -65,12 +65,12 @@ import ( featuremetrics "k8s.io/component-base/metrics/prometheus/feature" zpagesfeatures "k8s.io/component-base/zpages/features" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kube-aggregator/pkg/apiserver" "k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/e2e/invariants/metrics" testutil "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/ktesting" ) func init() { diff --git a/cmd/kube-apiserver/app/testing/testserver_test.go b/cmd/kube-apiserver/app/testing/testserver_test.go index 5d97b58217b..3a3ce197f9d 100644 --- a/cmd/kube-apiserver/app/testing/testserver_test.go +++ b/cmd/kube-apiserver/app/testing/testserver_test.go @@ -22,7 +22,7 @@ import ( "testing" etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // TestStartTestServerTearDownCauseOnTestCompletion verifies that when a test diff --git a/cmd/kube-proxy/app/server_linux_test.go b/cmd/kube-proxy/app/server_linux_test.go index c090e065b58..61ff63d5c71 100644 --- a/cmd/kube-proxy/app/server_linux_test.go +++ b/cmd/kube-proxy/app/server_linux_test.go @@ -29,9 +29,9 @@ import ( "github.com/spf13/pflag" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" proxyutil "k8s.io/kubernetes/pkg/proxy/util" - "k8s.io/kubernetes/test/utils/ktesting" ) func Test_platformApplyDefaults(t *testing.T) { diff --git a/cmd/kube-proxy/app/server_test.go b/cmd/kube-proxy/app/server_test.go index 516e4fe5340..13bbc7ecae0 100644 --- a/cmd/kube-proxy/app/server_test.go +++ b/cmd/kube-proxy/app/server_test.go @@ -43,9 +43,9 @@ import ( kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" proxymetrics "k8s.io/kubernetes/pkg/proxy/metrics" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" ) diff --git a/cmd/kubelet/app/server_bootstrap_test.go b/cmd/kubelet/app/server_bootstrap_test.go index 03c3f082371..db471913129 100644 --- a/cmd/kubelet/app/server_bootstrap_test.go +++ b/cmd/kubelet/app/server_bootstrap_test.go @@ -44,9 +44,9 @@ import ( restclient "k8s.io/client-go/rest" certutil "k8s.io/client-go/util/cert" "k8s.io/component-base/featuregate" + "k8s.io/ktesting" capihelper "k8s.io/kubernetes/pkg/apis/certificates/v1" "k8s.io/kubernetes/pkg/controller/certificates/authority" - "k8s.io/kubernetes/test/utils/ktesting" ) // Test_buildClientCertificateManager validates that we can build a local client cert diff --git a/go.mod b/go.mod index 29fdc43604a..9a3218ccd9f 100644 --- a/go.mod +++ b/go.mod @@ -104,6 +104,7 @@ require ( k8s.io/externaljwt v0.0.0 k8s.io/klog/v2 v2.140.0 k8s.io/kms v0.0.0 + k8s.io/ktesting v0.0.0 k8s.io/kube-aggregator v0.0.0 k8s.io/kube-controller-manager v0.0.0 k8s.io/kube-openapi v0.0.0-20260929181212-2cfbdf149b9a @@ -234,6 +235,7 @@ replace ( k8s.io/endpointslice => ./staging/src/k8s.io/endpointslice k8s.io/externaljwt => ./staging/src/k8s.io/externaljwt k8s.io/kms => ./staging/src/k8s.io/kms + k8s.io/ktesting => ./staging/src/k8s.io/ktesting k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy diff --git a/go.work b/go.work index 42ab6fc0a11..bff4c210e78 100644 --- a/go.work +++ b/go.work @@ -26,6 +26,7 @@ use ( ./staging/src/k8s.io/endpointslice ./staging/src/k8s.io/externaljwt ./staging/src/k8s.io/kms + ./staging/src/k8s.io/ktesting ./staging/src/k8s.io/kube-aggregator ./staging/src/k8s.io/kube-controller-manager ./staging/src/k8s.io/kube-proxy diff --git a/hack/golangci-hints.yaml b/hack/golangci-hints.yaml index 172f20e8502..34ea706f453 100644 --- a/hack/golangci-hints.yaml +++ b/hack/golangci-hints.yaml @@ -493,18 +493,32 @@ linters: deny: - pkg: "k8s.io/utils/pointer" desc: "k8s.io/utils/pointer shall no longer be used, please use k8s.io/utils/ptr." - go-cmp: + test-only-dependencies: files: + # Apply deny list to all files except for _test.go files. - $all - "!$test" + # Some normal packages are meant to be used only in tests and thus + # are also exempt. - "!**/test/**" - "!**/testing/**" + - "!**/ktesting/**" - "!**/apitesting/**" deny: - pkg: "github.com/google/go-cmp/cmp" desc: "cmp is allowed only in test files" - pkg: "html/template" desc: "template is allowed only in test files as it disables dead code elimination" + - pkg: "k8s.io/ktesting" + desc: "ktesting is allowed only in test files" + - pkg: "k8s.io/client-go/ktesting" + desc: "ktesting is allowed only in test files" + # Normal packages exempted above also must not be used in production code. + # depguard wants a prefix here, so we would need to list packages explicitly + # instead of using wildcards as above. + # + # This only covers one level of indirection, though. + # A better solution might be transitive deny (https://github.com/OpenPeeDeeP/depguard/issues/68). forbidigo: analyze-types: true forbid: @@ -577,7 +591,7 @@ linters: # Replace context.WithCancel with t.Context in tests. # # Disabled because in Kubernetes, - # test/utils/ktesting handles + # k8s.io/ktesting handles # context cancellation and also # addresses other pain points. - testingcontext diff --git a/hack/golangci.yaml b/hack/golangci.yaml index 24c43b073c7..36b3e8fba13 100644 --- a/hack/golangci.yaml +++ b/hack/golangci.yaml @@ -506,18 +506,32 @@ linters: deny: - pkg: "k8s.io/utils/pointer" desc: "k8s.io/utils/pointer shall no longer be used, please use k8s.io/utils/ptr." - go-cmp: + test-only-dependencies: files: + # Apply deny list to all files except for _test.go files. - $all - "!$test" + # Some normal packages are meant to be used only in tests and thus + # are also exempt. - "!**/test/**" - "!**/testing/**" + - "!**/ktesting/**" - "!**/apitesting/**" deny: - pkg: "github.com/google/go-cmp/cmp" desc: "cmp is allowed only in test files" - pkg: "html/template" desc: "template is allowed only in test files as it disables dead code elimination" + - pkg: "k8s.io/ktesting" + desc: "ktesting is allowed only in test files" + - pkg: "k8s.io/client-go/ktesting" + desc: "ktesting is allowed only in test files" + # Normal packages exempted above also must not be used in production code. + # depguard wants a prefix here, so we would need to list packages explicitly + # instead of using wildcards as above. + # + # This only covers one level of indirection, though. + # A better solution might be transitive deny (https://github.com/OpenPeeDeeP/depguard/issues/68). forbidigo: analyze-types: true forbid: @@ -648,7 +662,7 @@ linters: # Replace context.WithCancel with t.Context in tests. # # Disabled because in Kubernetes, - # test/utils/ktesting handles + # k8s.io/ktesting handles # context cancellation and also # addresses other pain points. - testingcontext diff --git a/hack/golangci.yaml.in b/hack/golangci.yaml.in index 8523133af2b..bd2d18edb14 100644 --- a/hack/golangci.yaml.in +++ b/hack/golangci.yaml.in @@ -204,18 +204,32 @@ linters: deny: - pkg: "k8s.io/utils/pointer" desc: "k8s.io/utils/pointer shall no longer be used, please use k8s.io/utils/ptr." - go-cmp: + test-only-dependencies: files: + # Apply deny list to all files except for _test.go files. - $all - "!$test" + # Some normal packages are meant to be used only in tests and thus + # are also exempt. - "!**/test/**" - "!**/testing/**" + - "!**/ktesting/**" - "!**/apitesting/**" deny: - pkg: "github.com/google/go-cmp/cmp" desc: "cmp is allowed only in test files" - pkg: "html/template" desc: "template is allowed only in test files as it disables dead code elimination" + - pkg: "k8s.io/ktesting" + desc: "ktesting is allowed only in test files" + - pkg: "k8s.io/client-go/ktesting" + desc: "ktesting is allowed only in test files" + # Normal packages exempted above also must not be used in production code. + # depguard wants a prefix here, so we would need to list packages explicitly + # instead of using wildcards as above. + # + # This only covers one level of indirection, though. + # A better solution might be transitive deny (https://github.com/OpenPeeDeeP/depguard/issues/68). forbidigo: analyze-types: true forbid: @@ -364,7 +378,7 @@ linters: # Replace context.WithCancel with t.Context in tests. # # Disabled because in Kubernetes, - # test/utils/ktesting handles + # k8s.io/ktesting handles # context cancellation and also # addresses other pain points. - testingcontext diff --git a/pkg/api/job/warnings_test.go b/pkg/api/job/warnings_test.go index 920bc7b602c..6036b895983 100644 --- a/pkg/api/job/warnings_test.go +++ b/pkg/api/job/warnings_test.go @@ -20,9 +20,9 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/bootstrap/bootstrapsigner_test.go b/pkg/controller/bootstrap/bootstrapsigner_test.go index ef0db23e04a..2b7c9db5483 100644 --- a/pkg/controller/bootstrap/bootstrapsigner_test.go +++ b/pkg/controller/bootstrap/bootstrapsigner_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" bootstrapapi "k8s.io/cluster-bootstrap/token/api" + "k8s.io/ktesting" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" ) const testTokenID = "abc123" diff --git a/pkg/controller/bootstrap/tokencleaner_test.go b/pkg/controller/bootstrap/tokencleaner_test.go index 4401d10dfbf..d52212ad68f 100644 --- a/pkg/controller/bootstrap/tokencleaner_test.go +++ b/pkg/controller/bootstrap/tokencleaner_test.go @@ -28,8 +28,8 @@ import ( coreinformers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "k8s.io/ktesting" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/test/utils/ktesting" ) func newTokenCleaner(t *testing.T) (*TokenCleaner, *fake.Clientset, coreinformers.SecretInformer, error) { diff --git a/pkg/controller/certificates/clustertrustbundlepublisher/publisher_test.go b/pkg/controller/certificates/clustertrustbundlepublisher/publisher_test.go index 50910173a01..51c5dea5553 100644 --- a/pkg/controller/certificates/clustertrustbundlepublisher/publisher_test.go +++ b/pkg/controller/certificates/clustertrustbundlepublisher/publisher_test.go @@ -30,7 +30,7 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" certutil "k8s.io/client-go/util/cert" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) const testSignerName = "test.test/testSigner" diff --git a/pkg/controller/certificates/rootcacertpublisher/publisher_test.go b/pkg/controller/certificates/rootcacertpublisher/publisher_test.go index 6115c004fec..463907719c5 100644 --- a/pkg/controller/certificates/rootcacertpublisher/publisher_test.go +++ b/pkg/controller/certificates/rootcacertpublisher/publisher_test.go @@ -30,8 +30,8 @@ import ( corev1listers "k8s.io/client-go/listers/core/v1" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestConfigMapCreation(t *testing.T) { diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index 8a43519ecf2..727e971d9b5 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -48,12 +48,12 @@ import ( "k8s.io/client-go/tools/record" utiltesting "k8s.io/client-go/util/testing" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/apis/core" _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/controller/testutil" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/securitycontext" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" diff --git a/pkg/controller/devicetainteviction/device_taint_eviction_test.go b/pkg/controller/devicetainteviction/device_taint_eviction_test.go index 33edfe4e964..8581e8b5acb 100644 --- a/pkg/controller/devicetainteviction/device_taint_eviction_test.go +++ b/pkg/controller/devicetainteviction/device_taint_eviction_test.go @@ -45,6 +45,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" clientfeatures "k8s.io/client-go/features" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" @@ -57,7 +58,6 @@ import ( controllertestutil "k8s.io/kubernetes/pkg/controller/testutil" "k8s.io/kubernetes/pkg/features" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func init() { diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 43f3840b2b3..1e03ee23459 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -49,9 +49,9 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" + "k8s.io/ktesting" _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" clocktesting "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index d3839ca45e3..317db90b3c0 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -44,10 +44,10 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" utiltesting "k8s.io/client-go/util/testing" + "k8s.io/ktesting" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" api "k8s.io/kubernetes/pkg/apis/core" controllerpkg "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" utilnet "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/endpointslicemirroring/reconciler_test.go b/pkg/controller/endpointslicemirroring/reconciler_test.go index 56852db450b..2edb4ff0deb 100644 --- a/pkg/controller/endpointslicemirroring/reconciler_test.go +++ b/pkg/controller/endpointslicemirroring/reconciler_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/component-base/metrics/testutil" endpointsliceutil "k8s.io/endpointslice/util" + "k8s.io/ktesting" endpointsv1 "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/controller/endpointslicemirroring/metrics" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index 63d96afebd5..3cbc02625a0 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -66,10 +66,10 @@ import ( "k8s.io/client-go/util/workqueue" metricsutil "k8s.io/component-base/metrics/testutil" "k8s.io/controller-manager/pkg/informerfactory" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/api/legacyscheme" c "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/garbagecollector/metrics" - "k8s.io/kubernetes/test/utils/ktesting" ) type testRESTMapper struct { diff --git a/pkg/controller/history/controller_history_test.go b/pkg/controller/history/controller_history_test.go index 29d5f508722..bd19568ec60 100644 --- a/pkg/controller/history/controller_history_test.go +++ b/pkg/controller/history/controller_history_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/client-go/kubernetes/fake" clientscheme "k8s.io/client-go/kubernetes/scheme" core "k8s.io/client-go/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/controller/nodeipam/ipam/range_allocator_test.go b/pkg/controller/nodeipam/ipam/range_allocator_test.go index c349c2e9744..f6f6f43faab 100644 --- a/pkg/controller/nodeipam/ipam/range_allocator_test.go +++ b/pkg/controller/nodeipam/ipam/range_allocator_test.go @@ -25,9 +25,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/fake" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/test" "k8s.io/kubernetes/pkg/controller/testutil" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" ) diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go b/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go index ae6274ef0ef..8200b53ef85 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller_test.go @@ -42,6 +42,7 @@ import ( "k8s.io/client-go/kubernetes/fake" testcore "k8s.io/client-go/testing" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" kubeletapis "k8s.io/kubelet/pkg/apis" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler" @@ -50,7 +51,6 @@ import ( "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/node" taintutils "k8s.io/kubernetes/pkg/util/taints" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 26038c1ffec..6e298524829 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -52,6 +52,7 @@ import ( "k8s.io/client-go/util/workqueue" featuregatetesting "k8s.io/component-base/featuregate/testing" metricstestutil "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/api/legacyscheme" autoscalingapiv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2" "k8s.io/kubernetes/pkg/controller" @@ -59,7 +60,6 @@ import ( "k8s.io/kubernetes/pkg/controller/podautoscaler/monitor" "k8s.io/kubernetes/pkg/controller/util/selectors" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta2" emapi "k8s.io/metrics/pkg/apis/external_metrics/v1beta1" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1beta1" diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 0f9d069d06c..22c1b208c73 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -38,11 +38,11 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controller" metricsclient "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" cmapi "k8s.io/metrics/pkg/apis/custom_metrics/v1beta2" emapi "k8s.io/metrics/pkg/apis/external_metrics/v1beta1" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1beta1" diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 891613247b4..f8e27789830 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -52,11 +52,11 @@ import ( utiltesting "k8s.io/client-go/util/testing" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" . "k8s.io/kubernetes/pkg/controller/testutil" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/securitycontext" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/resourceclaim/controller_test.go b/pkg/controller/resourceclaim/controller_test.go index 437216ef60f..8da6ed3e0c1 100644 --- a/pkg/controller/resourceclaim/controller_test.go +++ b/pkg/controller/resourceclaim/controller_test.go @@ -46,9 +46,9 @@ import ( "k8s.io/component-base/metrics/legacyregistry" resourceclaimmetrics "k8s.io/dynamic-resource-allocation/resourceclaim/metrics" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" controllermetrics "k8s.io/kubernetes/pkg/controller/resourceclaim/metrics" - "k8s.io/kubernetes/test/utils/ktesting" ) var ( diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go index 3c59daa73d5..b1011d91084 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestServiceAccountCreation(t *testing.T) { diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go index 0fa796fe520..730c35abfb1 100644 --- a/pkg/controller/serviceaccount/tokens_controller_test.go +++ b/pkg/controller/serviceaccount/tokens_controller_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/dump" ) diff --git a/pkg/controller/servicecidrs/servicecidrs_controller_test.go b/pkg/controller/servicecidrs/servicecidrs_controller_test.go index dca396af374..2a5999bc4ff 100644 --- a/pkg/controller/servicecidrs/servicecidrs_controller_test.go +++ b/pkg/controller/servicecidrs/servicecidrs_controller_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controlplane/controller/defaultservicecidr" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/controller/statefulset/stateful_set_control_test.go b/pkg/controller/statefulset/stateful_set_control_test.go index 5e880d80e0a..7f5d3a986fb 100644 --- a/pkg/controller/statefulset/stateful_set_control_test.go +++ b/pkg/controller/statefulset/stateful_set_control_test.go @@ -53,12 +53,12 @@ import ( "k8s.io/client-go/tools/cache" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/history" "k8s.io/kubernetes/pkg/controller/statefulset/metrics" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/controller/statefulset/stateful_set_test.go b/pkg/controller/statefulset/stateful_set_test.go index b8d1356bb89..d59db6084ee 100644 --- a/pkg/controller/statefulset/stateful_set_test.go +++ b/pkg/controller/statefulset/stateful_set_test.go @@ -40,9 +40,9 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/history" - "k8s.io/kubernetes/test/utils/ktesting" ) var parentKind = apps.SchemeGroupVersion.WithKind("StatefulSet") diff --git a/pkg/controller/storageversionmigrator/migrationrunner_test.go b/pkg/controller/storageversionmigrator/migrationrunner_test.go index c9d1148113f..97e54657da7 100644 --- a/pkg/controller/storageversionmigrator/migrationrunner_test.go +++ b/pkg/controller/storageversionmigrator/migrationrunner_test.go @@ -33,7 +33,7 @@ import ( svminformers "k8s.io/client-go/informers" kubefake "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func init() { diff --git a/pkg/controller/storageversionmigrator/resourceversion_test.go b/pkg/controller/storageversionmigrator/resourceversion_test.go index 8934e32f1bf..5b077926e96 100644 --- a/pkg/controller/storageversionmigrator/resourceversion_test.go +++ b/pkg/controller/storageversionmigrator/resourceversion_test.go @@ -39,7 +39,7 @@ import ( "k8s.io/client-go/metadata" metadatafake "k8s.io/client-go/metadata/fake" kubetesting "k8s.io/client-go/testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestIsResourceMigratable(t *testing.T) { diff --git a/pkg/controller/validatingadmissionpolicystatus/controller_test.go b/pkg/controller/validatingadmissionpolicystatus/controller_test.go index c0ecdff727c..be915d72b9e 100644 --- a/pkg/controller/validatingadmissionpolicystatus/controller_test.go +++ b/pkg/controller/validatingadmissionpolicystatus/controller_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/scheme" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/generated/openapi" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestTypeChecking(t *testing.T) { diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller_test.go b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go index 6c5921947bd..986a92f56df 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller_test.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go @@ -33,13 +33,13 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/fake" kcache "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/csi" "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/controller/volume/expand/expand_controller_test.go b/pkg/controller/volume/expand/expand_controller_test.go index 2ba3b021803..65ed539e0a3 100644 --- a/pkg/controller/volume/expand/expand_controller_test.go +++ b/pkg/controller/volume/expand/expand_controller_test.go @@ -34,6 +34,7 @@ import ( coretesting "k8s.io/client-go/testing" csitrans "k8s.io/csi-translation-lib" csitranslationplugins "k8s.io/csi-translation-lib/plugins" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller" controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" "k8s.io/kubernetes/pkg/volume" @@ -41,7 +42,6 @@ import ( "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" volumetypes "k8s.io/kubernetes/pkg/volume/util/types" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestSyncHandler(t *testing.T) { diff --git a/pkg/controlplane/apiserver/samples/generic/server/testing/testserver.go b/pkg/controlplane/apiserver/samples/generic/server/testing/testserver.go index 26cee0e7da2..a78da474673 100644 --- a/pkg/controlplane/apiserver/samples/generic/server/testing/testserver.go +++ b/pkg/controlplane/apiserver/samples/generic/server/testing/testserver.go @@ -44,8 +44,8 @@ import ( logsapi "k8s.io/component-base/logs/api/v1" zpagesfeatures "k8s.io/component-base/zpages/features" "k8s.io/klog/v2" + "k8s.io/ktesting" controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" - "k8s.io/kubernetes/test/utils/ktesting" ) func init() { diff --git a/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go b/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go index 29ad8d72639..9fdb0235d2c 100644 --- a/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go +++ b/pkg/controlplane/controller/defaultservicecidr/default_servicecidr_controller_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/controlplane/controller/legacytokentracking/controller_test.go b/pkg/controlplane/controller/legacytokentracking/controller_test.go index bb292476d9e..9e237ed5468 100644 --- a/pkg/controlplane/controller/legacytokentracking/controller_test.go +++ b/pkg/controlplane/controller/legacytokentracking/controller_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/allocation/allocation_manager_test.go b/pkg/kubelet/allocation/allocation_manager_test.go index fe723f92d6a..52ff2c247e7 100644 --- a/pkg/kubelet/allocation/allocation_manager_test.go +++ b/pkg/kubelet/allocation/allocation_manager_test.go @@ -39,6 +39,7 @@ import ( "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/testutil" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/allocation/state" "k8s.io/kubernetes/pkg/kubelet/cm" @@ -55,7 +56,6 @@ import ( kubetypes "k8s.io/kubernetes/pkg/kubelet/types" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" _ "k8s.io/kubernetes/pkg/volume/hostpath" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/apis/podresources/client_test.go b/pkg/kubelet/apis/podresources/client_test.go index a2e11bf7819..9c8c34e2017 100644 --- a/pkg/kubelet/apis/podresources/client_test.go +++ b/pkg/kubelet/apis/podresources/client_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" fakeremote "k8s.io/cri-client/pkg/fake" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestGetClient(t *testing.T) { diff --git a/pkg/kubelet/apis/podresources/server_v1_test.go b/pkg/kubelet/apis/podresources/server_v1_test.go index 9d09eaf961c..83619e7e032 100644 --- a/pkg/kubelet/apis/podresources/server_v1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1_test.go @@ -31,10 +31,10 @@ import ( "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1" kubefeatures "k8s.io/kubernetes/pkg/features" podresourcetest "k8s.io/kubernetes/pkg/kubelet/apis/podresources/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestListPodResourcesV1(t *testing.T) { diff --git a/pkg/kubelet/apis/podresources/server_v1alpha1_test.go b/pkg/kubelet/apis/podresources/server_v1alpha1_test.go index fb3636e4c06..db47ad2b85a 100644 --- a/pkg/kubelet/apis/podresources/server_v1alpha1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1alpha1_test.go @@ -22,10 +22,10 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/ktesting" podresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1" "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" podresourcetest "k8s.io/kubernetes/pkg/kubelet/apis/podresources/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestListPodResourcesV1alpha1(t *testing.T) { diff --git a/pkg/kubelet/apis/pods/server_unit_test.go b/pkg/kubelet/apis/pods/server_unit_test.go index 29055493c61..24fba3b35d4 100644 --- a/pkg/kubelet/apis/pods/server_unit_test.go +++ b/pkg/kubelet/apis/pods/server_unit_test.go @@ -46,6 +46,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" compmetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" podsv1alpha1 "k8s.io/kubelet/pkg/apis/pods/v1alpha1" "k8s.io/kubernetes/pkg/api/legacyscheme" corefuzzer "k8s.io/kubernetes/pkg/apis/core/fuzzer" @@ -55,7 +56,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/metrics" kubepodtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" statustest "k8s.io/kubernetes/pkg/kubelet/status/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestStartEventLoop(t *testing.T) { diff --git a/pkg/kubelet/certificate/bootstrap/bootstrap_test.go b/pkg/kubelet/certificate/bootstrap/bootstrap_test.go index 259ab8cd63c..93e15e815b8 100644 --- a/pkg/kubelet/certificate/bootstrap/bootstrap_test.go +++ b/pkg/kubelet/certificate/bootstrap/bootstrap_test.go @@ -25,7 +25,7 @@ import ( "testing" utiltesting "k8s.io/client-go/util/testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "github.com/google/go-cmp/cmp" certificatesv1 "k8s.io/api/certificates/v1" diff --git a/pkg/kubelet/certificate/kubelet_test.go b/pkg/kubelet/certificate/kubelet_test.go index ec57798c2e8..9574fdeb48a 100644 --- a/pkg/kubelet/certificate/kubelet_test.go +++ b/pkg/kubelet/certificate/kubelet_test.go @@ -49,6 +49,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/util/cert" @@ -60,7 +61,6 @@ import ( "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/certificate/keyalgorithm" - "k8s.io/kubernetes/test/utils/client-go/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/certificate/transport_test.go b/pkg/kubelet/certificate/transport_test.go index d5cebaf793f..eeca6b2553f 100644 --- a/pkg/kubelet/certificate/transport_test.go +++ b/pkg/kubelet/certificate/transport_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/client-go/rest" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) var ( diff --git a/pkg/kubelet/client/kubelet_client_test.go b/pkg/kubelet/client/kubelet_client_test.go index 890dd98dd16..728bc42271f 100644 --- a/pkg/kubelet/client/kubelet_client_test.go +++ b/pkg/kubelet/client/kubelet_client_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/server/egressselector" - "k8s.io/kubernetes/test/utils/client-go/ktesting" + "k8s.io/client-go/ktesting" ) func kubeletTestCertHelper(valid bool) KubeletTLSConfig { diff --git a/pkg/kubelet/clustertrustbundle/clustertrustbundle_manager_test.go b/pkg/kubelet/clustertrustbundle/clustertrustbundle_manager_test.go index 2f6579cb09a..010828fa9b9 100644 --- a/pkg/kubelet/clustertrustbundle/clustertrustbundle_manager_test.go +++ b/pkg/kubelet/clustertrustbundle/clustertrustbundle_manager_test.go @@ -48,7 +48,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestBeforeSynced(t *testing.T) { diff --git a/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go b/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go index 14395d51759..e92e73f9d82 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_assignment_test.go @@ -21,8 +21,8 @@ import ( "sort" "testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/cpuset" ) diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go index b44dbaf1684..31456015f19 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go @@ -40,8 +40,8 @@ import ( "k8s.io/apimachinery/pkg/types" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" + "k8s.io/ktesting" + "k8s.io/ktesting/initoption" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" diff --git a/pkg/kubelet/cm/cpumanager/policy_none_test.go b/pkg/kubelet/cm/cpumanager/policy_none_test.go index 47006d1788e..d29a3442e3a 100644 --- a/pkg/kubelet/cm/cpumanager/policy_none_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_none_test.go @@ -19,7 +19,7 @@ package cpumanager import ( "testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" "k8s.io/kubernetes/pkg/kubelet/lifecycle" diff --git a/pkg/kubelet/cm/cpumanager/policy_options_test.go b/pkg/kubelet/cm/cpumanager/policy_options_test.go index aacd44770e5..50908d44e43 100644 --- a/pkg/kubelet/cm/cpumanager/policy_options_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_options_test.go @@ -22,10 +22,10 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" - "k8s.io/kubernetes/test/utils/ktesting" ) type optionAvailTest struct { diff --git a/pkg/kubelet/cm/cpumanager/policy_static_restore_test.go b/pkg/kubelet/cm/cpumanager/policy_static_restore_test.go index dbb469a2035..71424f537e9 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static_restore_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_static_restore_test.go @@ -31,13 +31,13 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" resourcehelper "k8s.io/component-helpers/resource" "k8s.io/klog/v2" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/cpuset" ) diff --git a/pkg/kubelet/cm/cpumanager/policy_static_test.go b/pkg/kubelet/cm/cpumanager/policy_static_test.go index 421b00c315f..6fcde10e72c 100644 --- a/pkg/kubelet/cm/cpumanager/policy_static_test.go +++ b/pkg/kubelet/cm/cpumanager/policy_static_test.go @@ -33,6 +33,8 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/testutil" "k8s.io/klog/v2" + "k8s.io/ktesting" + "k8s.io/ktesting/initoption" pkgfeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/admission" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" @@ -41,8 +43,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" "k8s.io/utils/cpuset" ) diff --git a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go index 729f5db7697..39067e08dad 100644 --- a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go +++ b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go @@ -30,12 +30,12 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" testutil "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state/testing" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/cpuset" ) diff --git a/pkg/kubelet/cm/cpumanager/topology/topology_test.go b/pkg/kubelet/cm/cpumanager/topology/topology_test.go index c95f12bc9e8..5c37b82a84d 100644 --- a/pkg/kubelet/cm/cpumanager/topology/topology_test.go +++ b/pkg/kubelet/cm/cpumanager/topology/topology_test.go @@ -23,7 +23,7 @@ import ( "github.com/google/go-cmp/cmp" cadvisorapi "github.com/google/cadvisor/lib/model" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "k8s.io/utils/cpuset" ) diff --git a/pkg/kubelet/cm/cpumanager/topology_hints_test.go b/pkg/kubelet/cm/cpumanager/topology_hints_test.go index e58a9d04240..bd1f54e687b 100644 --- a/pkg/kubelet/cm/cpumanager/topology_hints_test.go +++ b/pkg/kubelet/cm/cpumanager/topology_hints_test.go @@ -26,13 +26,13 @@ import ( "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/cpuset" ) diff --git a/pkg/kubelet/cm/devicemanager/endpoint_test.go b/pkg/kubelet/cm/devicemanager/endpoint_test.go index ecc52da3715..a4fc2233607 100644 --- a/pkg/kubelet/cm/devicemanager/endpoint_test.go +++ b/pkg/kubelet/cm/devicemanager/endpoint_test.go @@ -29,9 +29,9 @@ import ( "google.golang.org/protobuf/proto" "k8s.io/klog/v2" + "k8s.io/ktesting" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" plugin "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/plugin/v1beta1" - "k8s.io/kubernetes/test/utils/ktesting" ) // monitorCallback is the function called when a device's health state changes, diff --git a/pkg/kubelet/cm/devicemanager/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go index 0776c5632bd..54e9ad8cbc7 100644 --- a/pkg/kubelet/cm/devicemanager/manager_test.go +++ b/pkg/kubelet/cm/devicemanager/manager_test.go @@ -44,6 +44,8 @@ import ( "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" + "k8s.io/ktesting/initoption" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" watcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/features" @@ -58,8 +60,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/pluginmanager" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" ) const ( diff --git a/pkg/kubelet/cm/devicemanager/pod_devices_test.go b/pkg/kubelet/cm/devicemanager/pod_devices_test.go index 72d6dc609f8..7aaea2a6780 100644 --- a/pkg/kubelet/cm/devicemanager/pod_devices_test.go +++ b/pkg/kubelet/cm/devicemanager/pod_devices_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/ktesting" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" "k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/checkpoint" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestGetContainerDevices(t *testing.T) { diff --git a/pkg/kubelet/cm/devicemanager/topology_hints_test.go b/pkg/kubelet/cm/devicemanager/topology_hints_test.go index de5d343b6d2..977faa073dc 100644 --- a/pkg/kubelet/cm/devicemanager/topology_hints_test.go +++ b/pkg/kubelet/cm/devicemanager/topology_hints_test.go @@ -28,11 +28,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" + "k8s.io/ktesting" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) type mockAffinityStore struct { diff --git a/pkg/kubelet/cm/dra/claiminfo_test.go b/pkg/kubelet/cm/dra/claiminfo_test.go index 0833ea112ba..e0d194d1c41 100644 --- a/pkg/kubelet/cm/dra/claiminfo_test.go +++ b/pkg/kubelet/cm/dra/claiminfo_test.go @@ -33,9 +33,9 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" klogtesting "k8s.io/klog/v2/ktesting" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/dra/state" - "k8s.io/kubernetes/test/utils/ktesting" ) // ClaimInfo test cases diff --git a/pkg/kubelet/cm/dra/healthinfo_test.go b/pkg/kubelet/cm/dra/healthinfo_test.go index bb9cb365ad1..709bc005a8d 100644 --- a/pkg/kubelet/cm/dra/healthinfo_test.go +++ b/pkg/kubelet/cm/dra/healthinfo_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/cm/dra/state" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/cm/dra/manager_test.go b/pkg/kubelet/cm/dra/manager_test.go index 8b88670a49a..0b66328b4d9 100644 --- a/pkg/kubelet/cm/dra/manager_test.go +++ b/pkg/kubelet/cm/dra/manager_test.go @@ -53,12 +53,12 @@ import ( kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/utils/ptr" + "k8s.io/ktesting" drahealthv1 "k8s.io/kubelet/pkg/apis/dra-health/v1" drapb "k8s.io/kubelet/pkg/apis/dra/v1" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/dra/state" "k8s.io/kubernetes/pkg/kubelet/cm/resourceupdates" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/cm/dra/metrics_test.go b/pkg/kubelet/cm/dra/metrics_test.go index 808303330e3..cc7319c54f5 100644 --- a/pkg/kubelet/cm/dra/metrics_test.go +++ b/pkg/kubelet/cm/dra/metrics_test.go @@ -20,7 +20,7 @@ import ( "strings" "k8s.io/component-base/metrics/testutil" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func testClaimsInUseMetric(tCtx ktesting.TContext, claimInfoCache *claimInfoCache, expectedMetric string) { diff --git a/pkg/kubelet/cm/dra/plugin/dra_plugin_manager_test.go b/pkg/kubelet/cm/dra/plugin/dra_plugin_manager_test.go index 6d142e1f695..10131b1d091 100644 --- a/pkg/kubelet/cm/dra/plugin/dra_plugin_manager_test.go +++ b/pkg/kubelet/cm/dra/plugin/dra_plugin_manager_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/stretchr/testify/require" + "k8s.io/ktesting" drahealthv1 "k8s.io/kubelet/pkg/apis/dra-health/v1" drahealthv1alpha1 "k8s.io/kubelet/pkg/apis/dra-health/v1alpha1" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPickHealthService(t *testing.T) { diff --git a/pkg/kubelet/cm/dra/plugin/dra_plugin_test.go b/pkg/kubelet/cm/dra/plugin/dra_plugin_test.go index 5c71ca0ac47..d253136b88d 100644 --- a/pkg/kubelet/cm/dra/plugin/dra_plugin_test.go +++ b/pkg/kubelet/cm/dra/plugin/dra_plugin_test.go @@ -31,11 +31,11 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" + "k8s.io/ktesting" drahealthv1 "k8s.io/kubelet/pkg/apis/dra-health/v1" drahealthv1alpha1 "k8s.io/kubelet/pkg/apis/dra-health/v1alpha1" drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1" drapbv1beta1 "k8s.io/kubelet/pkg/apis/dra/v1beta1" - "k8s.io/kubernetes/test/utils/ktesting" grpccodes "google.golang.org/grpc/codes" grpcstatus "google.golang.org/grpc/status" diff --git a/pkg/kubelet/cm/dra/plugin/registration_test.go b/pkg/kubelet/cm/dra/plugin/registration_test.go index c1f7f60f75b..95e61ac501b 100644 --- a/pkg/kubelet/cm/dra/plugin/registration_test.go +++ b/pkg/kubelet/cm/dra/plugin/registration_test.go @@ -33,12 +33,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" cgotesting "k8s.io/client-go/testing" drapb "k8s.io/kubelet/pkg/apis/dra/v1beta1" timedworkers "k8s.io/kubernetes/pkg/controller/tainteviction" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/cm/memorymanager/memory_manager_test.go b/pkg/kubelet/cm/memorymanager/memory_manager_test.go index d9a064a7923..0e2c4d56b75 100644 --- a/pkg/kubelet/cm/memorymanager/memory_manager_test.go +++ b/pkg/kubelet/cm/memorymanager/memory_manager_test.go @@ -35,12 +35,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" "k8s.io/kubernetes/pkg/kubelet/cm/memorymanager/state" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/cm/memorymanager/policy_static_restore_test.go b/pkg/kubelet/cm/memorymanager/policy_static_restore_test.go index 038674dc5e1..e1b0a47e1e6 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static_restore_test.go +++ b/pkg/kubelet/cm/memorymanager/policy_static_restore_test.go @@ -27,12 +27,12 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" resourcehelper "k8s.io/component-helpers/resource" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) // For the scope of the test, any pod that has pod-level resources and the diff --git a/pkg/kubelet/cm/memorymanager/policy_static_test.go b/pkg/kubelet/cm/memorymanager/policy_static_test.go index 0fd1ff2c192..8dfd5dead15 100644 --- a/pkg/kubelet/cm/memorymanager/policy_static_test.go +++ b/pkg/kubelet/cm/memorymanager/policy_static_test.go @@ -35,6 +35,8 @@ import ( "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" + "k8s.io/ktesting/initoption" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/admission" "k8s.io/kubernetes/pkg/kubelet/cm/memorymanager/state" @@ -42,8 +44,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" ) const ( diff --git a/pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go index 1e94b40f1bd..60e08b69ac0 100644 --- a/pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go +++ b/pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go @@ -31,11 +31,11 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum" testutil "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) const testingCheckpoint = "memorymanager_checkpoint_test" diff --git a/pkg/kubelet/cm/topologymanager/fake_topology_manager_test.go b/pkg/kubelet/cm/topologymanager/fake_topology_manager_test.go index 6973a355e48..419cb314dd8 100644 --- a/pkg/kubelet/cm/topologymanager/fake_topology_manager_test.go +++ b/pkg/kubelet/cm/topologymanager/fake_topology_manager_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/api/core/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestNewFakeManager(t *testing.T) { diff --git a/pkg/kubelet/cm/topologymanager/policy_none_test.go b/pkg/kubelet/cm/topologymanager/policy_none_test.go index 8089d5fd90d..53b613bcc30 100644 --- a/pkg/kubelet/cm/topologymanager/policy_none_test.go +++ b/pkg/kubelet/cm/topologymanager/policy_none_test.go @@ -19,7 +19,7 @@ package topologymanager import ( "testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestPolicyNoneName(t *testing.T) { diff --git a/pkg/kubelet/cm/topologymanager/policy_options_test.go b/pkg/kubelet/cm/topologymanager/policy_options_test.go index 26c750fe419..b93ee8805b1 100644 --- a/pkg/kubelet/cm/topologymanager/policy_options_test.go +++ b/pkg/kubelet/cm/topologymanager/policy_options_test.go @@ -25,8 +25,8 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" ) var fancyBetaOption = "fancy-new-option" diff --git a/pkg/kubelet/cm/topologymanager/policy_test.go b/pkg/kubelet/cm/topologymanager/policy_test.go index ff8f5831224..aafdf268a98 100644 --- a/pkg/kubelet/cm/topologymanager/policy_test.go +++ b/pkg/kubelet/cm/topologymanager/policy_test.go @@ -21,9 +21,9 @@ import ( "testing" "k8s.io/api/core/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) type policyMergeTestCase struct { diff --git a/pkg/kubelet/cm/topologymanager/scope_container_test.go b/pkg/kubelet/cm/topologymanager/scope_container_test.go index 192a7bcfe14..e58ea8759e6 100644 --- a/pkg/kubelet/cm/topologymanager/scope_container_test.go +++ b/pkg/kubelet/cm/topologymanager/scope_container_test.go @@ -21,8 +21,8 @@ import ( "testing" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestContainerCalculateAffinity(t *testing.T) { diff --git a/pkg/kubelet/cm/topologymanager/scope_pod_test.go b/pkg/kubelet/cm/topologymanager/scope_pod_test.go index e18d1696e14..07f94d1dd85 100644 --- a/pkg/kubelet/cm/topologymanager/scope_pod_test.go +++ b/pkg/kubelet/cm/topologymanager/scope_pod_test.go @@ -21,8 +21,8 @@ import ( "testing" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPodCalculateAffinity(t *testing.T) { diff --git a/pkg/kubelet/cm/topologymanager/scope_test.go b/pkg/kubelet/cm/topologymanager/scope_test.go index 27eaf374d76..26535f5697c 100644 --- a/pkg/kubelet/cm/topologymanager/scope_test.go +++ b/pkg/kubelet/cm/topologymanager/scope_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestGetAffinity(t *testing.T) { diff --git a/pkg/kubelet/cm/topologymanager/topology_manager_test.go b/pkg/kubelet/cm/topologymanager/topology_manager_test.go index 4b4ad6bd7ae..df76f5084b6 100644 --- a/pkg/kubelet/cm/topologymanager/topology_manager_test.go +++ b/pkg/kubelet/cm/topologymanager/topology_manager_test.go @@ -31,10 +31,10 @@ import ( cadvisorapi "github.com/google/cadvisor/lib/model" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) func NewTestBitMask(sockets ...int) bitmask.BitMask { diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index e1e506cbae7..c4359db9542 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" + "k8s.io/ktesting" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/securitycontext" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/config/file_linux_test.go b/pkg/kubelet/config/file_linux_test.go index 2da167f8d17..f600a963a34 100644 --- a/pkg/kubelet/config/file_linux_test.go +++ b/pkg/kubelet/config/file_linux_test.go @@ -34,12 +34,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" clientscheme "k8s.io/client-go/kubernetes/scheme" + "k8s.io/ktesting" api "k8s.io/kubernetes/pkg/apis/core" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/apis/core/validation" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/securitycontext" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestExtractFromNonExistentFile(t *testing.T) { diff --git a/pkg/kubelet/config/file_test.go b/pkg/kubelet/config/file_test.go index 2cad9e15ea0..b12e2823ac2 100644 --- a/pkg/kubelet/config/file_test.go +++ b/pkg/kubelet/config/file_test.go @@ -23,7 +23,7 @@ import ( "time" apiequality "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestExtractFromBadDataFile(t *testing.T) { diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index ad867a26446..4bbc8867acf 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -30,11 +30,11 @@ import ( "k8s.io/apimachinery/pkg/types" clientscheme "k8s.io/client-go/kubernetes/scheme" utiltesting "k8s.io/client-go/util/testing" + "k8s.io/ktesting" api "k8s.io/kubernetes/pkg/apis/core" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/apis/core/validation" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestURLErrorNotExistNoUpdate(t *testing.T) { diff --git a/pkg/kubelet/config/mux_test.go b/pkg/kubelet/config/mux_test.go index 31b06015d9c..a0e7623a602 100644 --- a/pkg/kubelet/config/mux_test.go +++ b/pkg/kubelet/config/mux_test.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestConfigurationChannels(t *testing.T) { diff --git a/pkg/kubelet/container/cache_test.go b/pkg/kubelet/container/cache_test.go index ccef158d55d..d124963f851 100644 --- a/pkg/kubelet/container/cache_test.go +++ b/pkg/kubelet/container/cache_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func newTestCache() *cache { diff --git a/pkg/kubelet/container/helpers_test.go b/pkg/kubelet/container/helpers_test.go index 4173e2f54c7..b5d01a10d66 100644 --- a/pkg/kubelet/container/helpers_test.go +++ b/pkg/kubelet/container/helpers_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/tools/record" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/container/runtime_cache_test.go b/pkg/kubelet/container/runtime_cache_test.go index a7a0e3146f5..263ed6c6842 100644 --- a/pkg/kubelet/container/runtime_cache_test.go +++ b/pkg/kubelet/container/runtime_cache_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" + "k8s.io/ktesting" . "k8s.io/kubernetes/pkg/kubelet/container" ctest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func comparePods(t *testing.T, expected []*ctest.FakePod, actual []*Pod) { diff --git a/pkg/kubelet/container/runtime_test.go b/pkg/kubelet/container/runtime_test.go index d896d8a3227..c95a8ce68ad 100644 --- a/pkg/kubelet/container/runtime_test.go +++ b/pkg/kubelet/container/runtime_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" critesting "k8s.io/cri-api/pkg/apis/testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestParseContainerID(t *testing.T) { diff --git a/pkg/kubelet/eviction/eviction_manager_test.go b/pkg/kubelet/eviction/eviction_manager_test.go index f5b67700c3f..b2520a90248 100644 --- a/pkg/kubelet/eviction/eviction_manager_test.go +++ b/pkg/kubelet/eviction/eviction_manager_test.go @@ -34,6 +34,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubeapi "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/scheduling" @@ -41,7 +42,6 @@ import ( evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" "k8s.io/kubernetes/pkg/kubelet/lifecycle" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/eviction/memory_threshold_notifier_test.go b/pkg/kubelet/eviction/memory_threshold_notifier_test.go index 0ceae0957b9..f13f5d5847a 100644 --- a/pkg/kubelet/eviction/memory_threshold_notifier_test.go +++ b/pkg/kubelet/eviction/memory_threshold_notifier_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/resource" klogtesting "k8s.io/klog/v2/ktesting" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" - "k8s.io/kubernetes/test/utils/ktesting" ) const testCgroupPath = "/sys/fs/cgroups/memory" diff --git a/pkg/kubelet/images/image_gc_manager_test.go b/pkg/kubelet/images/image_gc_manager_test.go index 88da183a5c0..fce3d3498d5 100644 --- a/pkg/kubelet/images/image_gc_manager_test.go +++ b/pkg/kubelet/images/image_gc_manager_test.go @@ -31,13 +31,13 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" stats "k8s.io/kubernetes/pkg/kubelet/server/stats" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/images/image_manager_test.go b/pkg/kubelet/images/image_manager_test.go index a18d89f5e17..cbd9d7f187e 100644 --- a/pkg/kubelet/images/image_manager_test.go +++ b/pkg/kubelet/images/image_manager_test.go @@ -39,6 +39,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" crierrors "k8s.io/cri-api/pkg/errors" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/controller/testutil" "k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/features" @@ -46,7 +47,6 @@ import ( . "k8s.io/kubernetes/pkg/kubelet/container" ctest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/images/pullmanager" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/images/metrics_test.go b/pkg/kubelet/images/metrics_test.go index 8625dc0774c..6a97a987bd2 100644 --- a/pkg/kubelet/images/metrics_test.go +++ b/pkg/kubelet/images/metrics_test.go @@ -25,7 +25,7 @@ import ( legacyregistry "k8s.io/component-base/metrics/legacyregistry" metricstestutil "k8s.io/component-base/metrics/testutil" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestEnsureImageRequestsMetrics(t *testing.T) { diff --git a/pkg/kubelet/images/pullmanager/benchmarks_test.go b/pkg/kubelet/images/pullmanager/benchmarks_test.go index 8a54fc1c951..2b77ae3e257 100644 --- a/pkg/kubelet/images/pullmanager/benchmarks_test.go +++ b/pkg/kubelet/images/pullmanager/benchmarks_test.go @@ -24,8 +24,8 @@ import ( "github.com/google/uuid" "k8s.io/apimachinery/pkg/util/rand" + "k8s.io/ktesting" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" - "k8s.io/kubernetes/test/utils/ktesting" ) type namedAccessor struct { diff --git a/pkg/kubelet/images/pullmanager/fs_pullrecords_test.go b/pkg/kubelet/images/pullmanager/fs_pullrecords_test.go index 1709613d5b3..06971aa5894 100644 --- a/pkg/kubelet/images/pullmanager/fs_pullrecords_test.go +++ b/pkg/kubelet/images/pullmanager/fs_pullrecords_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestNewFSPullRecordsAccessor(t *testing.T) { diff --git a/pkg/kubelet/images/pullmanager/image_pull_manager_test.go b/pkg/kubelet/images/pullmanager/image_pull_manager_test.go index d10432a6a83..2e882c4962c 100644 --- a/pkg/kubelet/images/pullmanager/image_pull_manager_test.go +++ b/pkg/kubelet/images/pullmanager/image_pull_manager_test.go @@ -30,10 +30,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/container" ctesting "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func Test_pulledRecordMergeNewCreds(t *testing.T) { diff --git a/pkg/kubelet/images/pullmanager/mem_pullrecords_test.go b/pkg/kubelet/images/pullmanager/mem_pullrecords_test.go index 9ca68180a21..f6fc4cf1095 100644 --- a/pkg/kubelet/images/pullmanager/mem_pullrecords_test.go +++ b/pkg/kubelet/images/pullmanager/mem_pullrecords_test.go @@ -26,8 +26,8 @@ import ( "testing" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" - "k8s.io/kubernetes/test/utils/ktesting" ) type testPullRecordsAccessor struct { diff --git a/pkg/kubelet/images/pullmanager/metrics_test.go b/pkg/kubelet/images/pullmanager/metrics_test.go index 3524bddf7dd..24f204b0af4 100644 --- a/pkg/kubelet/images/pullmanager/metrics_test.go +++ b/pkg/kubelet/images/pullmanager/metrics_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/component-base/metrics/legacyregistry" metricstestutil "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestFSPullRecordsMetrics(t *testing.T) { diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 2f2b1d04f40..a0f9beb028d 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -55,6 +55,7 @@ import ( core "k8s.io/client-go/testing" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/version" + "k8s.io/ktesting" kubeletapis "k8s.io/kubelet/pkg/apis" "k8s.io/kubernetes/pkg/features" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" @@ -65,7 +66,6 @@ import ( kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volumemanager" taintutil "k8s.io/kubernetes/pkg/util/taints" "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" ) diff --git a/pkg/kubelet/kubelet_nodecache_test.go b/pkg/kubelet/kubelet_nodecache_test.go index 9a161896386..12978c3af81 100644 --- a/pkg/kubelet/kubelet_nodecache_test.go +++ b/pkg/kubelet/kubelet_nodecache_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestGetCachedNode(t *testing.T) { diff --git a/pkg/kubelet/kubelet_pod_level_resources_status_test.go b/pkg/kubelet/kubelet_pod_level_resources_status_test.go index 5f40925291c..ce1eda54ae0 100644 --- a/pkg/kubelet/kubelet_pod_level_resources_status_test.go +++ b/pkg/kubelet/kubelet_pod_level_resources_status_test.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" cm "k8s.io/kubernetes/pkg/kubelet/cm" cmtesting "k8s.io/kubernetes/pkg/kubelet/cm/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestConvertToAPIPodLevelResourcesStatus(t *testing.T) { diff --git a/pkg/kubelet/kubelet_pods_linux_test.go b/pkg/kubelet/kubelet_pods_linux_test.go index 379ae3b4e3f..1ca8fb9836b 100644 --- a/pkg/kubelet/kubelet_pods_linux_test.go +++ b/pkg/kubelet/kubelet_pods_linux_test.go @@ -31,6 +31,7 @@ import ( "k8s.io/utils/ptr" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -38,7 +39,6 @@ import ( volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestMakeMounts(t *testing.T) { diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index ddd4b58695e..1c0df2e6ac6 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -53,6 +53,7 @@ import ( runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/cri-streaming/pkg/streaming/portforward" "k8s.io/cri-streaming/pkg/streaming/remotecommand" + "k8s.io/ktesting" _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm" @@ -67,7 +68,6 @@ import ( "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kubelet_pods_windows_test.go b/pkg/kubelet/kubelet_pods_windows_test.go index 8c964d21cdd..347f8857749 100644 --- a/pkg/kubelet/kubelet_pods_windows_test.go +++ b/pkg/kubelet/kubelet_pods_windows_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestMakeMountsWindows(t *testing.T) { diff --git a/pkg/kubelet/kubelet_resources_test.go b/pkg/kubelet/kubelet_resources_test.go index 11c69f79390..27e2d80762e 100644 --- a/pkg/kubelet/kubelet_resources_test.go +++ b/pkg/kubelet/kubelet_resources_test.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" kubefeatures "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPodResourceLimitsDefaulting(t *testing.T) { diff --git a/pkg/kubelet/kubelet_server_journal_test.go b/pkg/kubelet/kubelet_server_journal_test.go index da98df22815..a22154748be 100644 --- a/pkg/kubelet/kubelet_server_journal_test.go +++ b/pkg/kubelet/kubelet_server_journal_test.go @@ -32,7 +32,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 3cb8b49d191..d80ff85a863 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -70,6 +70,7 @@ import ( remote "k8s.io/cri-client/pkg" fakeremote "k8s.io/cri-client/pkg/fake" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/allocation" "k8s.io/kubernetes/pkg/kubelet/allocation/state" @@ -121,7 +122,6 @@ import ( "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/kubelet_volumes_test.go b/pkg/kubelet/kubelet_volumes_test.go index 60f573d648f..b3af0cd9f74 100644 --- a/pkg/kubelet/kubelet_volumes_test.go +++ b/pkg/kubelet/kubelet_volumes_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" core "k8s.io/client-go/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestListVolumesForPod(t *testing.T) { diff --git a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go index 57e4d024529..d1e69fac48d 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go +++ b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go @@ -25,12 +25,12 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/ktesting" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" utiltest "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/test" utilfs "k8s.io/kubernetes/pkg/util/filesystem" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/helpers_linux_test.go b/pkg/kubelet/kuberuntime/helpers_linux_test.go index 31c2d905932..19d2cb51b0d 100644 --- a/pkg/kubelet/kuberuntime/helpers_linux_test.go +++ b/pkg/kubelet/kuberuntime/helpers_linux_test.go @@ -26,8 +26,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/cm" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/helpers_test.go b/pkg/kubelet/kuberuntime/helpers_test.go index 0f9e7f82680..8730708121a 100644 --- a/pkg/kubelet/kuberuntime/helpers_test.go +++ b/pkg/kubelet/kuberuntime/helpers_test.go @@ -34,10 +34,10 @@ import ( runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" runtimetesting "k8s.io/cri-api/pkg/apis/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go index 2c6fba77808..c07e84b6353 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go @@ -39,13 +39,13 @@ import ( "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/features" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/cpuset" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go index 33d2ffc9996..c74c7636f50 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go @@ -38,7 +38,7 @@ import ( v1 "k8s.io/api/core/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" apitest "k8s.io/cri-api/pkg/apis/testing" kubelettypes "k8s.io/kubelet/pkg/types" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_windows_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_windows_test.go index 3ecdf9fd1dc..40a23d99de7 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_windows_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_windows_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/winstats" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestApplyPlatformSpecificContainerConfig(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go index a531d7cd72d..9d1dae732bc 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go @@ -26,9 +26,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestSandboxGC(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/kuberuntime_image_test.go b/pkg/kubelet/kuberuntime/kuberuntime_image_test.go index a12456206f7..f95e6adbeb3 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_image_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_image_test.go @@ -29,11 +29,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/flowcontrol" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/credentialprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/images" imagepullmanager "k8s.io/kubernetes/pkg/kubelet/images/pullmanager" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index a3988d1fcfe..68537828191 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -54,6 +54,7 @@ import ( apitest "k8s.io/cri-api/pkg/apis/testing" crierror "k8s.io/cri-api/pkg/errors" "k8s.io/klog/v2" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/features" @@ -64,7 +65,6 @@ import ( imagetypes "k8s.io/kubernetes/pkg/kubelet/images" "k8s.io/kubernetes/pkg/kubelet/metrics" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_linux_test.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_linux_test.go index 3c1cedfacab..bdcde65f215 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_linux_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_linux_test.go @@ -29,8 +29,8 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go index af499b06c08..afdb0228a4c 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go @@ -27,10 +27,10 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/runtimeclass" rctest "k8s.io/kubernetes/pkg/kubelet/runtimeclass/testing" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/kuberuntime/labels_test.go b/pkg/kubelet/kuberuntime/labels_test.go index 03231ebb483..a051895a091 100644 --- a/pkg/kubelet/kuberuntime/labels_test.go +++ b/pkg/kubelet/kuberuntime/labels_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestContainerLabels(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/security_context_others_test.go b/pkg/kubelet/kuberuntime/security_context_others_test.go index 20bb94edc79..6d964d2457f 100644 --- a/pkg/kubelet/kuberuntime/security_context_others_test.go +++ b/pkg/kubelet/kuberuntime/security_context_others_test.go @@ -26,7 +26,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestVerifyRunAsNonRoot(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/security_context_windows_test.go b/pkg/kubelet/kuberuntime/security_context_windows_test.go index 3e8dd6ea7ad..2634e81bad4 100644 --- a/pkg/kubelet/kuberuntime/security_context_windows_test.go +++ b/pkg/kubelet/kuberuntime/security_context_windows_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestVerifyRunAsNonRoot(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/util/util_test.go b/pkg/kubelet/kuberuntime/util/util_test.go index c58e3e77efe..66e91308f58 100644 --- a/pkg/kubelet/kuberuntime/util/util_test.go +++ b/pkg/kubelet/kuberuntime/util/util_test.go @@ -26,11 +26,11 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPodSandboxChanged(t *testing.T) { diff --git a/pkg/kubelet/lifecycle/handlers_test.go b/pkg/kubelet/lifecycle/handlers_test.go index 39b001b85b9..4beea6899c9 100644 --- a/pkg/kubelet/lifecycle/handlers_test.go +++ b/pkg/kubelet/lifecycle/handlers_test.go @@ -42,10 +42,10 @@ import ( "k8s.io/component-base/metrics/testutil" ndf "k8s.io/component-helpers/nodedeclaredfeatures" ndftesting "k8s.io/component-helpers/nodedeclaredfeatures/testing" + "k8s.io/ktesting" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/test/utils/ktesting" ) type fakeContainerCommandRunner struct { diff --git a/pkg/kubelet/lifecycle/predicate_test.go b/pkg/kubelet/lifecycle/predicate_test.go index 1d1c719d476..b581864815e 100644 --- a/pkg/kubelet/lifecycle/predicate_test.go +++ b/pkg/kubelet/lifecycle/predicate_test.go @@ -28,6 +28,7 @@ import ( utilversion "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/types" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/tainttoleration" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/logs/container_log_manager_test.go b/pkg/kubelet/logs/container_log_manager_test.go index dbb69b828b0..fb68c89626f 100644 --- a/pkg/kubelet/logs/container_log_manager_test.go +++ b/pkg/kubelet/logs/container_log_manager_test.go @@ -30,8 +30,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/test/utils/ktesting" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" critest "k8s.io/cri-api/pkg/apis/testing" diff --git a/pkg/kubelet/metrics/cri/instrumented_services_test.go b/pkg/kubelet/metrics/cri/instrumented_services_test.go index 4ecf6884c12..f820a244f63 100644 --- a/pkg/kubelet/metrics/cri/instrumented_services_test.go +++ b/pkg/kubelet/metrics/cri/instrumented_services_test.go @@ -28,8 +28,8 @@ import ( compbasemetrics "k8s.io/component-base/metrics" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" critesting "k8s.io/cri-api/pkg/apis/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestRecordOperation(t *testing.T) { diff --git a/pkg/kubelet/network/dns/dns_test.go b/pkg/kubelet/network/dns/dns_test.go index cdc5efb43cf..c7ea16836b0 100644 --- a/pkg/kubelet/network/dns/dns_test.go +++ b/pkg/kubelet/network/dns/dns_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/client-go/tools/record" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/apis/core/validation" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" "github.com/stretchr/testify/assert" diff --git a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux_test.go b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux_test.go index f26269b3dad..d4800226514 100644 --- a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux_test.go +++ b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_linux_test.go @@ -40,13 +40,13 @@ import ( "k8s.io/klog/v2" klogtesting "k8s.io/klog/v2/ktesting" _ "k8s.io/klog/v2/ktesting/init" // activate ktesting command line flags + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/apis/scheduling" pkgfeatures "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/eviction" "k8s.io/kubernetes/pkg/kubelet/nodeshutdown/systemd" "k8s.io/kubernetes/pkg/kubelet/volumemanager" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_windows_test.go b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_windows_test.go index 8fe13354232..aa7c23c96f9 100644 --- a/pkg/kubelet/nodeshutdown/nodeshutdown_manager_windows_test.go +++ b/pkg/kubelet/nodeshutdown/nodeshutdown_manager_windows_test.go @@ -36,11 +36,11 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2/ktesting" _ "k8s.io/klog/v2/ktesting/init" // activate ktesting command line flags + testutilsktesting "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/eviction" "k8s.io/kubernetes/pkg/kubelet/volumemanager" - testutilsktesting "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/nodestatus/setters_test.go b/pkg/kubelet/nodestatus/setters_test.go index 61b991fb633..7a40da9111c 100644 --- a/pkg/kubelet/nodestatus/setters_test.go +++ b/pkg/kubelet/nodestatus/setters_test.go @@ -41,13 +41,13 @@ import ( "k8s.io/component-base/featuregate" "k8s.io/component-base/version" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/oom/oom_watcher_linux_test.go b/pkg/kubelet/oom/oom_watcher_linux_test.go index 5082a47250e..6ba8c43c78a 100644 --- a/pkg/kubelet/oom/oom_watcher_linux_test.go +++ b/pkg/kubelet/oom/oom_watcher_linux_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" "k8s.io/kubernetes/third_party/forked/cadvisor/oomparser" "github.com/stretchr/testify/assert" diff --git a/pkg/kubelet/pleg/generic_test.go b/pkg/kubelet/pleg/generic_test.go index 34804a87a24..d2e33369e0e 100644 --- a/pkg/kubelet/pleg/generic_test.go +++ b/pkg/kubelet/pleg/generic_test.go @@ -36,11 +36,11 @@ import ( "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/pluginmanager/cache/actual_state_of_world_test.go b/pkg/kubelet/pluginmanager/cache/actual_state_of_world_test.go index b72e1041a3c..8ceb87af734 100644 --- a/pkg/kubelet/pluginmanager/cache/actual_state_of_world_test.go +++ b/pkg/kubelet/pluginmanager/cache/actual_state_of_world_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // Calls AddPlugin() to add a plugin diff --git a/pkg/kubelet/pluginmanager/cache/desired_state_of_world_test.go b/pkg/kubelet/pluginmanager/cache/desired_state_of_world_test.go index f6a302ae6dd..687462c941c 100644 --- a/pkg/kubelet/pluginmanager/cache/desired_state_of_world_test.go +++ b/pkg/kubelet/pluginmanager/cache/desired_state_of_world_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // Calls AddOrUpdatePlugin() to add a plugin diff --git a/pkg/kubelet/pluginmanager/metrics/metrics_test.go b/pkg/kubelet/pluginmanager/metrics/metrics_test.go index 751e9a81cd4..4567350d697 100644 --- a/pkg/kubelet/pluginmanager/metrics/metrics_test.go +++ b/pkg/kubelet/pluginmanager/metrics/metrics_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestMetricCollection(t *testing.T) { diff --git a/pkg/kubelet/pluginmanager/operationexecutor/operation_executor_test.go b/pkg/kubelet/pluginmanager/operationexecutor/operation_executor_test.go index 24b6550d945..60cdc6ff8a3 100644 --- a/pkg/kubelet/pluginmanager/operationexecutor/operation_executor_test.go +++ b/pkg/kubelet/pluginmanager/operationexecutor/operation_executor_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/uuid" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/pluginmanager/plugin_manager_test.go b/pkg/kubelet/pluginmanager/plugin_manager_test.go index 8b2487909f1..45ed992ff94 100644 --- a/pkg/kubelet/pluginmanager/plugin_manager_test.go +++ b/pkg/kubelet/pluginmanager/plugin_manager_test.go @@ -33,9 +33,9 @@ import ( "k8s.io/client-go/tools/record" registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher" - "k8s.io/kubernetes/test/utils/ktesting" ) var ( diff --git a/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go b/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go index 072fdbfcfca..ec0e511db86 100644 --- a/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go +++ b/pkg/kubelet/pluginmanager/pluginwatcher/plugin_watcher_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" + "k8s.io/ktesting" registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" - "k8s.io/kubernetes/test/utils/ktesting" ) var ( diff --git a/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go b/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go index 22c6b5190fc..51914487052 100644 --- a/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go +++ b/pkg/kubelet/pluginmanager/reconciler/reconciler_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/record" + "k8s.io/ktesting" registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/operationexecutor" "k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/pod/mirror_client_test.go b/pkg/kubelet/pod/mirror_client_test.go index 7e58c6b0633..942e5ff26ed 100644 --- a/pkg/kubelet/pod/mirror_client_test.go +++ b/pkg/kubelet/pod/mirror_client_test.go @@ -26,9 +26,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/fake" + "k8s.io/ktesting" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/pod_container_deletor_test.go b/pkg/kubelet/pod_container_deletor_test.go index 4f4ce4cbd14..665793b9199 100644 --- a/pkg/kubelet/pod_container_deletor_test.go +++ b/pkg/kubelet/pod_container_deletor_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + "k8s.io/ktesting" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestGetContainersToDeleteInPodWithFilter(t *testing.T) { diff --git a/pkg/kubelet/pod_workers_test.go b/pkg/kubelet/pod_workers_test.go index 1ea8182922d..00eaec96c59 100644 --- a/pkg/kubelet/pod_workers_test.go +++ b/pkg/kubelet/pod_workers_test.go @@ -35,12 +35,12 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/record" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/allocation" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/queue" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" clocktesting "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/podcertificate/podcertificatemanager_test.go b/pkg/kubelet/podcertificate/podcertificatemanager_test.go index 32b1d2b2854..ec482e83458 100644 --- a/pkg/kubelet/podcertificate/podcertificatemanager_test.go +++ b/pkg/kubelet/podcertificate/podcertificatemanager_test.go @@ -42,8 +42,8 @@ import ( corelistersv1 "k8s.io/client-go/listers/core/v1" k8stesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" "k8s.io/kubernetes/test/utils/hermeticpodcertificatesigner" - "k8s.io/kubernetes/test/utils/ktesting" testclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/preemption/preemption_test.go b/pkg/kubelet/preemption/preemption_test.go index ec9be26a1f2..3a252fda9bf 100644 --- a/pkg/kubelet/preemption/preemption_test.go +++ b/pkg/kubelet/preemption/preemption_test.go @@ -26,11 +26,11 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" kubeapi "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/scheduling" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/prober/prober_manager_test.go b/pkg/kubelet/prober/prober_manager_test.go index cceb06f4fe8..445c768d195 100644 --- a/pkg/kubelet/prober/prober_manager_test.go +++ b/pkg/kubelet/prober/prober_manager_test.go @@ -33,11 +33,11 @@ import ( "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/probe" - "k8s.io/kubernetes/test/utils/ktesting" ) func init() { diff --git a/pkg/kubelet/prober/prober_test.go b/pkg/kubelet/prober/prober_test.go index cc8e70fcf6c..e2baea15571 100644 --- a/pkg/kubelet/prober/prober_test.go +++ b/pkg/kubelet/prober/prober_test.go @@ -33,6 +33,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/tools/record" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -41,7 +42,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/util/ioutils" "k8s.io/kubernetes/pkg/probe" execprobe "k8s.io/kubernetes/pkg/probe/exec" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestGetURLParts(t *testing.T) { diff --git a/pkg/kubelet/prober/scale_test.go b/pkg/kubelet/prober/scale_test.go index e989e878381..b4dfb36df89 100644 --- a/pkg/kubelet/prober/scale_test.go +++ b/pkg/kubelet/prober/scale_test.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/record" + "k8s.io/ktesting" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/kubelet/status" statustest "k8s.io/kubernetes/pkg/kubelet/status/testing" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index b3e9af0270c..f01429193ef 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -28,6 +28,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/kubernetes/fake" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" @@ -36,7 +37,6 @@ import ( statustest "k8s.io/kubernetes/pkg/kubelet/status/testing" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/probe" - "k8s.io/kubernetes/test/utils/ktesting" ) func init() { diff --git a/pkg/kubelet/server/auth_test.go b/pkg/kubelet/server/auth_test.go index dcb5e7d0a96..9039b6eba42 100644 --- a/pkg/kubelet/server/auth_test.go +++ b/pkg/kubelet/server/auth_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestIsSubPath(t *testing.T) { diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 5f0fbc77fdb..c16de181dbd 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -59,9 +59,9 @@ import ( "k8s.io/client-go/tools/record" remotecommand "k8s.io/client-go/tools/remotecommand" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/streaming/pkg/httpstream" "k8s.io/streaming/pkg/httpstream/spdy" diff --git a/pkg/kubelet/server/server_websocket_test.go b/pkg/kubelet/server/server_websocket_test.go index 800d469463d..aa3b90838de 100644 --- a/pkg/kubelet/server/server_websocket_test.go +++ b/pkg/kubelet/server/server_websocket_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/cri-streaming/pkg/streaming/portforward" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) const ( diff --git a/pkg/kubelet/server/stats/volume_stat_calculator_test.go b/pkg/kubelet/server/stats/volume_stat_calculator_test.go index a57173c8a11..72e5ba46c0b 100644 --- a/pkg/kubelet/server/stats/volume_stat_calculator_test.go +++ b/pkg/kubelet/server/stats/volume_stat_calculator_test.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" + "k8s.io/ktesting" kubestats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/stats/cadvisor_stats_provider_test.go b/pkg/kubelet/stats/cadvisor_stats_provider_test.go index a8f56bf380b..18ef50cb357 100644 --- a/pkg/kubelet/stats/cadvisor_stats_provider_test.go +++ b/pkg/kubelet/stats/cadvisor_stats_provider_test.go @@ -31,6 +31,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubelettypes "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/features" @@ -42,7 +43,6 @@ import ( serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats" statustest "k8s.io/kubernetes/pkg/kubelet/status/testing" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestFilterTerminatedContainerInfoAndAssembleByPodCgroupKey(t *testing.T) { diff --git a/pkg/kubelet/stats/cri_stats_provider_test.go b/pkg/kubelet/stats/cri_stats_provider_test.go index 741d00763a3..dce9faf5f3d 100644 --- a/pkg/kubelet/stats/cri_stats_provider_test.go +++ b/pkg/kubelet/stats/cri_stats_provider_test.go @@ -38,6 +38,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" critest "k8s.io/cri-api/pkg/apis/testing" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubelettypes "k8s.io/kubelet/pkg/types" "k8s.io/kubernetes/pkg/features" @@ -49,7 +50,6 @@ import ( kubepodtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/stats/cri_stats_provider_windows_test.go b/pkg/kubelet/stats/cri_stats_provider_windows_test.go index 0379cebad42..602f6095744 100644 --- a/pkg/kubelet/stats/cri_stats_provider_windows_test.go +++ b/pkg/kubelet/stats/cri_stats_provider_windows_test.go @@ -28,11 +28,11 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" kubecontainertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/kuberuntime" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/stats/helper_test.go b/pkg/kubelet/stats/helper_test.go index e8e62f54cab..ca59eee9feb 100644 --- a/pkg/kubelet/stats/helper_test.go +++ b/pkg/kubelet/stats/helper_test.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/stats/provider_test.go b/pkg/kubelet/stats/provider_test.go index fa83f419b28..50462fe2977 100644 --- a/pkg/kubelet/stats/provider_test.go +++ b/pkg/kubelet/stats/provider_test.go @@ -33,6 +33,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/ktesting" statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/features" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" @@ -40,7 +41,6 @@ import ( kubepodtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/sysctl/allowlist_test.go b/pkg/kubelet/sysctl/allowlist_test.go index 4d10b195047..38fbe80fa83 100644 --- a/pkg/kubelet/sysctl/allowlist_test.go +++ b/pkg/kubelet/sysctl/allowlist_test.go @@ -22,8 +22,8 @@ import ( "testing" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestNewAllowlist(t *testing.T) { diff --git a/pkg/kubelet/sysctl/safe_sysctls_test.go b/pkg/kubelet/sysctl/safe_sysctls_test.go index 30607b6feee..25468caee24 100644 --- a/pkg/kubelet/sysctl/safe_sysctls_test.go +++ b/pkg/kubelet/sysctl/safe_sysctls_test.go @@ -22,7 +22,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/util/version" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func Test_getSafeSysctlAllowlist(t *testing.T) { diff --git a/pkg/kubelet/token/token_manager_test.go b/pkg/kubelet/token/token_manager_test.go index 8292b376792..8fa64291972 100644 --- a/pkg/kubelet/token/token_manager_test.go +++ b/pkg/kubelet/token/token_manager_test.go @@ -24,7 +24,7 @@ import ( authenticationv1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/userns/userns_manager_disabled_test.go b/pkg/kubelet/userns/userns_manager_disabled_test.go index 73c2b015b2f..4e422479527 100644 --- a/pkg/kubelet/userns/userns_manager_disabled_test.go +++ b/pkg/kubelet/userns/userns_manager_disabled_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" ) // Test all public methods behave ok when the feature gate is disabled. diff --git a/pkg/kubelet/userns/userns_manager_switch_test.go b/pkg/kubelet/userns/userns_manager_switch_test.go index ee4634733b2..28695d9e79e 100644 --- a/pkg/kubelet/userns/userns_manager_switch_test.go +++ b/pkg/kubelet/userns/userns_manager_switch_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestMakeUserNsManagerSwitch(t *testing.T) { diff --git a/pkg/kubelet/userns/userns_manager_test.go b/pkg/kubelet/userns/userns_manager_test.go index f6a70022db3..1fc15a10dcb 100644 --- a/pkg/kubelet/userns/userns_manager_test.go +++ b/pkg/kubelet/userns/userns_manager_test.go @@ -33,9 +33,9 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" "k8s.io/klog/v2" + "k8s.io/ktesting" pkgfeatures "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/kubelet/util/boottime_util_darwin_test.go b/pkg/kubelet/util/boottime_util_darwin_test.go index d6b44631cc6..811efdcb604 100644 --- a/pkg/kubelet/util/boottime_util_darwin_test.go +++ b/pkg/kubelet/util/boottime_util_darwin_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestGetBootTime(t *testing.T) { diff --git a/pkg/kubelet/util/boottime_util_freebsd_test.go b/pkg/kubelet/util/boottime_util_freebsd_test.go index b44a2436291..0515357bba8 100644 --- a/pkg/kubelet/util/boottime_util_freebsd_test.go +++ b/pkg/kubelet/util/boottime_util_freebsd_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestGetBootTime(t *testing.T) { diff --git a/pkg/kubelet/util/boottime_util_linux_test.go b/pkg/kubelet/util/boottime_util_linux_test.go index 232b3dbf486..03e0cb940f4 100644 --- a/pkg/kubelet/util/boottime_util_linux_test.go +++ b/pkg/kubelet/util/boottime_util_linux_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestGetBootTime(t *testing.T) { diff --git a/pkg/kubelet/util/manager/cache_based_manager_test.go b/pkg/kubelet/util/manager/cache_based_manager_test.go index 286b4ecbd29..ca066b83be5 100644 --- a/pkg/kubelet/util/manager/cache_based_manager_test.go +++ b/pkg/kubelet/util/manager/cache_based_manager_test.go @@ -36,8 +36,8 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "k8s.io/ktesting" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" testingclock "k8s.io/utils/clock/testing" diff --git a/pkg/kubelet/util/manager/watch_based_manager_test.go b/pkg/kubelet/util/manager/watch_based_manager_test.go index 5e793b652e6..70272043031 100644 --- a/pkg/kubelet/util/manager/watch_based_manager_test.go +++ b/pkg/kubelet/util/manager/watch_based_manager_test.go @@ -41,8 +41,8 @@ import ( "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" corev1 "k8s.io/kubernetes/pkg/apis/core/v1" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" testingclock "k8s.io/utils/clock/testing" diff --git a/pkg/kubelet/util/pod_startup_latency_tracker_test.go b/pkg/kubelet/util/pod_startup_latency_tracker_test.go index ffb3e7b99ec..bbd7be7fd4a 100644 --- a/pkg/kubelet/util/pod_startup_latency_tracker_test.go +++ b/pkg/kubelet/util/pod_startup_latency_tracker_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/kubelet/util/swap/swap_util_test.go b/pkg/kubelet/util/swap/swap_util_test.go index 1fe5cbb210e..d62fb045c08 100644 --- a/pkg/kubelet/util/swap/swap_util_test.go +++ b/pkg/kubelet/util/swap/swap_util_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestIsSwapEnabled(t *testing.T) { diff --git a/pkg/kubelet/volume_host_test.go b/pkg/kubelet/volume_host_test.go index 520bf16d8c5..fdbec554c3c 100644 --- a/pkg/kubelet/volume_host_test.go +++ b/pkg/kubelet/volume_host_test.go @@ -23,8 +23,8 @@ import ( "github.com/google/go-cmp/cmp" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/kubelet/podcertificate" - "k8s.io/kubernetes/test/utils/ktesting" ) type recordingPodCertificateManager struct { diff --git a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go index ca8c879d7bb..7de92ab2234 100644 --- a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go @@ -34,6 +34,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" csitrans "k8s.io/csi-translation-lib" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" @@ -44,7 +45,6 @@ import ( "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" "k8s.io/kubernetes/pkg/volume/util/types" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/kubelet/volumemanager/volume_manager_test.go b/pkg/kubelet/volumemanager/volume_manager_test.go index a9beef9bc37..966db3583f4 100644 --- a/pkg/kubelet/volumemanager/volume_manager_test.go +++ b/pkg/kubelet/volumemanager/volume_manager_test.go @@ -44,6 +44,7 @@ import ( "k8s.io/client-go/tools/record" utiltesting "k8s.io/client-go/util/testing" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/config" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" @@ -53,7 +54,6 @@ import ( "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/types" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/mount-utils" ) diff --git a/pkg/kubelet/watchdog/watchdog_linux_test.go b/pkg/kubelet/watchdog/watchdog_linux_test.go index 04b48cd5e32..8665a3a034a 100644 --- a/pkg/kubelet/watchdog/watchdog_linux_test.go +++ b/pkg/kubelet/watchdog/watchdog_linux_test.go @@ -26,8 +26,8 @@ import ( "time" "k8s.io/apiserver/pkg/server/healthz" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" + "k8s.io/ktesting" + "k8s.io/ktesting/initoption" ) // Some of these tests capture log output. Don't reduce the verbosity or they will fail! diff --git a/pkg/proxy/conntrack/sysctls_test.go b/pkg/proxy/conntrack/sysctls_test.go index c9fa7d0a186..866efed1a3a 100644 --- a/pkg/proxy/conntrack/sysctls_test.go +++ b/pkg/proxy/conntrack/sysctls_test.go @@ -30,8 +30,8 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/ktesting" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/proxy/ipvs/cleanup_test.go b/pkg/proxy/ipvs/cleanup_test.go index b2526720e94..da2de42486f 100644 --- a/pkg/proxy/ipvs/cleanup_test.go +++ b/pkg/proxy/ipvs/cleanup_test.go @@ -27,12 +27,12 @@ import ( v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/proxy" ipsettest "k8s.io/kubernetes/pkg/proxy/ipvs/ipset/testing" ipvstest "k8s.io/kubernetes/pkg/proxy/ipvs/util/testing" utiliptables "k8s.io/kubernetes/pkg/util/iptables" iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index f2154065c99..d131e9f900a 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -38,6 +38,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/proxy" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" "k8s.io/kubernetes/pkg/proxy/conntrack" @@ -53,7 +54,6 @@ import ( proxyutiltest "k8s.io/kubernetes/pkg/proxy/util/testing" utiliptables "k8s.io/kubernetes/pkg/util/iptables" iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/proxy/ipvs/supported_test.go b/pkg/proxy/ipvs/supported_test.go index ca0697e6c44..37f4f1ca922 100644 --- a/pkg/proxy/ipvs/supported_test.go +++ b/pkg/proxy/ipvs/supported_test.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestCanUseIPVSProxier(t *testing.T) { diff --git a/pkg/proxy/node_test.go b/pkg/proxy/node_test.go index cbb2205d362..ae604a8c497 100644 --- a/pkg/proxy/node_test.go +++ b/pkg/proxy/node_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" clientsetfake "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" netutils "k8s.io/utils/net" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/.import-restrictions b/pkg/scheduler/.import-restrictions index 0b128a4cd5c..6f779ff45bb 100644 --- a/pkg/scheduler/.import-restrictions +++ b/pkg/scheduler/.import-restrictions @@ -10,7 +10,7 @@ rules: allowedPrefixes: [ "" ] - selectorRegexp: ^k8s[.]io/kubernetes/pkg/features$ allowedPrefixes: [ "" ] - - selectorRegexp: ^k8s[.]io/kubernetes/test/utils/ktesting($|/) + - selectorRegexp: ^k8s[.]io/kubernetes/ktesting($|/) allowedPrefixes: [ "" ] # Allow internal pkg/scheduler packages and subpackages diff --git a/pkg/scheduler/backend/queue/scheduling_queue_test.go b/pkg/scheduler/backend/queue/scheduling_queue_test.go index 96762853738..b3d14c4c8ce 100644 --- a/pkg/scheduler/backend/queue/scheduling_queue_test.go +++ b/pkg/scheduler/backend/queue/scheduling_queue_test.go @@ -41,6 +41,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/testutil" "k8s.io/klog/v2" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/features" @@ -51,7 +52,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/schedulinggates" "k8s.io/kubernetes/pkg/scheduler/metrics" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" ) diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dra_manager_test.go b/pkg/scheduler/framework/plugins/dynamicresources/dra_manager_test.go index 12ac2acc743..395b11a72b6 100644 --- a/pkg/scheduler/framework/plugins/dynamicresources/dra_manager_test.go +++ b/pkg/scheduler/framework/plugins/dynamicresources/dra_manager_test.go @@ -24,9 +24,9 @@ import ( resourceapi "k8s.io/api/resource/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go index bf0648ad355..19546fb2df8 100644 --- a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go +++ b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go @@ -62,6 +62,7 @@ import ( "k8s.io/dynamic-resource-allocation/structured" "k8s.io/dynamic-resource-allocation/structured/schedulerapi" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeschedulerconfigv1 "k8s.io/kube-scheduler/config/v1" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" @@ -74,7 +75,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/metrics" st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/framework/plugins/dynamicresources/extendeddynamicresources_test.go b/pkg/scheduler/framework/plugins/dynamicresources/extendeddynamicresources_test.go index d3c39c6172e..e91c18be142 100644 --- a/pkg/scheduler/framework/plugins/dynamicresources/extendeddynamicresources_test.go +++ b/pkg/scheduler/framework/plugins/dynamicresources/extendeddynamicresources_test.go @@ -23,9 +23,9 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func Test_createRequestsAndMappings_requests(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/nodename/node_name_test.go b/pkg/scheduler/framework/plugins/nodename/node_name_test.go index c85adec0f32..4601a2d36c1 100644 --- a/pkg/scheduler/framework/plugins/nodename/node_name_test.go +++ b/pkg/scheduler/framework/plugins/nodename/node_name_test.go @@ -23,11 +23,11 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestNodeName(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go index 6e8d2701696..c29f2b63d2b 100644 --- a/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/balanced_allocation_test.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/apis/config" @@ -35,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/runtime" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestNodeResourcesBalancedAllocation(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/noderesources/fit_test.go b/pkg/scheduler/framework/plugins/noderesources/fit_test.go index 0aec95cd7ef..253ad38c681 100644 --- a/pkg/scheduler/framework/plugins/noderesources/fit_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/fit_test.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/apis/config" @@ -44,7 +45,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/runtime" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/framework/plugins/noderesources/resource_allocation_test.go b/pkg/scheduler/framework/plugins/noderesources/resource_allocation_test.go index 2382b9aacb4..e0e40de8f55 100644 --- a/pkg/scheduler/framework/plugins/noderesources/resource_allocation_test.go +++ b/pkg/scheduler/framework/plugins/noderesources/resource_allocation_test.go @@ -36,6 +36,7 @@ import ( "k8s.io/dynamic-resource-allocation/deviceclass/extendedresourcecache" "k8s.io/dynamic-resource-allocation/resourceslice/tracker" "k8s.io/dynamic-resource-allocation/structured" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/apis/config" @@ -44,7 +45,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/pkg/scheduler/util" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/framework/plugins/nodeunschedulable/node_unschedulable_test.go b/pkg/scheduler/framework/plugins/nodeunschedulable/node_unschedulable_test.go index c91564a708c..75e0c0f0cd4 100644 --- a/pkg/scheduler/framework/plugins/nodeunschedulable/node_unschedulable_test.go +++ b/pkg/scheduler/framework/plugins/nodeunschedulable/node_unschedulable_test.go @@ -23,11 +23,11 @@ import ( "github.com/google/go-cmp/cmp" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestNodeUnschedulable(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go index beb7ec86af9..ccd4b37bdc9 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_test.go @@ -39,11 +39,11 @@ import ( "k8s.io/client-go/tools/cache" csitrans "k8s.io/csi-translation-lib" csilibplugins "k8s.io/csi-translation-lib/plugins" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/framework/plugins/podgrouppodscount/podgroup_pods_count_test.go b/pkg/scheduler/framework/plugins/podgrouppodscount/podgroup_pods_count_test.go index 05f00e21f08..bf6115a262b 100644 --- a/pkg/scheduler/framework/plugins/podgrouppodscount/podgroup_pods_count_test.go +++ b/pkg/scheduler/framework/plugins/podgrouppodscount/podgroup_pods_count_test.go @@ -32,6 +32,7 @@ import ( "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" internalcache "k8s.io/kubernetes/pkg/scheduler/backend/cache" @@ -40,7 +41,6 @@ import ( frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/metrics" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func init() { diff --git a/pkg/scheduler/framework/plugins/schedulinggates/scheduling_gates_test.go b/pkg/scheduler/framework/plugins/schedulinggates/scheduling_gates_test.go index c408e0f738f..09151af58d9 100644 --- a/pkg/scheduler/framework/plugins/schedulinggates/scheduling_gates_test.go +++ b/pkg/scheduler/framework/plugins/schedulinggates/scheduling_gates_test.go @@ -22,10 +22,10 @@ import ( "github.com/google/go-cmp/cmp" v1 "k8s.io/api/core/v1" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPreEnqueue(t *testing.T) { diff --git a/pkg/scheduler/framework/plugins/topologyaware/topology_placement_test.go b/pkg/scheduler/framework/plugins/topologyaware/topology_placement_test.go index 030f768c908..6716466a73d 100644 --- a/pkg/scheduler/framework/plugins/topologyaware/topology_placement_test.go +++ b/pkg/scheduler/framework/plugins/topologyaware/topology_placement_test.go @@ -29,6 +29,7 @@ import ( "k8s.io/client-go/informers" clientsetfake "k8s.io/client-go/kubernetes/fake" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/backend/cache" @@ -36,7 +37,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature" "k8s.io/kubernetes/pkg/scheduler/framework/runtime" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/ktesting" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" diff --git a/pkg/scheduler/framework/plugins/volumebinding/assume_cache_test.go b/pkg/scheduler/framework/plugins/volumebinding/assume_cache_test.go index ea702447890..1c96484383b 100644 --- a/pkg/scheduler/framework/plugins/volumebinding/assume_cache_test.go +++ b/pkg/scheduler/framework/plugins/volumebinding/assume_cache_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // testInformer is a minimal fake informer for unit tests. diff --git a/pkg/scheduler/framework/types_test.go b/pkg/scheduler/framework/types_test.go index 044b5f28dd4..eab384bfcb8 100644 --- a/pkg/scheduler/framework/types_test.go +++ b/pkg/scheduler/framework/types_test.go @@ -36,12 +36,12 @@ import ( ndf "k8s.io/component-helpers/nodedeclaredfeatures" ndftesting "k8s.io/component-helpers/nodedeclaredfeatures/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" + "k8s.io/ktesting/initoption" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" st "k8s.io/kubernetes/pkg/scheduler/testing" schedutil "k8s.io/kubernetes/pkg/scheduler/util" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" ) var nodeInfoCmpOpts = []cmp.Option{ diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index 32f4da24e9b..d48e52e9024 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -50,6 +50,7 @@ import ( "k8s.io/component-base/metrics/testutil" "k8s.io/klog/v2" "k8s.io/klog/v2/ktesting" + utiltesting "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config" @@ -71,7 +72,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/profile" st "k8s.io/kubernetes/pkg/scheduler/testing" tf "k8s.io/kubernetes/pkg/scheduler/testing/framework" - utiltesting "k8s.io/kubernetes/test/utils/ktesting" testingclock "k8s.io/utils/clock/testing" "k8s.io/utils/ptr" ) diff --git a/pkg/scheduler/util/assumecache/assume_cache_test.go b/pkg/scheduler/util/assumecache/assume_cache_test.go index dcaeef0b6a7..03a910ecce8 100644 --- a/pkg/scheduler/util/assumecache/assume_cache_test.go +++ b/pkg/scheduler/util/assumecache/assume_cache_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // testInformer implements [Informer] and can be used to feed changes into an assume diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index e7ad625c601..7789bb91ecc 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -81,6 +81,7 @@ - k8s.io/client-go - k8s.io/klog - k8s.io/kube-openapi + - k8s.io/ktesting - k8s.io/streaming - k8s.io/utils @@ -242,6 +243,15 @@ - k8s.io/kubelet - k8s.io/utils +- baseImportPath: "./staging/src/k8s.io/ktesting" + allowedImports: + - k8s.io/klog + - k8s.io/ktesting + - sigs.k8s.io/yaml + - github.com/go-logr + - github.com/onsi/gomega + - go.uber.org/goleak + - baseImportPath: "./staging/src/k8s.io/cluster-bootstrap" allowedImports: - k8s.io/api diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index bbf0f7c67dd..c331f233f92 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -1,4 +1,12 @@ rules: +- destination: ktesting + branches: + - name: master + source: + branch: master + dirs: + - staging/src/k8s.io/ktesting + library: true - destination: streaming branches: - name: master @@ -113,6 +121,8 @@ rules: branch: master - repository: api branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -242,6 +252,8 @@ rules: branch: master - repository: client-go branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -311,6 +323,8 @@ rules: branch: master - repository: client-go branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -427,6 +441,8 @@ rules: branch: master - repository: kms branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -520,6 +536,8 @@ rules: branch: master - repository: code-generator branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -628,6 +646,8 @@ rules: branch: master - repository: component-base branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -755,6 +775,8 @@ rules: branch: master - repository: code-generator branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -864,6 +886,8 @@ rules: branch: master - repository: kms branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -976,6 +1000,8 @@ rules: branch: master - repository: code-generator branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -1053,6 +1079,8 @@ rules: branch: master - repository: client-go branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -1124,6 +1152,8 @@ rules: branch: master - repository: client-go branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -1520,6 +1550,8 @@ rules: branch: master - repository: kms branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -1623,6 +1655,8 @@ rules: branch: master - repository: kms branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -2017,6 +2051,8 @@ rules: branch: master - repository: metrics branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -2132,6 +2168,8 @@ rules: branch: master - repository: kms branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -2235,6 +2273,8 @@ rules: branch: master - repository: kubelet branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -2357,6 +2397,8 @@ rules: branch: master - repository: kubelet branch: master + - repository: ktesting + branch: master source: branch: master dirs: @@ -2466,6 +2508,8 @@ rules: branch: master - repository: component-base branch: master + - repository: ktesting + branch: master source: branch: master dirs: diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index 16537417d6f..34eeaf71f92 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -128,5 +128,6 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.sum b/staging/src/k8s.io/apiextensions-apiserver/go.sum index 2d7fc4b2cb2..fe283857c18 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.sum +++ b/staging/src/k8s.io/apiextensions-apiserver/go.sum @@ -130,6 +130,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index 12ced44ca8f..786551503f4 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -123,5 +123,6 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/apiserver/go.sum b/staging/src/k8s.io/apiserver/go.sum index 9a26d569e7d..6015ec8aee4 100644 --- a/staging/src/k8s.io/apiserver/go.sum +++ b/staging/src/k8s.io/apiserver/go.sum @@ -131,6 +131,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod index 1bf0caf85d7..0dce2c96c7c 100644 --- a/staging/src/k8s.io/cli-runtime/go.mod +++ b/staging/src/k8s.io/cli-runtime/go.mod @@ -68,5 +68,6 @@ replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/cli-runtime/go.sum b/staging/src/k8s.io/cli-runtime/go.sum index abf1d839658..afb15b7dfd8 100644 --- a/staging/src/k8s.io/cli-runtime/go.sum +++ b/staging/src/k8s.io/cli-runtime/go.sum @@ -63,6 +63,7 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1 h1:x06SQA46+PKIUftmEujdwSEpIx8kR+M9eLYsUxeYveU= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index ea3e531932b..5c6a02ec6fc 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -13,6 +13,7 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 + github.com/onsi/gomega v1.44.0 github.com/peterbourgon/diskv/v3 v3.0.1 github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.12.1 @@ -26,6 +27,7 @@ require ( k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/klog/v2 v2.140.0 + k8s.io/ktesting v0.0.0 k8s.io/kube-openapi v0.0.0-20260929181212-2cfbdf149b9a k8s.io/streaming v0.0.0 k8s.io/utils v0.0.0-20260626114624-be93311217bd @@ -60,5 +62,6 @@ require ( replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/client-go/go.sum b/staging/src/k8s.io/client-go/go.sum index 5a34e8ff9d7..b1d226da212 100644 --- a/staging/src/k8s.io/client-go/go.sum +++ b/staging/src/k8s.io/client-go/go.sum @@ -46,6 +46,8 @@ github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVO github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1 h1:x06SQA46+PKIUftmEujdwSEpIx8kR+M9eLYsUxeYveU= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= diff --git a/staging/src/k8s.io/client-go/ktesting/OWNERS b/staging/src/k8s.io/client-go/ktesting/OWNERS new file mode 100644 index 00000000000..9f94dde2da6 --- /dev/null +++ b/staging/src/k8s.io/client-go/ktesting/OWNERS @@ -0,0 +1,15 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + # SIG Testing leads, keep in sync with SIG + - aojea + - bentheelder + - jbpratt + - michelle192837 + - pohly + # additional approvers + - nojnhuh +reviewers: + - pohly +labels: + - sig/testing diff --git a/staging/src/k8s.io/client-go/ktesting/README.md b/staging/src/k8s.io/client-go/ktesting/README.md new file mode 100644 index 00000000000..e607bd924e5 --- /dev/null +++ b/staging/src/k8s.io/client-go/ktesting/README.md @@ -0,0 +1,16 @@ +# ktesting + +ktesting is a set of packages with the same name which are meant to simplify +writing tests. + +- k8s.io/klog/v2/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/klog/v2/ktesting.svg)](https://pkg.go.dev/k8s.io/klog/v2/ktesting): per-test structured logging +- k8s.io/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/ktesting.svg)](https://pkg.go.dev/k8s.io/ktesting): API that enables writing code which can be used in tests based on `go test` (unit tests and integration tests in Kubernetes) and Ginkgo suites (E2E in Kubernetes). Automatically adds klog command line flags and reconfigures Gomega to log Kubernetes objects as YAML. +- k8s.io/client-go/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/client-go/ktesting.svg)](https://pkg.go.dev/k8s.io/client-go/ktesting): Adds support for client-go to the API (client instance, test namespace, REST configuration), similar to test/e2e/framework.Framework. + +They build on top of each other such that the more advanced packages offer the +same API as the simpler packages and just add more functionality. + +Providing them in different modules avoids forcing dependencies on consumers +for functionality that they don't need. Consumers are free to choose the +package which meets their needs and can later switch to a more advanced one +just by changing the import statement. diff --git a/test/utils/client-go/ktesting/assert.go b/staging/src/k8s.io/client-go/ktesting/assert.go similarity index 99% rename from test/utils/client-go/ktesting/assert.go rename to staging/src/k8s.io/client-go/ktesting/assert.go index 42b225d5638..2a1f96c983b 100644 --- a/test/utils/client-go/ktesting/assert.go +++ b/staging/src/k8s.io/client-go/ktesting/assert.go @@ -24,7 +24,7 @@ import ( "github.com/onsi/gomega" gtypes "github.com/onsi/gomega/types" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // See [ktesting.FailureError]. diff --git a/test/utils/client-go/ktesting/assert_test.go b/staging/src/k8s.io/client-go/ktesting/assert_test.go similarity index 100% rename from test/utils/client-go/ktesting/assert_test.go rename to staging/src/k8s.io/client-go/ktesting/assert_test.go diff --git a/test/utils/client-go/ktesting/client.go b/staging/src/k8s.io/client-go/ktesting/client.go similarity index 99% rename from test/utils/client-go/ktesting/client.go rename to staging/src/k8s.io/client-go/ktesting/client.go index 31b29990dff..ed7608f80f9 100644 --- a/test/utils/client-go/ktesting/client.go +++ b/staging/src/k8s.io/client-go/ktesting/client.go @@ -28,7 +28,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/restmapper" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) type data struct { diff --git a/test/utils/client-go/ktesting/client_test.go b/staging/src/k8s.io/client-go/ktesting/client_test.go similarity index 100% rename from test/utils/client-go/ktesting/client_test.go rename to staging/src/k8s.io/client-go/ktesting/client_test.go diff --git a/test/utils/client-go/ktesting/doc.go b/staging/src/k8s.io/client-go/ktesting/doc.go similarity index 95% rename from test/utils/client-go/ktesting/doc.go rename to staging/src/k8s.io/client-go/ktesting/doc.go index bd486acf72f..428f9649376 100644 --- a/test/utils/client-go/ktesting/doc.go +++ b/staging/src/k8s.io/client-go/ktesting/doc.go @@ -21,6 +21,4 @@ limitations under the License. // // Those could of course also be passed as separate parameters. // When using TContext, a single parameter is enough. -// -// TODO: move to k8s.io/client-go/ktesting package ktesting diff --git a/test/utils/client-go/ktesting/helper_test.go b/staging/src/k8s.io/client-go/ktesting/helper_test.go similarity index 100% rename from test/utils/client-go/ktesting/helper_test.go rename to staging/src/k8s.io/client-go/ktesting/helper_test.go diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod index fd40d17e918..77d473bb117 100644 --- a/staging/src/k8s.io/cloud-provider/go.mod +++ b/staging/src/k8s.io/cloud-provider/go.mod @@ -116,5 +116,6 @@ replace ( k8s.io/component-helpers => ../component-helpers k8s.io/controller-manager => ../controller-manager k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/cloud-provider/go.sum b/staging/src/k8s.io/cloud-provider/go.sum index f4f828a2013..8a9ddfd766e 100644 --- a/staging/src/k8s.io/cloud-provider/go.sum +++ b/staging/src/k8s.io/cloud-provider/go.sum @@ -124,6 +124,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index 1e0416797b1..b336b4c7bcb 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -86,5 +86,6 @@ replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/component-base/go.sum b/staging/src/k8s.io/component-base/go.sum index 80b95f73492..b7b93097ec0 100644 --- a/staging/src/k8s.io/component-base/go.sum +++ b/staging/src/k8s.io/component-base/go.sum @@ -95,6 +95,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= diff --git a/staging/src/k8s.io/component-helpers/go.mod b/staging/src/k8s.io/component-helpers/go.mod index 8aa08a30efa..071845208f4 100644 --- a/staging/src/k8s.io/component-helpers/go.mod +++ b/staging/src/k8s.io/component-helpers/go.mod @@ -52,5 +52,6 @@ replace ( k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/component-helpers/go.sum b/staging/src/k8s.io/component-helpers/go.sum index 29e8599c4df..3f97fd0ca1d 100644 --- a/staging/src/k8s.io/component-helpers/go.sum +++ b/staging/src/k8s.io/component-helpers/go.sum @@ -39,6 +39,7 @@ github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVO github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod index c4030acd754..1bfa3b252c2 100644 --- a/staging/src/k8s.io/controller-manager/go.mod +++ b/staging/src/k8s.io/controller-manager/go.mod @@ -106,5 +106,6 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/controller-manager/go.sum b/staging/src/k8s.io/controller-manager/go.sum index cc7db1dcdbc..0b2e8cee344 100644 --- a/staging/src/k8s.io/controller-manager/go.sum +++ b/staging/src/k8s.io/controller-manager/go.sum @@ -120,6 +120,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/dynamic-resource-allocation/go.mod b/staging/src/k8s.io/dynamic-resource-allocation/go.mod index 15555447518..5da7975da9a 100644 --- a/staging/src/k8s.io/dynamic-resource-allocation/go.mod +++ b/staging/src/k8s.io/dynamic-resource-allocation/go.mod @@ -87,6 +87,7 @@ replace ( k8s.io/component-base => ../component-base k8s.io/component-helpers => ../component-helpers k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/kubelet => ../kubelet k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/endpointslice/go.mod b/staging/src/k8s.io/endpointslice/go.mod index 5865dcf9569..a9865dfe447 100644 --- a/staging/src/k8s.io/endpointslice/go.mod +++ b/staging/src/k8s.io/endpointslice/go.mod @@ -67,5 +67,6 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/endpointslice/go.sum b/staging/src/k8s.io/endpointslice/go.sum index b2fd05c179c..d82083a39e7 100644 --- a/staging/src/k8s.io/endpointslice/go.sum +++ b/staging/src/k8s.io/endpointslice/go.sum @@ -66,6 +66,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/ktesting/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/ktesting/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000000..e7e5eb834b2 --- /dev/null +++ b/staging/src/k8s.io/ktesting/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,2 @@ +Sorry, we do not accept changes directly against this repository. Please see +CONTRIBUTING.md for information on where and how to contribute instead. diff --git a/test/utils/ktesting/.import-restrictions b/staging/src/k8s.io/ktesting/.import-restrictions similarity index 60% rename from test/utils/ktesting/.import-restrictions rename to staging/src/k8s.io/ktesting/.import-restrictions index 7d0aff2b737..33d94e16891 100644 --- a/test/utils/ktesting/.import-restrictions +++ b/staging/src/k8s.io/ktesting/.import-restrictions @@ -1,5 +1,5 @@ rules: - - selectorRegexp: ^(k8s.io/kubernetes/test/utils/ktesting|k8s.io/klog|sigs.k8s.io/yaml|github.com/go-logr|github.com/onsi/gomega|go.uber.org/goleak) + - selectorRegexp: ^(k8s.io/ktesting|k8s.io/klog|sigs.k8s.io/yaml|github.com/go-logr|github.com/onsi/gomega|go.uber.org/goleak) allowedPrefixes: [ "" ] # Any package without a dot in the first part of the name is a standard package. - selectorRegexp: ^[a-z]*($|/) diff --git a/staging/src/k8s.io/ktesting/CONTRIBUTING.md b/staging/src/k8s.io/ktesting/CONTRIBUTING.md new file mode 100644 index 00000000000..43d0e616b80 --- /dev/null +++ b/staging/src/k8s.io/ktesting/CONTRIBUTING.md @@ -0,0 +1,7 @@ +# Contributing guidelines + +Do not open pull requests directly against kubernetes/ktesting repository; they will be ignored. Instead, please open pull requests and issues against [kubernetes/kubernetes](https://git.k8s.io/kubernetes/). Please follow the same [contributing guide](https://git.k8s.io/kubernetes/CONTRIBUTING.md) you would follow for any other pull request made to kubernetes/kubernetes. + +This repository is published from [kubernetes/kubernetes/staging/src/k8s.io/ktesting](https://git.k8s.io/kubernetes/staging/src/k8s.io/ktesting) by the [kubernetes publishing-bot](https://git.k8s.io/publishing-bot). + +Please see [Staging Directory and Publishing](https://git.k8s.io/community/contributors/devel/sig-architecture/staging.md) for more information diff --git a/staging/src/k8s.io/ktesting/LICENSE b/staging/src/k8s.io/ktesting/LICENSE new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/staging/src/k8s.io/ktesting/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/staging/src/k8s.io/ktesting/OWNERS b/staging/src/k8s.io/ktesting/OWNERS new file mode 100644 index 00000000000..9f94dde2da6 --- /dev/null +++ b/staging/src/k8s.io/ktesting/OWNERS @@ -0,0 +1,15 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +approvers: + # SIG Testing leads, keep in sync with SIG + - aojea + - bentheelder + - jbpratt + - michelle192837 + - pohly + # additional approvers + - nojnhuh +reviewers: + - pohly +labels: + - sig/testing diff --git a/staging/src/k8s.io/ktesting/README.md b/staging/src/k8s.io/ktesting/README.md new file mode 100644 index 00000000000..e607bd924e5 --- /dev/null +++ b/staging/src/k8s.io/ktesting/README.md @@ -0,0 +1,16 @@ +# ktesting + +ktesting is a set of packages with the same name which are meant to simplify +writing tests. + +- k8s.io/klog/v2/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/klog/v2/ktesting.svg)](https://pkg.go.dev/k8s.io/klog/v2/ktesting): per-test structured logging +- k8s.io/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/ktesting.svg)](https://pkg.go.dev/k8s.io/ktesting): API that enables writing code which can be used in tests based on `go test` (unit tests and integration tests in Kubernetes) and Ginkgo suites (E2E in Kubernetes). Automatically adds klog command line flags and reconfigures Gomega to log Kubernetes objects as YAML. +- k8s.io/client-go/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/client-go/ktesting.svg)](https://pkg.go.dev/k8s.io/client-go/ktesting): Adds support for client-go to the API (client instance, test namespace, REST configuration), similar to test/e2e/framework.Framework. + +They build on top of each other such that the more advanced packages offer the +same API as the simpler packages and just add more functionality. + +Providing them in different modules avoids forcing dependencies on consumers +for functionality that they don't need. Consumers are free to choose the +package which meets their needs and can later switch to a more advanced one +just by changing the import statement. diff --git a/staging/src/k8s.io/ktesting/SECURITY_CONTACTS b/staging/src/k8s.io/ktesting/SECURITY_CONTACTS new file mode 100644 index 00000000000..c8d0bcf6034 --- /dev/null +++ b/staging/src/k8s.io/ktesting/SECURITY_CONTACTS @@ -0,0 +1,13 @@ +# Defined below are the security contacts for this repo. +# +# They are the contact point for the Product Security Committee to reach out +# to for triaging and handling of incoming issues. +# +# The below names agree to abide by the +# [Embargo Policy](https://git.k8s.io/security/private-distributors-list.md#embargo-policy) +# and will be removed and replaced if they violate that agreement. +# +# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE +# INSTRUCTIONS AT https://kubernetes.io/security/ + +pohly diff --git a/test/utils/ktesting/assert.go b/staging/src/k8s.io/ktesting/assert.go similarity index 99% rename from test/utils/ktesting/assert.go rename to staging/src/k8s.io/ktesting/assert.go index 0de98632615..9aafb5446a1 100644 --- a/test/utils/ktesting/assert.go +++ b/staging/src/k8s.io/ktesting/assert.go @@ -89,7 +89,7 @@ func NewFailure(msg string) FailureError { // those add useful information for diagnosing test failures: the former are // internal implementation details, the latter merely point back at the // ktesting API call that triggered capturing the backtrace. -var runtimeStackFrameRE = regexp.MustCompile(`/src/testing/|/src/runtime/|/onsi/gomega/|/test/utils/ktesting/[^/]+\.go:`) +var runtimeStackFrameRE = regexp.MustCompile(`/src/testing/|/src/runtime/|/onsi/gomega/|/ktesting/[^/]+\.go:`) // captureBacktrace returns a pruned stack backtrace pointing at the caller of // captureBacktrace, suitable for use as [FailureError.FullStackTrace]. diff --git a/test/utils/ktesting/assert_test.go b/staging/src/k8s.io/ktesting/assert_test.go similarity index 100% rename from test/utils/ktesting/assert_test.go rename to staging/src/k8s.io/ktesting/assert_test.go diff --git a/staging/src/k8s.io/ktesting/code-of-conduct.md b/staging/src/k8s.io/ktesting/code-of-conduct.md new file mode 100644 index 00000000000..0d15c00cf32 --- /dev/null +++ b/staging/src/k8s.io/ktesting/code-of-conduct.md @@ -0,0 +1,3 @@ +# Kubernetes Community Code of Conduct + +Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/test/utils/ktesting/contexthelper.go b/staging/src/k8s.io/ktesting/contexthelper.go similarity index 100% rename from test/utils/ktesting/contexthelper.go rename to staging/src/k8s.io/ktesting/contexthelper.go diff --git a/test/utils/ktesting/contexthelper_test.go b/staging/src/k8s.io/ktesting/contexthelper_test.go similarity index 100% rename from test/utils/ktesting/contexthelper_test.go rename to staging/src/k8s.io/ktesting/contexthelper_test.go diff --git a/test/utils/ktesting/doc.go b/staging/src/k8s.io/ktesting/doc.go similarity index 87% rename from test/utils/ktesting/doc.go rename to staging/src/k8s.io/ktesting/doc.go index 2459501fd4c..19d95156293 100644 --- a/test/utils/ktesting/doc.go +++ b/staging/src/k8s.io/ktesting/doc.go @@ -20,10 +20,10 @@ limitations under the License. // // # Examples // -// The examples in [k8s.io/kubernetes/test/utils/ktesting/examples] are unit tests which +// The examples in [k8s.io/ktesting/examples] are unit tests which // intentionally contain failures and tests which get stuck. To run them, use: // -// go test -timeout=10s -tags example k8s.io/kubernetes/test/utils/ktesting/examples/... +// go test -timeout=10s -tags example k8s.io/ktesting/examples/... // // Individual examples will be called out below where applicable. // @@ -41,7 +41,7 @@ limitations under the License. // sub-tests), [testing/synctest] (running code in a synctest bubble) and // Ginkgo (timeouts and interrupt handling, progress reporting). // -// [k8s.io/kubernetes/test/utils/client-go/ktesting] adds type-safe passing +// [k8s.io/client-go/ktesting] adds type-safe passing // of all relevant client-go instances through a single TContext parameter, // similar to [k8s.io/kubernetes/test/e2e/framework.Framework]. // @@ -97,8 +97,8 @@ limitations under the License. // // These two examples demonstrate the difference in behavior with and without ktesting: // -// go test -tags example -timeout=10s -v k8s.io/kubernetes/test/utils/ktesting/examples/with_ktesting -// go test -tags example -timeout=10s -v k8s.io/kubernetes/test/utils/ktesting/examples/without_ktesting +// go test -tags example -timeout=10s -v k8s.io/ktesting/examples/with_ktesting +// go test -tags example -timeout=10s -v k8s.io/ktesting/examples/without_ktesting // // You can try interrupting before the 10 second timeout, too. // @@ -152,7 +152,7 @@ limitations under the License. // For example, `t.Fatal(err)` don't make it clear that the error string // is the test failure. // -// go test -tags example -v -run=TestFormat k8s.io/kubernetes/test/utils/ktesting/examples/logging -args -v=1 +// go test -tags example -v -run=TestFormat k8s.io/ktesting/examples/logging -args -v=1 // === RUN TestFormat // example_test.go:57: I0820 14:33:51.450589] hello via tCtx.Logf (unstructured logging): x is 1 // example_test.go:58: I0820 14:33:51.450605] hello via tCtx.Logger().Info (structured logging) x=1 @@ -236,7 +236,7 @@ limitations under the License. // and "set heat for baking" are passed to two different WithStep calls and "oven not found" to // [TContext.Fatal]. There are two "FATAL ERRORs" because a cleanup function also fails: // -// go test -tags example -v -run=TestWithStep k8s.io/kubernetes/test/utils/ktesting/examples/logging +// go test -tags example -v -run=TestWithStep k8s.io/ktesting/examples/logging // === RUN TestWithStep // baking_test.go:29: I0821 17:08:55.019097] bake cake/set heat for baking: Log() // baking_test.go:30: I0821 17:08:55.019114] bake cake/set heat for baking: Logger().Info() @@ -251,28 +251,28 @@ limitations under the License. // // === RUN TestWithError // example_test.go:92: I0821 15:01:50.576258] checking oven temperature: failed at: -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.checkTemperature({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}, ...) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/example_test.go:100 +0x67 -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.TestWithError(0x30e55d1b4b48?) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/example_test.go:92 +0x12b +// k8s.io/ktesting/examples/logging.checkTemperature({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}, ...) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/example_test.go:100 +0x67 +// k8s.io/ktesting/examples/logging.TestWithError(0x30e55d1b4b48?) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/example_test.go:92 +0x12b // example_test.go:92: ERROR: I0821 15:01:50.576273] // checking oven temperature: oven temperature 42°C is too low for baking // example_test.go:93: I0821 15:01:50.576325] checking oven readiness: failed at: -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.checkOvenReady({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}, ...) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/example_test.go:110 +0x306 -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.TestWithError(0x30e55d1b4b48?) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/example_test.go:93 +0x205 +// k8s.io/ktesting/examples/logging.checkOvenReady({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}, ...) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/example_test.go:110 +0x306 +// k8s.io/ktesting/examples/logging.TestWithError(0x30e55d1b4b48?) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/example_test.go:93 +0x205 // example_test.go:93: ERROR: I0821 15:01:50.576338] // checking oven readiness: oven is not ready yet // baking_test.go:29: I0821 15:01:50.576343] Log() // baking_test.go:30: I0821 15:01:50.576351] Logger().Info() // example_test.go:94: I0821 15:01:50.576384] baking cake: failed at: -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.heatOven({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/baking_test.go:31 +0x1a5 -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.bakeCake({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/example_test.go:118 +0x22d -// k8s.io/kubernetes/test/utils/ktesting/examples/logging.TestWithError(0x30e55d1b4b48?) -// /nvme/gopath/src/k8s.io/kubernetes/test/utils/ktesting/examples/logging/example_test.go:94 +0x2db +// k8s.io/ktesting/examples/logging.heatOven({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/baking_test.go:31 +0x1a5 +// k8s.io/ktesting/examples/logging.bakeCake({{0x725d20, 0x30e55d1e2bd0}, {{0x72ca58, 0x30e55d1b4b48}}, 0x7201e8, 0x30e55cfd6d50, {0x0, 0x0}, 0x0, {0x0, ...}, ...}) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/example_test.go:118 +0x22d +// k8s.io/ktesting/examples/logging.TestWithError(0x30e55d1b4b48?) +// /nvme/gopath/src/k8s.io/kubernetes/staging/src/k8s.io/ktesting/examples/logging/example_test.go:94 +0x2db // example_test.go:94: ERROR: I0821 15:01:50.576390] // baking cake: oven not found // baking_test.go:37: FATAL ERROR: I0821 15:01:50.576397] @@ -318,7 +318,7 @@ limitations under the License. // explanation, indented and prefixed by the name of the sub-test that it // belongs to: // -// go test -tags example -timeout=20s k8s.io/kubernetes/test/utils/ktesting/examples/with_ktesting & pid=$!; sleep 5; killall -USR1 with_ktesting.test; wait $pid +// go test -tags example -timeout=20s k8s.io/ktesting/examples/with_ktesting & pid=$!; sleep 5; killall -USR1 with_ktesting.test; wait $pid // ... // You requested a progress report. // Currently running: @@ -363,7 +363,7 @@ limitations under the License. // : 2 // example_test.go:38: Cleaning up... // FAIL -// FAIL k8s.io/kubernetes/test/utils/ktesting/examples/with_ktesting 15.007s +// FAIL k8s.io/ktesting/examples/with_ktesting 15.007s // // Normally, raising an assertion inside a polling callback is wrong. In the following example, // a failed assertion aborts the test instead of triggering a retry: diff --git a/test/utils/ktesting/examples/gomega/doc.go b/staging/src/k8s.io/ktesting/examples/gomega/doc.go similarity index 100% rename from test/utils/ktesting/examples/gomega/doc.go rename to staging/src/k8s.io/ktesting/examples/gomega/doc.go diff --git a/test/utils/ktesting/examples/gomega/example_test.go b/staging/src/k8s.io/ktesting/examples/gomega/example_test.go similarity index 96% rename from test/utils/ktesting/examples/gomega/example_test.go rename to staging/src/k8s.io/ktesting/examples/gomega/example_test.go index 94e4f642fb1..cab9743b601 100644 --- a/test/utils/ktesting/examples/gomega/example_test.go +++ b/staging/src/k8s.io/ktesting/examples/gomega/example_test.go @@ -27,7 +27,7 @@ import ( "time" "github.com/onsi/gomega" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestGomega(t *testing.T) { diff --git a/test/utils/ktesting/examples/logging/baking_test.go b/staging/src/k8s.io/ktesting/examples/logging/baking_test.go similarity index 96% rename from test/utils/ktesting/examples/logging/baking_test.go rename to staging/src/k8s.io/ktesting/examples/logging/baking_test.go index 317d63f6491..3ef3c72dc37 100644 --- a/test/utils/ktesting/examples/logging/baking_test.go +++ b/staging/src/k8s.io/ktesting/examples/logging/baking_test.go @@ -20,7 +20,7 @@ package logging import ( "github.com/onsi/gomega" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // heatOven demonstrates how log output and failures are handle when using diff --git a/test/utils/ktesting/examples/logging/doc.go b/staging/src/k8s.io/ktesting/examples/logging/doc.go similarity index 100% rename from test/utils/ktesting/examples/logging/doc.go rename to staging/src/k8s.io/ktesting/examples/logging/doc.go diff --git a/test/utils/ktesting/examples/logging/example_test.go b/staging/src/k8s.io/ktesting/examples/logging/example_test.go similarity index 98% rename from test/utils/ktesting/examples/logging/example_test.go rename to staging/src/k8s.io/ktesting/examples/logging/example_test.go index 1e517ce3f63..1684d8fa272 100644 --- a/test/utils/ktesting/examples/logging/example_test.go +++ b/staging/src/k8s.io/ktesting/examples/logging/example_test.go @@ -29,7 +29,7 @@ import ( "github.com/onsi/gomega" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestError(t *testing.T) { diff --git a/test/utils/ktesting/examples/with_ktesting/doc.go b/staging/src/k8s.io/ktesting/examples/with_ktesting/doc.go similarity index 100% rename from test/utils/ktesting/examples/with_ktesting/doc.go rename to staging/src/k8s.io/ktesting/examples/with_ktesting/doc.go diff --git a/test/utils/ktesting/examples/with_ktesting/example_test.go b/staging/src/k8s.io/ktesting/examples/with_ktesting/example_test.go similarity index 97% rename from test/utils/ktesting/examples/with_ktesting/example_test.go rename to staging/src/k8s.io/ktesting/examples/with_ktesting/example_test.go index 52fef515400..4f0fbd56296 100644 --- a/test/utils/ktesting/examples/with_ktesting/example_test.go +++ b/staging/src/k8s.io/ktesting/examples/with_ktesting/example_test.go @@ -27,7 +27,7 @@ import ( "time" "github.com/onsi/gomega" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestTimeout(t *testing.T) { diff --git a/test/utils/ktesting/examples/without_ktesting/doc.go b/staging/src/k8s.io/ktesting/examples/without_ktesting/doc.go similarity index 100% rename from test/utils/ktesting/examples/without_ktesting/doc.go rename to staging/src/k8s.io/ktesting/examples/without_ktesting/doc.go diff --git a/test/utils/ktesting/examples/without_ktesting/example_test.go b/staging/src/k8s.io/ktesting/examples/without_ktesting/example_test.go similarity index 100% rename from test/utils/ktesting/examples/without_ktesting/example_test.go rename to staging/src/k8s.io/ktesting/examples/without_ktesting/example_test.go diff --git a/test/utils/ktesting/format/format.go b/staging/src/k8s.io/ktesting/format/format.go similarity index 98% rename from test/utils/ktesting/format/format.go rename to staging/src/k8s.io/ktesting/format/format.go index 15dcff7c3ee..5a77624e7a8 100644 --- a/test/utils/ktesting/format/format.go +++ b/staging/src/k8s.io/ktesting/format/format.go @@ -92,8 +92,7 @@ func useYAML(t reflect.Type) bool { return useYAML(t.Key()) || useYAML(t.Elem()) case reflect.Struct: // All fields must have a `json` tag. - for i := 0; i < t.NumField(); i++ { - field := t.Field(i) + for field := range t.Fields() { if _, ok := field.Tag.Lookup("json"); !ok { return false } diff --git a/test/utils/ktesting/format/format_test.go b/staging/src/k8s.io/ktesting/format/format_test.go similarity index 100% rename from test/utils/ktesting/format/format_test.go rename to staging/src/k8s.io/ktesting/format/format_test.go diff --git a/staging/src/k8s.io/ktesting/go.mod b/staging/src/k8s.io/ktesting/go.mod new file mode 100644 index 00000000000..56db0253e20 --- /dev/null +++ b/staging/src/k8s.io/ktesting/go.mod @@ -0,0 +1,24 @@ +// This is a generated file. Do not edit directly. + +module k8s.io/ktesting + +go 1.27.0 + +godebug default=go1.27 + +require ( + github.com/onsi/gomega v1.44.0 + go.uber.org/goleak v1.3.0 + k8s.io/klog/v2 v2.140.0 + sigs.k8s.io/yaml v1.6.0 +) + +require ( + github.com/go-logr/logr v1.4.4 // indirect + github.com/google/go-cmp v0.7.0 // indirect + github.com/stretchr/testify v1.12.1 // indirect + go.yaml.in/yaml/v2 v2.4.4 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/net v0.59.0 // indirect + golang.org/x/text v0.42.0 // indirect +) diff --git a/staging/src/k8s.io/ktesting/go.sum b/staging/src/k8s.io/ktesting/go.sum new file mode 100644 index 00000000000..e5696c570aa --- /dev/null +++ b/staging/src/k8s.io/ktesting/go.sum @@ -0,0 +1,36 @@ +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0= +github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= +github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= +go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= +golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues= +golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= +golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= +google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= +k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/test/utils/ktesting/helper_test.go b/staging/src/k8s.io/ktesting/helper_test.go similarity index 100% rename from test/utils/ktesting/helper_test.go rename to staging/src/k8s.io/ktesting/helper_test.go diff --git a/test/utils/ktesting/initoption/initoption.go b/staging/src/k8s.io/ktesting/initoption/initoption.go similarity index 98% rename from test/utils/ktesting/initoption/initoption.go rename to staging/src/k8s.io/ktesting/initoption/initoption.go index d66f1470156..f2cc8022933 100644 --- a/test/utils/ktesting/initoption/initoption.go +++ b/staging/src/k8s.io/ktesting/initoption/initoption.go @@ -19,7 +19,7 @@ package initoption import ( "time" - "k8s.io/kubernetes/test/utils/ktesting/internal" + "k8s.io/ktesting/internal" ) // InitOption is a functional option for Init and InitCtx. diff --git a/test/utils/ktesting/internal/config.go b/staging/src/k8s.io/ktesting/internal/config.go similarity index 100% rename from test/utils/ktesting/internal/config.go rename to staging/src/k8s.io/ktesting/internal/config.go diff --git a/test/utils/ktesting/internal/synctestinit/synctestinit_test.go b/staging/src/k8s.io/ktesting/internal/synctestinit/synctestinit_test.go similarity index 96% rename from test/utils/ktesting/internal/synctestinit/synctestinit_test.go rename to staging/src/k8s.io/ktesting/internal/synctestinit/synctestinit_test.go index fba2c01ef7c..1f5efcddb0e 100644 --- a/test/utils/ktesting/internal/synctestinit/synctestinit_test.go +++ b/staging/src/k8s.io/ktesting/internal/synctestinit/synctestinit_test.go @@ -20,7 +20,7 @@ import ( "testing" "testing/synctest" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // TestSyncTestInit matches the corresponding test in the core package. It diff --git a/test/utils/ktesting/ktesting.go b/staging/src/k8s.io/ktesting/ktesting.go similarity index 97% rename from test/utils/ktesting/ktesting.go rename to staging/src/k8s.io/ktesting/ktesting.go index 5e2c5d588c1..6981d3dd23b 100644 --- a/test/utils/ktesting/ktesting.go +++ b/staging/src/k8s.io/ktesting/ktesting.go @@ -24,7 +24,7 @@ import ( "testing" "k8s.io/klog/v2" - _ "k8s.io/kubernetes/test/utils/ktesting/format" // Activate YAML format in Gomega. + _ "k8s.io/ktesting/format" // Activate YAML format in Gomega. ) var klogVFlag *flag.Flag diff --git a/test/utils/ktesting/ktesting_test.go b/staging/src/k8s.io/ktesting/ktesting_test.go similarity index 100% rename from test/utils/ktesting/ktesting_test.go rename to staging/src/k8s.io/ktesting/ktesting_test.go diff --git a/test/utils/ktesting/main_test.go b/staging/src/k8s.io/ktesting/main_test.go similarity index 100% rename from test/utils/ktesting/main_test.go rename to staging/src/k8s.io/ktesting/main_test.go diff --git a/test/utils/ktesting/signals.go b/staging/src/k8s.io/ktesting/signals.go similarity index 100% rename from test/utils/ktesting/signals.go rename to staging/src/k8s.io/ktesting/signals.go diff --git a/test/utils/ktesting/signals_non_win.go b/staging/src/k8s.io/ktesting/signals_non_win.go similarity index 100% rename from test/utils/ktesting/signals_non_win.go rename to staging/src/k8s.io/ktesting/signals_non_win.go diff --git a/test/utils/ktesting/signals_win.go b/staging/src/k8s.io/ktesting/signals_win.go similarity index 100% rename from test/utils/ktesting/signals_win.go rename to staging/src/k8s.io/ktesting/signals_win.go diff --git a/test/utils/ktesting/tcontext.go b/staging/src/k8s.io/ktesting/tcontext.go similarity index 99% rename from test/utils/ktesting/tcontext.go rename to staging/src/k8s.io/ktesting/tcontext.go index cc5b1859042..d157f76dcca 100644 --- a/test/utils/ktesting/tcontext.go +++ b/staging/src/k8s.io/ktesting/tcontext.go @@ -29,9 +29,9 @@ import ( "k8s.io/klog/v2" "k8s.io/klog/v2/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/format" - "k8s.io/kubernetes/test/utils/ktesting/initoption" - "k8s.io/kubernetes/test/utils/ktesting/internal" + "k8s.io/ktesting/format" + "k8s.io/ktesting/initoption" + "k8s.io/ktesting/internal" ) // Underlier is the additional interface implemented by the per-test LogSink diff --git a/test/utils/ktesting/tcontext_internal_test.go b/staging/src/k8s.io/ktesting/tcontext_internal_test.go similarity index 99% rename from test/utils/ktesting/tcontext_internal_test.go rename to staging/src/k8s.io/ktesting/tcontext_internal_test.go index bfec57cc5bb..c372d6ba34b 100644 --- a/test/utils/ktesting/tcontext_internal_test.go +++ b/staging/src/k8s.io/ktesting/tcontext_internal_test.go @@ -32,7 +32,7 @@ import ( "github.com/onsi/gomega" "go.uber.org/goleak" - "k8s.io/kubernetes/test/utils/ktesting/initoption" + "k8s.io/ktesting/initoption" ) func TestSyncTestInit(t *testing.T) { diff --git a/test/utils/ktesting/tcontext_test.go b/staging/src/k8s.io/ktesting/tcontext_test.go similarity index 97% rename from test/utils/ktesting/tcontext_test.go rename to staging/src/k8s.io/ktesting/tcontext_test.go index e59f766c522..57c1b859732 100644 --- a/test/utils/ktesting/tcontext_test.go +++ b/staging/src/k8s.io/ktesting/tcontext_test.go @@ -27,18 +27,16 @@ import ( "github.com/onsi/gomega" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) func TestCancelManual(t *testing.T) { tCtx := ktesting.Init(t) var wg sync.WaitGroup - wg.Add(1) - go func() { - defer wg.Done() + wg.Go(func() { // Blocks until tCtx.Cancel is called below. <-tCtx.Done() - }() + }) tCtx.Cancel("manually canceled") wg.Wait() } @@ -49,12 +47,10 @@ func TestCancelAutomatic(t *testing.T) { // gets invoked last. t.Cleanup(wg.Wait) tCtx := ktesting.Init(t) - wg.Add(1) - go func() { - defer wg.Done() + wg.Go(func() { // Blocks until the context gets canceled automatically. <-tCtx.Done() - }() + }) } func TestCancelBeforeCleanup(t *testing.T) { diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 0162002b3c4..3a622866aeb 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -117,5 +117,6 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/kube-aggregator/go.sum b/staging/src/k8s.io/kube-aggregator/go.sum index 0667541fef0..26d3ea3d975 100644 --- a/staging/src/k8s.io/kube-aggregator/go.sum +++ b/staging/src/k8s.io/kube-aggregator/go.sum @@ -124,6 +124,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/kube-scheduler/go.mod b/staging/src/k8s.io/kube-scheduler/go.mod index 25b96e538ac..38d285af1c5 100644 --- a/staging/src/k8s.io/kube-scheduler/go.mod +++ b/staging/src/k8s.io/kube-scheduler/go.mod @@ -60,6 +60,7 @@ replace ( k8s.io/component-base => ../component-base k8s.io/component-helpers => ../component-helpers k8s.io/dynamic-resource-allocation => ../dynamic-resource-allocation + k8s.io/ktesting => ../ktesting k8s.io/kubelet => ../kubelet k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index cfdba29f5be..be702a5f498 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -99,6 +99,7 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/component-helpers => ../component-helpers + k8s.io/ktesting => ../ktesting k8s.io/metrics => ../metrics k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index 871c4d97397..ad043737d1a 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -60,5 +60,6 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/code-generator => ../code-generator + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/metrics/go.sum b/staging/src/k8s.io/metrics/go.sum index 44cb466d669..4120d5f55b0 100644 --- a/staging/src/k8s.io/metrics/go.sum +++ b/staging/src/k8s.io/metrics/go.sum @@ -40,6 +40,7 @@ github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVO github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/pod-security-admission/go.mod b/staging/src/k8s.io/pod-security-admission/go.mod index 8157881cab4..6a60e8376a6 100644 --- a/staging/src/k8s.io/pod-security-admission/go.mod +++ b/staging/src/k8s.io/pod-security-admission/go.mod @@ -110,5 +110,6 @@ replace ( k8s.io/client-go => ../client-go k8s.io/component-base => ../component-base k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/pod-security-admission/go.sum b/staging/src/k8s.io/pod-security-admission/go.sum index cc7db1dcdbc..0b2e8cee344 100644 --- a/staging/src/k8s.io/pod-security-admission/go.sum +++ b/staging/src/k8s.io/pod-security-admission/go.sum @@ -120,6 +120,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index 61bc49425ff..b45cfb41b45 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -114,5 +114,6 @@ replace ( k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base k8s.io/kms => ../kms + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/sample-apiserver/go.sum b/staging/src/k8s.io/sample-apiserver/go.sum index 4280bf52815..b9daad9cd20 100644 --- a/staging/src/k8s.io/sample-apiserver/go.sum +++ b/staging/src/k8s.io/sample-apiserver/go.sum @@ -121,6 +121,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/sample-cli-plugin/go.mod b/staging/src/k8s.io/sample-cli-plugin/go.mod index 97d5259348e..1c09ce75db9 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.mod +++ b/staging/src/k8s.io/sample-cli-plugin/go.mod @@ -68,5 +68,6 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/cli-runtime => ../cli-runtime k8s.io/client-go => ../client-go + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/sample-cli-plugin/go.sum b/staging/src/k8s.io/sample-cli-plugin/go.sum index abf1d839658..afb15b7dfd8 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.sum +++ b/staging/src/k8s.io/sample-cli-plugin/go.sum @@ -63,6 +63,7 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1 h1:x06SQA46+PKIUftmEujdwSEpIx8kR+M9eLYsUxeYveU= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/staging/src/k8s.io/sample-controller/go.mod b/staging/src/k8s.io/sample-controller/go.mod index ae2795edc8e..0a41bbf16ac 100644 --- a/staging/src/k8s.io/sample-controller/go.mod +++ b/staging/src/k8s.io/sample-controller/go.mod @@ -59,5 +59,6 @@ replace ( k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go k8s.io/code-generator => ../code-generator + k8s.io/ktesting => ../ktesting k8s.io/streaming => ../streaming ) diff --git a/staging/src/k8s.io/sample-controller/go.sum b/staging/src/k8s.io/sample-controller/go.sum index 3fdcf8e8cfd..0f366588ff6 100644 --- a/staging/src/k8s.io/sample-controller/go.sum +++ b/staging/src/k8s.io/sample-controller/go.sum @@ -40,6 +40,7 @@ github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVO github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 0b41a02bf70..8540783ad19 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -42,6 +42,7 @@ import ( "k8s.io/client-go/discovery" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/retry" + "k8s.io/ktesting/format" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" rbacv1helpers "k8s.io/kubernetes/pkg/apis/rbac/v1" @@ -51,7 +52,6 @@ import ( e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" imageutils "k8s.io/kubernetes/test/utils/image" - "k8s.io/kubernetes/test/utils/ktesting/format" admissionapi "k8s.io/pod-security-admission/api" samplev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1" "k8s.io/utils/ptr" diff --git a/test/e2e/apimachinery/crd_conversion_webhook.go b/test/e2e/apimachinery/crd_conversion_webhook.go index 0f8bb8d226d..7b3a88c043e 100644 --- a/test/e2e/apimachinery/crd_conversion_webhook.go +++ b/test/e2e/apimachinery/crd_conversion_webhook.go @@ -34,12 +34,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting/format" "k8s.io/kubernetes/test/e2e/framework" e2edeployment "k8s.io/kubernetes/test/e2e/framework/deployment" e2eendpointslice "k8s.io/kubernetes/test/e2e/framework/endpointslice" "k8s.io/kubernetes/test/utils/crd" imageutils "k8s.io/kubernetes/test/utils/image" - "k8s.io/kubernetes/test/utils/ktesting/format" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/utils/ptr" diff --git a/test/e2e/apimachinery/discovery.go b/test/e2e/apimachinery/discovery.go index d756f69a7df..4399d27a4cc 100644 --- a/test/e2e/apimachinery/discovery.go +++ b/test/e2e/apimachinery/discovery.go @@ -27,10 +27,10 @@ import ( utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apiserver/pkg/endpoints/discovery" clientdiscovery "k8s.io/client-go/discovery" + "k8s.io/ktesting/format" "k8s.io/kubernetes/test/e2e/framework" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/utils/crd" - "k8s.io/kubernetes/test/utils/ktesting/format" admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/apimachinery/resource_quota.go b/test/e2e/apimachinery/resource_quota.go index 1bcb21361e4..50f0c06e42d 100644 --- a/test/e2e/apimachinery/resource_quota.go +++ b/test/e2e/apimachinery/resource_quota.go @@ -47,6 +47,7 @@ import ( "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" "k8s.io/client-go/util/retry" + "k8s.io/ktesting/format" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/quota/v1/evaluator/core" apimachineryutils "k8s.io/kubernetes/test/e2e/common/apimachinery" @@ -55,7 +56,6 @@ import ( e2epv "k8s.io/kubernetes/test/e2e/framework/pv" "k8s.io/kubernetes/test/utils/crd" imageutils "k8s.io/kubernetes/test/utils/image" - "k8s.io/kubernetes/test/utils/ktesting/format" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/utils/ptr" diff --git a/test/e2e/dra/deploy_device_plugin.go b/test/e2e/dra/deploy_device_plugin.go index 691f1970d2a..31dfcc0e808 100644 --- a/test/e2e/dra/deploy_device_plugin.go +++ b/test/e2e/dra/deploy_device_plugin.go @@ -22,10 +22,10 @@ import ( appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" "k8s.io/kubernetes/test/e2e/storage/utils" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // deployDevicePlugin deploys https://github.com/kubernetes/kubernetes/tree/111a2a0d2dfe13639724506f674bc4f342ccfbab/test/images/sample-device-plugin diff --git a/test/e2e/dra/dra.go b/test/e2e/dra/dra.go index 9110e2fca1e..79134729def 100644 --- a/test/e2e/dra/dra.go +++ b/test/e2e/dra/dra.go @@ -46,6 +46,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" applyv1 "k8s.io/client-go/applyconfigurations/core/v1" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" metadata "k8s.io/dynamic-resource-allocation/api/metadata" @@ -67,7 +68,6 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" dratest "k8s.io/kubernetes/test/integration/dra" - "k8s.io/kubernetes/test/utils/client-go/ktesting" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/utils/ptr" ) diff --git a/test/e2e/dra/dra_node_allocatable_resources.go b/test/e2e/dra/dra_node_allocatable_resources.go index 6e80ec4e423..c8903d5c41a 100644 --- a/test/e2e/dra/dra_node_allocatable_resources.go +++ b/test/e2e/dra/dra_node_allocatable_resources.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" admissionapi "k8s.io/pod-security-admission/api" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" "k8s.io/kubernetes/pkg/features" @@ -42,7 +43,6 @@ import ( "k8s.io/kubernetes/test/e2e/feature" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) type draContainerInfo struct { diff --git a/test/e2e/dra/utils/builder.go b/test/e2e/dra/utils/builder.go index 01db90ae89c..a3d816e55e8 100644 --- a/test/e2e/dra/utils/builder.go +++ b/test/e2e/dra/utils/builder.go @@ -39,6 +39,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/ktesting" cgoresource "k8s.io/client-go/kubernetes/typed/resource/v1" draclient "k8s.io/dynamic-resource-allocation/client" "k8s.io/dynamic-resource-allocation/resourceslice" @@ -46,7 +47,6 @@ import ( "k8s.io/kubernetes/test/e2e/dra/test-driver/app" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/utils/ptr" ) diff --git a/test/e2e/dra/utils/deploy.go b/test/e2e/dra/utils/deploy.go index 1e21d34da0c..80ceaa4e42c 100644 --- a/test/e2e/dra/utils/deploy.go +++ b/test/e2e/dra/utils/deploy.go @@ -57,6 +57,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/client-go/discovery/cached/memory" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" cgoresource "k8s.io/client-go/kubernetes/typed/resource/v1" @@ -78,7 +79,6 @@ import ( e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/storage/drivers/proxy" "k8s.io/kubernetes/test/e2e/storage/utils" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/kubernetes/test/utils/image" "k8s.io/utils/clock" "k8s.io/utils/ptr" diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index d13fae090b2..858e2202e52 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -65,10 +65,10 @@ import ( _ "k8s.io/kubernetes/test/e2e/windows" // reconfigure framework + _ "k8s.io/ktesting/format" _ "k8s.io/kubernetes/test/e2e/framework/debug/init" _ "k8s.io/kubernetes/test/e2e/framework/metrics/init" _ "k8s.io/kubernetes/test/e2e/framework/node/init" - _ "k8s.io/kubernetes/test/utils/ktesting/format" ) // handleFlags sets up all flags and parses the command line. diff --git a/test/e2e/framework/conformance/conformance.go b/test/e2e/framework/conformance/conformance.go index 76c5e0158ce..4c8aadc47ed 100644 --- a/test/e2e/framework/conformance/conformance.go +++ b/test/e2e/framework/conformance/conformance.go @@ -43,9 +43,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + "k8s.io/ktesting/format" apimachineryutils "k8s.io/kubernetes/test/e2e/common/apimachinery" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/ktesting/format" "k8s.io/utils/ptr" k8sjson "sigs.k8s.io/json" ) diff --git a/test/e2e/framework/daemonset/fixtures.go b/test/e2e/framework/daemonset/fixtures.go index dffeb1b1793..3adea0130a4 100644 --- a/test/e2e/framework/daemonset/fixtures.go +++ b/test/e2e/framework/daemonset/fixtures.go @@ -25,10 +25,10 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting/format" "k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubernetes/pkg/controller/daemon" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/ktesting/format" ) func NewDaemonSet(dsName, image string, labels map[string]string, volumes []v1.Volume, mounts []v1.VolumeMount, ports []v1.ContainerPort, args ...string) *appsv1.DaemonSet { diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index dcdba00b022..58274fb1c47 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -42,12 +42,12 @@ import ( "k8s.io/client-go/discovery" cacheddiscovery "k8s.io/client-go/discovery/cached/memory" "k8s.io/client-go/dynamic" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/restmapper" scaleclient "k8s.io/client-go/scale" - "k8s.io/kubernetes/test/utils/client-go/ktesting" admissionapi "k8s.io/pod-security-admission/api" "github.com/go-logr/logr" diff --git a/test/e2e/framework/internal/unittests/cleanup/cleanup_test.go b/test/e2e/framework/internal/unittests/cleanup/cleanup_test.go index b76aae5f6f5..1c05067259b 100644 --- a/test/e2e/framework/internal/unittests/cleanup/cleanup_test.go +++ b/test/e2e/framework/internal/unittests/cleanup/cleanup_test.go @@ -34,11 +34,11 @@ import ( "github.com/onsi/ginkgo/v2/reporters" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/klog/v2" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/internal/output" testapiserver "k8s.io/kubernetes/test/utils/apiserver" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // The line number of the following code is checked in TestFailureOutput below. diff --git a/test/e2e/framework/job/wait.go b/test/e2e/framework/job/wait.go index 2efbff60ab4..fce3e3503f8 100644 --- a/test/e2e/framework/job/wait.go +++ b/test/e2e/framework/job/wait.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + "k8s.io/ktesting/format" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/ktesting/format" "k8s.io/utils/ptr" ) diff --git a/test/e2e/framework/pod/exec_util.go b/test/e2e/framework/pod/exec_util.go index 0913135cc01..766063d3991 100644 --- a/test/e2e/framework/pod/exec_util.go +++ b/test/e2e/framework/pod/exec_util.go @@ -28,11 +28,11 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes/scheme" clientexec "k8s.io/client-go/util/exec" "k8s.io/kubectl/pkg/cmd/exec" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // ExecOptions controls how [Exec] runs a command inside a pod container. diff --git a/test/e2e/framework/pod/wait.go b/test/e2e/framework/pod/wait.go index 7cff06ee963..3dcd172ee57 100644 --- a/test/e2e/framework/pod/wait.go +++ b/test/e2e/framework/pod/wait.go @@ -36,10 +36,10 @@ import ( "k8s.io/apimachinery/pkg/labels" apitypes "k8s.io/apimachinery/pkg/types" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting/format" "k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/ktesting/format" ) const ( diff --git a/test/e2e/framework/pod/wait_test.go b/test/e2e/framework/pod/wait_test.go index 6b02975f0b1..13e913eba97 100644 --- a/test/e2e/framework/pod/wait_test.go +++ b/test/e2e/framework/pod/wait_test.go @@ -31,10 +31,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + _ "k8s.io/ktesting/format" // activate YAML object dumps "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/internal/output" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - _ "k8s.io/kubernetes/test/utils/ktesting/format" // activate YAML object dumps ) // The line number of the following code is checked in TestFailureOutput below. diff --git a/test/e2e/framework/pv/wait.go b/test/e2e/framework/pv/wait.go index d954fb53d13..09161d89f1f 100644 --- a/test/e2e/framework/pv/wait.go +++ b/test/e2e/framework/pv/wait.go @@ -24,8 +24,8 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting/format" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/ktesting/format" "k8s.io/utils/ptr" ) diff --git a/test/e2e/invariants/logcheck/logcheck_test.go b/test/e2e/invariants/logcheck/logcheck_test.go index f8e68ec1475..33e6cf9c082 100644 --- a/test/e2e/invariants/logcheck/logcheck_test.go +++ b/test/e2e/invariants/logcheck/logcheck_test.go @@ -40,8 +40,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/rest" + "k8s.io/ktesting" "k8s.io/kubernetes/test/e2e/storage/podlogs" - "k8s.io/kubernetes/test/utils/ktesting" ) type containerLogs struct { diff --git a/test/e2e/network/traffic_distribution.go b/test/e2e/network/traffic_distribution.go index bb87123d4a6..a5122cea5a6 100644 --- a/test/e2e/network/traffic_distribution.go +++ b/test/e2e/network/traffic_distribution.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting/format" "k8s.io/kubernetes/test/e2e/framework" e2eendpointslice "k8s.io/kubernetes/test/e2e/framework/endpointslice" e2enode "k8s.io/kubernetes/test/e2e/framework/node" @@ -36,7 +37,6 @@ import ( e2eservice "k8s.io/kubernetes/test/e2e/framework/service" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/network/common" - "k8s.io/kubernetes/test/utils/ktesting/format" admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/storage/csimock/base.go b/test/e2e/storage/csimock/base.go index 1c36310940b..e2f35e15228 100644 --- a/test/e2e/storage/csimock/base.go +++ b/test/e2e/storage/csimock/base.go @@ -42,6 +42,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting/format" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epv "k8s.io/kubernetes/test/e2e/framework/pv" @@ -50,7 +51,6 @@ import ( "k8s.io/kubernetes/test/e2e/storage/testsuites" "k8s.io/kubernetes/test/e2e/storage/utils" imageutils "k8s.io/kubernetes/test/utils/image" - "k8s.io/kubernetes/test/utils/ktesting/format" "k8s.io/utils/ptr" ) diff --git a/test/e2e/storage/drivers/proxy/io.go b/test/e2e/storage/drivers/proxy/io.go index dd5d1012e1f..8bc9b53c521 100644 --- a/test/e2e/storage/drivers/proxy/io.go +++ b/test/e2e/storage/drivers/proxy/io.go @@ -21,10 +21,10 @@ import ( "fmt" "io" + "k8s.io/client-go/ktesting" "k8s.io/klog/v2" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) type PodDirIO struct { diff --git a/test/e2e/storage/utils/create.go b/test/e2e/storage/utils/create.go index 1c6ed88f403..537e4ec6b26 100644 --- a/test/e2e/storage/utils/create.go +++ b/test/e2e/storage/utils/create.go @@ -33,11 +33,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/test/e2e/framework" e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles" - "k8s.io/kubernetes/test/utils/client-go/ktesting" imageutils "k8s.io/kubernetes/test/utils/image" ) diff --git a/test/e2e/windows/security_context.go b/test/e2e/windows/security_context.go index 681c7979990..080dd258db2 100644 --- a/test/e2e/windows/security_context.go +++ b/test/e2e/windows/security_context.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" + "k8s.io/ktesting/format" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/test/e2e/feature" "k8s.io/kubernetes/test/e2e/framework" @@ -38,7 +39,6 @@ import ( e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" - "k8s.io/kubernetes/test/utils/ktesting/format" admissionapi "k8s.io/pod-security-admission/api" "k8s.io/utils/ptr" ) diff --git a/test/e2e_dra/compatibilitygroups_test.go b/test/e2e_dra/compatibilitygroups_test.go index 1e6e720852a..0c064c979ff 100644 --- a/test/e2e_dra/compatibilitygroups_test.go +++ b/test/e2e_dra/compatibilitygroups_test.go @@ -23,10 +23,10 @@ import ( resourceapi "k8s.io/api/resource/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // compatibilityGroupsSharedCounters is one counter set with room for four devices diff --git a/test/e2e_dra/coredra_test.go b/test/e2e_dra/coredra_test.go index ab194ee0f04..c10d14c6aae 100644 --- a/test/e2e_dra/coredra_test.go +++ b/test/e2e_dra/coredra_test.go @@ -23,10 +23,10 @@ import ( v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func coreDRAResources(nodes *drautils.Nodes) map[string]resourceslice.DriverResources { diff --git a/test/e2e_dra/devicetaints_test.go b/test/e2e_dra/devicetaints_test.go index 194c600b7a5..26c155e7d32 100644 --- a/test/e2e_dra/devicetaints_test.go +++ b/test/e2e_dra/devicetaints_test.go @@ -23,9 +23,9 @@ import ( resourceapi "k8s.io/api/resource/v1" resourcealpha "k8s.io/api/resource/v1alpha3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/e2e_dra/extendedresources_test.go b/test/e2e_dra/extendedresources_test.go index fecab754999..3f05f4f31e0 100644 --- a/test/e2e_dra/extendedresources_test.go +++ b/test/e2e_dra/extendedresources_test.go @@ -26,12 +26,12 @@ import ( resourceapi "k8s.io/api/resource/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" "k8s.io/kubernetes/test/e2e/dra/test-driver/app" drautils "k8s.io/kubernetes/test/e2e/dra/utils" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) const ( diff --git a/test/e2e_dra/featuregatecycle_test.go b/test/e2e_dra/featuregatecycle_test.go index a422c7b90b1..cb79b339787 100644 --- a/test/e2e_dra/featuregatecycle_test.go +++ b/test/e2e_dra/featuregatecycle_test.go @@ -23,12 +23,12 @@ import ( "github.com/onsi/gomega" + "k8s.io/client-go/ktesting" restclient "k8s.io/client-go/rest" "k8s.io/dynamic-resource-allocation/resourceslice" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/kubernetes/test/utils/localupcluster" ) diff --git a/test/e2e_dra/partitionabledevices_test.go b/test/e2e_dra/partitionabledevices_test.go index 0aa1199c989..430d43e8e00 100644 --- a/test/e2e_dra/partitionabledevices_test.go +++ b/test/e2e_dra/partitionabledevices_test.go @@ -24,10 +24,10 @@ import ( resourceapi "k8s.io/api/resource/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // partitionableDeviceResources tests the DRAPartitionableDevices feature across upgrade/downgrade. diff --git a/test/e2e_dra/poolnamefieldselector_test.go b/test/e2e_dra/poolnamefieldselector_test.go index e48b59c7cc5..13a61240e11 100644 --- a/test/e2e_dra/poolnamefieldselector_test.go +++ b/test/e2e_dra/poolnamefieldselector_test.go @@ -22,9 +22,9 @@ import ( resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" drautils "k8s.io/kubernetes/test/e2e/dra/utils" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) const poolNameFieldSelectorFallbackPool = "pool-name-field-selector-fallback" diff --git a/test/e2e_dra/resourceclaimstatus_test.go b/test/e2e_dra/resourceclaimstatus_test.go index 99044fbec39..fbf5f11f1da 100644 --- a/test/e2e_dra/resourceclaimstatus_test.go +++ b/test/e2e_dra/resourceclaimstatus_test.go @@ -29,9 +29,9 @@ import ( apiruntime "k8s.io/apimachinery/pkg/runtime" resourceapiac "k8s.io/client-go/applyconfigurations/resource/v1" resourceapiacv1beta2 "k8s.io/client-go/applyconfigurations/resource/v1beta2" + "k8s.io/client-go/ktesting" draapiv1beta2 "k8s.io/dynamic-resource-allocation/api/v1beta2" drautils "k8s.io/kubernetes/test/e2e/dra/utils" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // resourceClaimDeviceStatus corresponds to testResourceClaimDeviceStatus in test/integration/dra. diff --git a/test/e2e_dra/upgradedowngrade_test.go b/test/e2e_dra/upgradedowngrade_test.go index 46d4df2c89f..dd14ce88369 100644 --- a/test/e2e_dra/upgradedowngrade_test.go +++ b/test/e2e_dra/upgradedowngrade_test.go @@ -37,13 +37,13 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/version" + "k8s.io/client-go/ktesting" restclient "k8s.io/client-go/rest" "k8s.io/dynamic-resource-allocation/resourceslice" "k8s.io/kubernetes/cmd/kubeadm/app/util/errors" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2etestfiles "k8s.io/kubernetes/test/e2e/framework/testfiles" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/kubernetes/test/utils/localupcluster" ) diff --git a/test/e2e_dra/workloadresourceclaims_test.go b/test/e2e_dra/workloadresourceclaims_test.go index b49e5704963..f3167a78eaa 100644 --- a/test/e2e_dra/workloadresourceclaims_test.go +++ b/test/e2e_dra/workloadresourceclaims_test.go @@ -23,9 +23,9 @@ import ( resourceapi "k8s.io/api/resource/v1" schedulingapi "k8s.io/api/scheduling/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" drautils "k8s.io/kubernetes/test/e2e/dra/utils" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func workloadResourceClaimsDriverResources(nodes *drautils.Nodes) map[string]resourceslice.DriverResources { diff --git a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go index 0464e193127..d4b4f4480b7 100644 --- a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go +++ b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go @@ -30,10 +30,10 @@ import ( e2econfig "k8s.io/kubernetes/test/e2e/framework/config" // reconfigure framework + _ "k8s.io/ktesting/format" _ "k8s.io/kubernetes/test/e2e/framework/debug/init" _ "k8s.io/kubernetes/test/e2e/framework/metrics/init" _ "k8s.io/kubernetes/test/e2e/framework/node/init" - _ "k8s.io/kubernetes/test/utils/ktesting/format" ) func TestMain(m *testing.M) { diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go index c204609008d..0952b8a5aa0 100644 --- a/test/e2e_node/e2e_node_suite_test.go +++ b/test/e2e_node/e2e_node_suite_test.go @@ -61,11 +61,11 @@ import ( _ "k8s.io/kubernetes/test/e2e/feature" // reconfigure framework + "k8s.io/ktesting" + _ "k8s.io/ktesting/format" _ "k8s.io/kubernetes/test/e2e/framework/debug/init" _ "k8s.io/kubernetes/test/e2e/framework/metrics/init" _ "k8s.io/kubernetes/test/e2e/framework/node/init" - "k8s.io/kubernetes/test/utils/ktesting" - _ "k8s.io/kubernetes/test/utils/ktesting/format" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" diff --git a/test/e2e_node/services/internal_services.go b/test/e2e_node/services/internal_services.go index f2254d4ff7e..da0de1775f2 100644 --- a/test/e2e_node/services/internal_services.go +++ b/test/e2e_node/services/internal_services.go @@ -24,8 +24,8 @@ import ( etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/apiserver/pkg/storage/storagebackend" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/ktesting" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/klog/v2" ) diff --git a/test/e2e_node_windows/e2e_node_suite_test.go b/test/e2e_node_windows/e2e_node_suite_test.go index 948e11ff588..8c8911d3cc8 100644 --- a/test/e2e_node_windows/e2e_node_suite_test.go +++ b/test/e2e_node_windows/e2e_node_suite_test.go @@ -50,10 +50,10 @@ import ( _ "k8s.io/kubernetes/test/e2e/feature" // reconfigure framework + "k8s.io/ktesting" _ "k8s.io/kubernetes/test/e2e/framework/debug/init" _ "k8s.io/kubernetes/test/e2e/framework/metrics/init" _ "k8s.io/kubernetes/test/e2e/framework/node/init" - "k8s.io/kubernetes/test/utils/ktesting" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" diff --git a/test/e2e_node_windows/services/internal_services.go b/test/e2e_node_windows/services/internal_services.go index facd74ebdef..8032642088b 100644 --- a/test/e2e_node_windows/services/internal_services.go +++ b/test/e2e_node_windows/services/internal_services.go @@ -26,8 +26,8 @@ import ( etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing" "k8s.io/apiserver/pkg/storage/storagebackend" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/ktesting" "k8s.io/kubernetes/test/e2e/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/klog/v2" ) diff --git a/test/integration/apimachinery/apply/apply_test.go b/test/integration/apimachinery/apply/apply_test.go index 778be9eab25..e8cb9373fdc 100644 --- a/test/integration/apimachinery/apply/apply_test.go +++ b/test/integration/apimachinery/apply/apply_test.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/testapigroup/install" testapigroupv1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -36,7 +37,6 @@ import ( controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver" testapigrouprest "k8s.io/kubernetes/pkg/registry/testapigroup/rest" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" "sigs.k8s.io/yaml" ) diff --git a/test/integration/apimachinery/watch_restart_test.go b/test/integration/apimachinery/watch_restart_test.go index f82cab76123..5c45c68a7d2 100644 --- a/test/integration/apimachinery/watch_restart_test.go +++ b/test/integration/apimachinery/watch_restart_test.go @@ -33,9 +33,9 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func noopNormalization(output []string) []string { diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index c2b1f025f98..a65cb1f30a0 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/test/integration/apiserver/apiserver_test.go @@ -76,6 +76,7 @@ import ( "k8s.io/client-go/tools/pager" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controlplane" @@ -83,7 +84,6 @@ import ( "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/apiserver/cel/admission_policy_test.go b/test/integration/apiserver/cel/admission_policy_test.go index 07344a6573c..ec33e8fe5c1 100644 --- a/test/integration/apiserver/cel/admission_policy_test.go +++ b/test/integration/apiserver/cel/admission_policy_test.go @@ -31,12 +31,12 @@ import ( apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/ktesting" apiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/apis/admissionregistration" admissionregistrationv1apis "k8s.io/kubernetes/pkg/apis/admissionregistration/v1" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/test/integration/apiserver/certreload/certreload_test.go b/test/integration/apiserver/certreload/certreload_test.go index 67f82a1355d..c8ddfc7973a 100644 --- a/test/integration/apiserver/certreload/certreload_test.go +++ b/test/integration/apiserver/certreload/certreload_test.go @@ -41,9 +41,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/util/cert" "k8s.io/component-base/cli/flag" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) type caWithClient struct { diff --git a/test/integration/apiserver/flowcontrol/concurrency_test.go b/test/integration/apiserver/flowcontrol/concurrency_test.go index eac2090a43f..d99c19192ad 100644 --- a/test/integration/apiserver/flowcontrol/concurrency_test.go +++ b/test/integration/apiserver/flowcontrol/concurrency_test.go @@ -33,9 +33,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/apiserver/flowcontrol/concurrency_util_test.go b/test/integration/apiserver/flowcontrol/concurrency_util_test.go index 7942e1bf632..772aa510fe6 100644 --- a/test/integration/apiserver/flowcontrol/concurrency_util_test.go +++ b/test/integration/apiserver/flowcontrol/concurrency_util_test.go @@ -32,10 +32,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authorization/authorizer" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/apiserver/health_handlers_test.go b/test/integration/apiserver/health_handlers_test.go index 1225d682d46..25539b7def1 100644 --- a/test/integration/apiserver/health_handlers_test.go +++ b/test/integration/apiserver/health_handlers_test.go @@ -22,7 +22,7 @@ import ( "testing" kubernetes "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // TestHealthHandler tests /health?verbose with etcd overrides servers. diff --git a/test/integration/apiserver/max_json_patch_operations_test.go b/test/integration/apiserver/max_json_patch_operations_test.go index 3a7d6a13370..230ebd9c8c2 100644 --- a/test/integration/apiserver/max_json_patch_operations_test.go +++ b/test/integration/apiserver/max_json_patch_operations_test.go @@ -24,9 +24,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // Tests that the apiserver limits the number of operations in a json patch. diff --git a/test/integration/apiserver/max_request_body_bytes_test.go b/test/integration/apiserver/max_request_body_bytes_test.go index cc22cb4cd56..be39db14b84 100644 --- a/test/integration/apiserver/max_request_body_bytes_test.go +++ b/test/integration/apiserver/max_request_body_bytes_test.go @@ -24,8 +24,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/ktesting" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // Tests that the apiserver limits the resource size in write operations. diff --git a/test/integration/apiserver/openapi/openapi_enum_test.go b/test/integration/apiserver/openapi/openapi_enum_test.go index 8b9b1c3e02c..d944d43367f 100644 --- a/test/integration/apiserver/openapi/openapi_enum_test.go +++ b/test/integration/apiserver/openapi/openapi_enum_test.go @@ -26,12 +26,12 @@ import ( "k8s.io/apiserver/pkg/util/openapi" restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kubernetes/pkg/controlplane" generated "k8s.io/kubernetes/pkg/generated/openapi" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestEnablingOpenAPIEnumTypes(t *testing.T) { diff --git a/test/integration/apiserver/openapi/openapiv3_test.go b/test/integration/apiserver/openapi/openapiv3_test.go index 7ff718a5786..c11fb189cbe 100644 --- a/test/integration/apiserver/openapi/openapiv3_test.go +++ b/test/integration/apiserver/openapi/openapiv3_test.go @@ -34,11 +34,11 @@ import ( "k8s.io/client-go/dynamic" kubernetes "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/ktesting" "k8s.io/kube-openapi/pkg/handler3" "k8s.io/kube-openapi/pkg/spec3" apiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "sigs.k8s.io/yaml" ) diff --git a/test/integration/apiserver/peerproxy/peer_proxy_test.go b/test/integration/apiserver/peerproxy/peer_proxy_test.go index 953c4e3814e..d4a400cfcc5 100644 --- a/test/integration/apiserver/peerproxy/peer_proxy_test.go +++ b/test/integration/apiserver/peerproxy/peer_proxy_test.go @@ -45,9 +45,9 @@ import ( kastesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver" + "k8s.io/ktesting" "k8s.io/kubernetes/test/integration/framework" testutil "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPeerProxiedRequest(t *testing.T) { diff --git a/test/integration/apiserver/podlogs/podlogs_test.go b/test/integration/apiserver/podlogs/podlogs_test.go index 29c7885f8a5..6bb39e498e4 100644 --- a/test/integration/apiserver/podlogs/podlogs_test.go +++ b/test/integration/apiserver/podlogs/podlogs_test.go @@ -49,9 +49,9 @@ import ( "k8s.io/client-go/transport" certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestInsecurePodLogs(t *testing.T) { diff --git a/test/integration/apiserver/sharding_test.go b/test/integration/apiserver/sharding_test.go index a0af028d296..def7ae6fcd0 100644 --- a/test/integration/apiserver/sharding_test.go +++ b/test/integration/apiserver/sharding_test.go @@ -32,10 +32,10 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/dynamic" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // calculateShardRange divides the 64-bit hash space evenly across shards and diff --git a/test/integration/apiserver/subresource_auth_test.go b/test/integration/apiserver/subresource_auth_test.go index 4f8586d7174..b543a4ac614 100644 --- a/test/integration/apiserver/subresource_auth_test.go +++ b/test/integration/apiserver/subresource_auth_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/authutil" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // TestPodSubresourceAuth tests that the synthetic authorization check for pod subresources is working correctly. diff --git a/test/integration/apiserver/watchcache_test.go b/test/integration/apiserver/watchcache_test.go index 906b8e59d81..639242e715e 100644 --- a/test/integration/apiserver/watchcache_test.go +++ b/test/integration/apiserver/watchcache_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // setup create kube-apiserver backed up by two separate etcds, diff --git a/test/integration/auth/accessreview_test.go b/test/integration/auth/accessreview_test.go index ab119943bfc..3558c2a8ac5 100644 --- a/test/integration/auth/accessreview_test.go +++ b/test/integration/auth/accessreview_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/ktesting" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // Inject into control plane an authorizer that uses user info. diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go index 35441217dfc..78dbd49f579 100644 --- a/test/integration/auth/auth_test.go +++ b/test/integration/auth/auth_test.go @@ -76,6 +76,7 @@ import ( resttransport "k8s.io/client-go/transport" utiltesting "k8s.io/client-go/util/testing" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/apis/autoscaling" @@ -86,7 +87,6 @@ import ( "k8s.io/kubernetes/test/integration/authutil" "k8s.io/kubernetes/test/integration/framework" testutils "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/auth/bootstraptoken_test.go b/test/integration/auth/bootstraptoken_test.go index ff7521d9d1e..8518de4eb93 100644 --- a/test/integration/auth/bootstraptoken_test.go +++ b/test/integration/auth/bootstraptoken_test.go @@ -31,12 +31,12 @@ import ( "k8s.io/apiserver/pkg/authentication/request/bearertoken" "k8s.io/client-go/rest" bootstrapapi "k8s.io/cluster-bootstrap/token/api" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/bootstrap" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) type bootstrapSecrets []*corev1.Secret diff --git a/test/integration/auth/dynamic_client_test.go b/test/integration/auth/dynamic_client_test.go index f4239cee945..d52c70f9c5a 100644 --- a/test/integration/auth/dynamic_client_test.go +++ b/test/integration/auth/dynamic_client_test.go @@ -29,10 +29,10 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/controller-manager/pkg/clientbuilder" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestDynamicClientBuilder(t *testing.T) { diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 5b7b9ce1e0c..11602838c72 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -52,6 +52,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" zpagesfeatures "k8s.io/component-base/zpages/features" "k8s.io/klog/v2" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1" "k8s.io/kubernetes/pkg/controlplane" @@ -65,7 +66,6 @@ import ( rolebindingstore "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/storage" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func clientForToken(user string, rt http.RoundTripper) *http.Client { diff --git a/test/integration/auth/requestheader_test.go b/test/integration/auth/requestheader_test.go index 4654a795091..f40bf71aeaa 100644 --- a/test/integration/auth/requestheader_test.go +++ b/test/integration/auth/requestheader_test.go @@ -35,10 +35,10 @@ import ( certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration/framework" testutils "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestAuthnToKAS(t *testing.T) { diff --git a/test/integration/auth/selfsubjectreview_test.go b/test/integration/auth/selfsubjectreview_test.go index 93c068eef78..a6d32acc318 100644 --- a/test/integration/auth/selfsubjectreview_test.go +++ b/test/integration/auth/selfsubjectreview_test.go @@ -29,10 +29,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/user" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestGetsSelfAttributes(t *testing.T) { diff --git a/test/integration/auth/svcaccttoken_test.go b/test/integration/auth/svcaccttoken_test.go index 84994b92e6b..e58bc48bdf9 100644 --- a/test/integration/auth/svcaccttoken_test.go +++ b/test/integration/auth/svcaccttoken_test.go @@ -54,6 +54,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/controlplane" @@ -62,7 +63,6 @@ import ( svcacct "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" "k8s.io/kubernetes/test/integration/authutil" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/clustertrustbundles/apiserversigner_test.go b/test/integration/clustertrustbundles/apiserversigner_test.go index 67164b292f8..22fbaf822e6 100644 --- a/test/integration/clustertrustbundles/apiserversigner_test.go +++ b/test/integration/clustertrustbundles/apiserversigner_test.go @@ -39,10 +39,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" certutil "k8s.io/client-go/util/cert" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" kubecontrollermanagertesting "k8s.io/kubernetes/cmd/kube-controller-manager/app/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/kubernetes/test/utils/kubeconfig" ) diff --git a/test/integration/controlplane/synthetic_controlplane_test.go b/test/integration/controlplane/synthetic_controlplane_test.go index 12c18340065..563be12e2db 100644 --- a/test/integration/controlplane/synthetic_controlplane_test.go +++ b/test/integration/controlplane/synthetic_controlplane_test.go @@ -42,11 +42,11 @@ import ( clientset "k8s.io/client-go/kubernetes" clienttypedv1 "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/controlplane/transformation/transformation_test.go b/test/integration/controlplane/transformation/transformation_test.go index 47500bc9695..8017f1dff4b 100644 --- a/test/integration/controlplane/transformation/transformation_test.go +++ b/test/integration/controlplane/transformation/transformation_test.go @@ -48,11 +48,11 @@ import ( "k8s.io/client-go/rest" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/cronjob/cronjob_test.go b/test/integration/cronjob/cronjob_test.go index 6bf7f738ded..c3e9471e5db 100644 --- a/test/integration/cronjob/cronjob_test.go +++ b/test/integration/cronjob/cronjob_test.go @@ -30,11 +30,11 @@ import ( clientset "k8s.io/client-go/kubernetes" clientbatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1" restclient "k8s.io/client-go/rest" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/cronjob" "k8s.io/kubernetes/pkg/controller/job" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func setup(ctx context.Context, t *testing.T) (kubeapiservertesting.TearDownFunc, *cronjob.ControllerV2, *job.Controller, informers.SharedInformerFactory, clientset.Interface) { diff --git a/test/integration/daemonset/daemonset_test.go b/test/integration/daemonset/daemonset_test.go index c2af4de0470..da7d9b8fc9f 100644 --- a/test/integration/daemonset/daemonset_test.go +++ b/test/integration/daemonset/daemonset_test.go @@ -41,6 +41,7 @@ import ( "k8s.io/client-go/tools/events" "k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/retry" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" @@ -51,7 +52,6 @@ import ( labelsutil "k8s.io/kubernetes/pkg/util/labels" "k8s.io/kubernetes/test/integration/framework" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" ) var zero = int64(0) diff --git a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go index 72c8ced008e..24f9be2f459 100644 --- a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go +++ b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go @@ -23,11 +23,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/initializer" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/apis/core/helper" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestAdmission(t *testing.T) { diff --git a/test/integration/disruption/disruption_test.go b/test/integration/disruption/disruption_test.go index b39b560c5e3..93ab2da5055 100644 --- a/test/integration/disruption/disruption_test.go +++ b/test/integration/disruption/disruption_test.go @@ -51,13 +51,13 @@ import ( "k8s.io/client-go/restmapper" "k8s.io/client-go/scale" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controller/disruption" "k8s.io/kubernetes/test/integration/etcd" "k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/adminaccess.go b/test/integration/dra/adminaccess.go index 6ff47340767..9bfb3a54dec 100644 --- a/test/integration/dra/adminaccess.go +++ b/test/integration/dra/adminaccess.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/test/utils/client-go/ktesting" + "k8s.io/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/binding_conditions.go b/test/integration/dra/binding_conditions.go index 72fd176e23c..30892ffad2e 100644 --- a/test/integration/dra/binding_conditions.go +++ b/test/integration/dra/binding_conditions.go @@ -26,9 +26,9 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/client-go/util/retry" - "k8s.io/kubernetes/test/utils/client-go/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/format" + "k8s.io/ktesting/format" ) var ( diff --git a/test/integration/dra/compatibility_groups.go b/test/integration/dra/compatibility_groups.go index aec5801ff86..84d1a36da45 100644 --- a/test/integration/dra/compatibility_groups.go +++ b/test/integration/dra/compatibility_groups.go @@ -21,8 +21,8 @@ import ( resourceapi "k8s.io/api/resource/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // compatDevice describes a device to place on a shared counter set, together diff --git a/test/integration/dra/core.go b/test/integration/dra/core.go index ad79016933e..1053400cbca 100644 --- a/test/integration/dra/core.go +++ b/test/integration/dra/core.go @@ -40,6 +40,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" "k8s.io/client-go/tools/cache" "k8s.io/component-base/featuregate" "k8s.io/component-base/metrics/testutil" @@ -51,7 +52,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/derived_attributes.go b/test/integration/dra/derived_attributes.go index a9558afbd3d..750153085ac 100644 --- a/test/integration/dra/derived_attributes.go +++ b/test/integration/dra/derived_attributes.go @@ -22,8 +22,8 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func testDerivedAttributes(tCtx ktesting.TContext) { diff --git a/test/integration/dra/device_taints.go b/test/integration/dra/device_taints.go index e9181371b31..61aad359811 100644 --- a/test/integration/dra/device_taints.go +++ b/test/integration/dra/device_taints.go @@ -34,11 +34,11 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" resourceinformers "k8s.io/client-go/informers/resource/v1" + "k8s.io/client-go/ktesting" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/controller/devicetainteviction" "k8s.io/kubernetes/pkg/features" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/dra.go b/test/integration/dra/dra.go index e71b7684887..0433f82dd93 100644 --- a/test/integration/dra/dra.go +++ b/test/integration/dra/dra.go @@ -36,11 +36,13 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" "k8s.io/client-go/tools/cache" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-helpers/nodedeclaredfeatures/features/draoptionalnodeoperations" "k8s.io/klog/v2" + "k8s.io/ktesting/format" kubeschedulerconfigv1 "k8s.io/kube-scheduler/config/v1" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/resourceclaim" @@ -50,8 +52,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/client-go/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/format" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/extendedresource.go b/test/integration/dra/extendedresource.go index e5ab8f26269..8a40500f96f 100644 --- a/test/integration/dra/extendedresource.go +++ b/test/integration/dra/extendedresource.go @@ -28,8 +28,8 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func testExtendedResource(tCtx ktesting.TContext, enabled, explicit bool) { diff --git a/test/integration/dra/helpers.go b/test/integration/dra/helpers.go index a59044022f4..9ef75a8cf20 100644 --- a/test/integration/dra/helpers.go +++ b/test/integration/dra/helpers.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/ktesting" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/node_allocatable_resources.go b/test/integration/dra/node_allocatable_resources.go index aa22da812eb..f1a56782846 100644 --- a/test/integration/dra/node_allocatable_resources.go +++ b/test/integration/dra/node_allocatable_resources.go @@ -27,9 +27,9 @@ import ( resourceapi "k8s.io/api/resource/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/optional_node_operations.go b/test/integration/dra/optional_node_operations.go index 0654fa5f579..3dd1e94e139 100644 --- a/test/integration/dra/optional_node_operations.go +++ b/test/integration/dra/optional_node_operations.go @@ -25,8 +25,8 @@ import ( resourceapi "k8s.io/api/resource/v1" schedulingapi "k8s.io/api/scheduling/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // testOptionalNodeOperations verifies DRA optional node operations. diff --git a/test/integration/dra/partitionable_devices.go b/test/integration/dra/partitionable_devices.go index b4ea437409c..12220e33624 100644 --- a/test/integration/dra/partitionable_devices.go +++ b/test/integration/dra/partitionable_devices.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func testPartitionableDevices(tCtx ktesting.TContext, enabled bool) { diff --git a/test/integration/dra/pod_group.go b/test/integration/dra/pod_group.go index 87e0691d318..1b856c85b9f 100644 --- a/test/integration/dra/pod_group.go +++ b/test/integration/dra/pod_group.go @@ -24,8 +24,8 @@ import ( v1 "k8s.io/api/core/v1" schedulingapi "k8s.io/api/scheduling/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func testPodGroup(tCtx ktesting.TContext) { diff --git a/test/integration/dra/prioritizedlist.go b/test/integration/dra/prioritizedlist.go index ab9e94d6d90..9239058581a 100644 --- a/test/integration/dra/prioritizedlist.go +++ b/test/integration/dra/prioritizedlist.go @@ -28,8 +28,8 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func testPrioritizedList(tCtx ktesting.TContext, enabled bool) { diff --git a/test/integration/dra/resourceclaim.go b/test/integration/dra/resourceclaim.go index 4f2a3431b0f..8f7acad6667 100644 --- a/test/integration/dra/resourceclaim.go +++ b/test/integration/dra/resourceclaim.go @@ -25,10 +25,10 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/klog/v2" drautils "k8s.io/kubernetes/test/e2e/dra/utils" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/resourceclaimstatus.go b/test/integration/dra/resourceclaimstatus.go index 0e7cf97aae1..c3f51fc7f6d 100644 --- a/test/integration/dra/resourceclaimstatus.go +++ b/test/integration/dra/resourceclaimstatus.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" resourceapiac "k8s.io/client-go/applyconfigurations/resource/v1" - "k8s.io/kubernetes/test/utils/client-go/ktesting" + "k8s.io/client-go/ktesting" ) // testResourceClaimDeviceStatus creates a ResourceClaim with an invalid device (not allocated device) diff --git a/test/integration/dra/resourcepoolstatusrequest_test.go b/test/integration/dra/resourcepoolstatusrequest_test.go index 936827ef65b..372b14699bc 100644 --- a/test/integration/dra/resourcepoolstatusrequest_test.go +++ b/test/integration/dra/resourcepoolstatusrequest_test.go @@ -31,6 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" @@ -38,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/controller/resourcepoolstatusrequest" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/dra/resourceslicecontroller.go b/test/integration/dra/resourceslicecontroller.go index 9737f5ccaff..edd876092ae 100644 --- a/test/integration/dra/resourceslicecontroller.go +++ b/test/integration/dra/resourceslicecontroller.go @@ -26,8 +26,8 @@ import ( resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/resourceslice" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // TestCreateResourceSlices uses the ResourceSlice controller to create slices. diff --git a/test/integration/dra/uses_all_resources.go b/test/integration/dra/uses_all_resources.go index 1218b44c3b0..841d3b71140 100644 --- a/test/integration/dra/uses_all_resources.go +++ b/test/integration/dra/uses_all_resources.go @@ -25,10 +25,10 @@ import ( v1 "k8s.io/api/core/v1" resourceapi "k8s.io/api/resource/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/ktesting" "k8s.io/dynamic-resource-allocation/structured" "k8s.io/klog/v2" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func testUsesAllResources(tCtx ktesting.TContext) { diff --git a/test/integration/dra/workload_resource_claims.go b/test/integration/dra/workload_resource_claims.go index d8208c9bbac..227d604552e 100644 --- a/test/integration/dra/workload_resource_claims.go +++ b/test/integration/dra/workload_resource_claims.go @@ -28,8 +28,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/ktesting" st "k8s.io/kubernetes/pkg/scheduler/testing" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // testWorkloadResourceClaims creates a PodGroup with resource claims and a diff --git a/test/integration/dualstack/dualstack_endpoints_test.go b/test/integration/dualstack/dualstack_endpoints_test.go index eeb8f7a00b6..54aef2badbd 100644 --- a/test/integration/dualstack/dualstack_endpoints_test.go +++ b/test/integration/dualstack/dualstack_endpoints_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/endpointslice" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestDualStackEndpoints(t *testing.T) { diff --git a/test/integration/dualstack/dualstack_test.go b/test/integration/dualstack/dualstack_test.go index 24f477abe1e..9c33552b8c0 100644 --- a/test/integration/dualstack/dualstack_test.go +++ b/test/integration/dualstack/dualstack_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" ) diff --git a/test/integration/endpoints/endpoints_test.go b/test/integration/endpoints/endpoints_test.go index 034337c1a47..eb591ac925e 100644 --- a/test/integration/endpoints/endpoints_test.go +++ b/test/integration/endpoints/endpoints_test.go @@ -32,10 +32,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" ) diff --git a/test/integration/endpointslice/endpointslice_test.go b/test/integration/endpointslice/endpointslice_test.go index 2aed66946da..2dc7de152ee 100644 --- a/test/integration/endpointslice/endpointslice_test.go +++ b/test/integration/endpointslice/endpointslice_test.go @@ -29,11 +29,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/endpointslice" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // TestEndpointsControllersLabelSemantics tests that the corresponding endpoints controller diff --git a/test/integration/endpointslice/endpointslicemirroring_test.go b/test/integration/endpointslice/endpointslicemirroring_test.go index 9608c332263..52a945c405b 100644 --- a/test/integration/endpointslice/endpointslicemirroring_test.go +++ b/test/integration/endpointslice/endpointslicemirroring_test.go @@ -30,12 +30,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/endpointslice" "k8s.io/kubernetes/pkg/controller/endpointslicemirroring" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestEndpointSliceMirroring(t *testing.T) { diff --git a/test/integration/endpointslice/endpointsliceterminating_test.go b/test/integration/endpointslice/endpointsliceterminating_test.go index 448096bee3b..5db9d1dde72 100644 --- a/test/integration/endpointslice/endpointsliceterminating_test.go +++ b/test/integration/endpointslice/endpointsliceterminating_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpointslice" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go index c5977c29135..219668ed235 100644 --- a/test/integration/etcd/server.go +++ b/test/integration/etcd/server.go @@ -49,11 +49,11 @@ import ( basecompatibility "k8s.io/component-base/compatibility" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" netutils "k8s.io/utils/net" // install all APIs diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go index e8428e84c67..beed98bac23 100644 --- a/test/integration/evictions/evictions_test.go +++ b/test/integration/evictions/evictions_test.go @@ -50,11 +50,11 @@ import ( "k8s.io/client-go/scale" "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller/disruption" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/examples/webhook_test.go b/test/integration/examples/webhook_test.go index 59ee6721e8e..f326cbfc2e1 100644 --- a/test/integration/examples/webhook_test.go +++ b/test/integration/examples/webhook_test.go @@ -29,11 +29,11 @@ import ( auditinternal "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/audit" "k8s.io/apiserver/pkg/authorization/authorizer" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestWebhookLoopback(t *testing.T) { diff --git a/test/integration/framework/test_server_test.go b/test/integration/framework/test_server_test.go index df20bcbd28b..e63350818e0 100644 --- a/test/integration/framework/test_server_test.go +++ b/test/integration/framework/test_server_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" ) // TestStartTestServerTearDownCauseOnTestCompletion verifies that when a test diff --git a/test/integration/framework/util.go b/test/integration/framework/util.go index 733cb873efc..619bb79a4bd 100644 --- a/test/integration/framework/util.go +++ b/test/integration/framework/util.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + "k8s.io/ktesting" nodectlr "k8s.io/kubernetes/pkg/controller/nodelifecycle" - "k8s.io/kubernetes/test/utils/ktesting" ) // CreateNamespaceOrDie creates a namespace. diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index b51eab1fe6f..413ce2a42f5 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -47,11 +47,11 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/controller-manager/pkg/informerfactory" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/garbagecollector" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/kubelet/podcertificatemanager_integration_test.go b/test/integration/kubelet/podcertificatemanager_integration_test.go index 831270263ab..e1d883aaa7a 100644 --- a/test/integration/kubelet/podcertificatemanager_integration_test.go +++ b/test/integration/kubelet/podcertificatemanager_integration_test.go @@ -37,11 +37,11 @@ import ( "k8s.io/client-go/kubernetes" corelistersv1 "k8s.io/client-go/listers/core/v1" restclient "k8s.io/client-go/rest" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/kubelet/podcertificate" "k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/utils/hermeticpodcertificatesigner" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/clock" "k8s.io/utils/ptr" ) diff --git a/test/integration/metrics/nativehistograms/metrics_test.go b/test/integration/metrics/nativehistograms/metrics_test.go index 05158e6b907..77d9c565bc2 100644 --- a/test/integration/metrics/nativehistograms/metrics_test.go +++ b/test/integration/metrics/nativehistograms/metrics_test.go @@ -36,11 +36,11 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" metricsfeatures "k8s.io/component-base/metrics/features" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" kubecontrollermanagertesting "k8s.io/kubernetes/cmd/kube-controller-manager/app/testing" kubeschedulertesting "k8s.io/kubernetes/cmd/kube-scheduler/app/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/kubernetes/test/utils/kubeconfig" ) diff --git a/test/integration/network/services_test.go b/test/integration/network/services_test.go index 076483cb3f8..7fbe8d76471 100644 --- a/test/integration/network/services_test.go +++ b/test/integration/network/services_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controlplane" + "k8s.io/ktesting" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // TestServicesFinalizersRepairLoop tests that Services participate in the object diff --git a/test/integration/podgroupprotection/podgroup_protection_test.go b/test/integration/podgroupprotection/podgroup_protection_test.go index 4cde2814770..3e6d54bcc7a 100644 --- a/test/integration/podgroupprotection/podgroup_protection_test.go +++ b/test/integration/podgroupprotection/podgroup_protection_test.go @@ -35,12 +35,12 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/scheduling/podgroupprotection" "k8s.io/kubernetes/pkg/features" st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) type objectKind string diff --git a/test/integration/podlogs/podlogs_test.go b/test/integration/podlogs/podlogs_test.go index c092dd19344..ca3ee232703 100644 --- a/test/integration/podlogs/podlogs_test.go +++ b/test/integration/podlogs/podlogs_test.go @@ -28,10 +28,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/e2e/storage/podlogs" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // listCounter counts non-watch "list pods" requests seen by a client, by diff --git a/test/integration/quota/quota_test.go b/test/integration/quota/quota_test.go index ebd96f1db55..81977271331 100644 --- a/test/integration/quota/quota_test.go +++ b/test/integration/quota/quota_test.go @@ -37,13 +37,13 @@ import ( "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" watchtools "k8s.io/client-go/tools/watch" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controller" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" quotainstall "k8s.io/kubernetes/pkg/quota/v1/install" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 0cd5b4b3fe5..22ec96c83e8 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -40,6 +40,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/retry" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apis/core" @@ -47,7 +48,6 @@ import ( "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" testutil "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index 8e074f2d0ce..88f57300ff0 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -36,11 +36,11 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/retry" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler/bind/bind_test.go b/test/integration/scheduler/bind/bind_test.go index fa872a1ebab..493fb904660 100644 --- a/test/integration/scheduler/bind/bind_test.go +++ b/test/integration/scheduler/bind/bind_test.go @@ -23,12 +23,12 @@ import ( corev1 "k8s.io/api/core/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/framework" st "k8s.io/kubernetes/pkg/scheduler/testing" testutil "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" ) // TestDefaultBinder tests the binding process in the scheduler. diff --git a/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go b/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go index dd14cc75a2b..9c443ae432f 100644 --- a/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go +++ b/test/integration/scheduler/nominated_node_name/nominated_node_name_test.go @@ -31,6 +31,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" configv1 "k8s.io/kube-scheduler/config/v1" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" @@ -46,7 +47,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" schedulerutils "k8s.io/kubernetes/test/integration/scheduler" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler/preemption/asyncframework/async_framework.go b/test/integration/scheduler/preemption/asyncframework/async_framework.go index f5c7f19532f..274b1efab2b 100644 --- a/test/integration/scheduler/preemption/asyncframework/async_framework.go +++ b/test/integration/scheduler/preemption/asyncframework/async_framework.go @@ -35,6 +35,7 @@ import ( "k8s.io/client-go/kubernetes" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" configv1 "k8s.io/kube-scheduler/config/v1" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" @@ -51,7 +52,6 @@ import ( frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" st "k8s.io/kubernetes/pkg/scheduler/testing" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/scheduler/preemption/podgroup/podgrouppreemption_test.go b/test/integration/scheduler/preemption/podgroup/podgrouppreemption_test.go index 105ca15efbf..4081818c99c 100644 --- a/test/integration/scheduler/preemption/podgroup/podgrouppreemption_test.go +++ b/test/integration/scheduler/preemption/podgroup/podgrouppreemption_test.go @@ -41,6 +41,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" featuregatetesting "k8s.io/component-base/featuregate/testing" configv1 "k8s.io/kube-scheduler/config/v1" @@ -56,7 +57,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" "k8s.io/kubernetes/test/integration/scheduler/preemption/asyncframework" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // TestPodGroupPreemption tests preemption scenarios involving pod groups. diff --git a/test/integration/scheduler/preemption/preemption_test.go b/test/integration/scheduler/preemption/preemption_test.go index 097af52bde5..3834671dda9 100644 --- a/test/integration/scheduler/preemption/preemption_test.go +++ b/test/integration/scheduler/preemption/preemption_test.go @@ -37,6 +37,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" + "k8s.io/ktesting" configv1 "k8s.io/kube-scheduler/config/v1" fwk "k8s.io/kube-scheduler/framework" podutil "k8s.io/kubernetes/pkg/api/v1/pod" @@ -48,7 +49,6 @@ import ( testfwk "k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/scheduler/preemption/asyncframework" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" ) // imported from testutils diff --git a/test/integration/scheduler/queueing/queue.go b/test/integration/scheduler/queueing/queue.go index 34a8f8f6ff7..8b760138f04 100644 --- a/test/integration/scheduler/queueing/queue.go +++ b/test/integration/scheduler/queueing/queue.go @@ -37,6 +37,7 @@ import ( ndf "k8s.io/component-helpers/nodedeclaredfeatures" ndftesting "k8s.io/component-helpers/nodedeclaredfeatures/testing" "k8s.io/component-helpers/storage/volume" + "k8s.io/ktesting" configv1 "k8s.io/kube-scheduler/config/v1" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/features" @@ -46,7 +47,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/names" st "k8s.io/kubernetes/pkg/scheduler/testing" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler/queueing/queue_test.go b/test/integration/scheduler/queueing/queue_test.go index 3d814b366f1..4f9158c756f 100644 --- a/test/integration/scheduler/queueing/queue_test.go +++ b/test/integration/scheduler/queueing/queue_test.go @@ -36,6 +36,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/testutil" @@ -52,7 +53,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" testfwk "k8s.io/kubernetes/test/integration/framework" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/client-go/ktesting" imageutils "k8s.io/kubernetes/test/utils/image" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go index 91e21749cc4..ba789bbe068 100644 --- a/test/integration/scheduler/util.go +++ b/test/integration/scheduler/util.go @@ -25,6 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/ktesting" configv1 "k8s.io/kube-scheduler/config/v1" fwk "k8s.io/kube-scheduler/framework" "k8s.io/kubernetes/pkg/scheduler" @@ -35,7 +36,6 @@ import ( frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" st "k8s.io/kubernetes/pkg/scheduler/testing" testutils "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler_perf/dra.go b/test/integration/scheduler_perf/dra.go index 5d183b74d84..2a09dfb6eee 100644 --- a/test/integration/scheduler_perf/dra.go +++ b/test/integration/scheduler_perf/dra.go @@ -32,6 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/dynamic-resource-allocation/cel" @@ -40,7 +41,6 @@ import ( "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/dynamicresources" "k8s.io/kubernetes/pkg/scheduler/util/assumecache" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // createResourceClaimsOp defines an op where resource claims are created. diff --git a/test/integration/scheduler_perf/dra/dra_test.go b/test/integration/scheduler_perf/dra/dra_test.go index 9e271f29233..45079177467 100644 --- a/test/integration/scheduler_perf/dra/dra_test.go +++ b/test/integration/scheduler_perf/dra/dra_test.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/client-go/ktesting" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" _ "k8s.io/component-base/logs/json/register" "k8s.io/dynamic-resource-allocation/structured" "k8s.io/kubernetes/pkg/features" perf "k8s.io/kubernetes/test/integration/scheduler_perf" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) func TestMain(m *testing.M) { diff --git a/test/integration/scheduler_perf/executor.go b/test/integration/scheduler_perf/executor.go index d17cb4297e7..e502cd68399 100644 --- a/test/integration/scheduler_perf/executor.go +++ b/test/integration/scheduler_perf/executor.go @@ -47,6 +47,7 @@ import ( "k8s.io/client-go/dynamic" coreinformers "k8s.io/client-go/informers/core/v1" schedulinginformers "k8s.io/client-go/informers/scheduling/v1beta1" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/restmapper" "k8s.io/client-go/tools/cache" @@ -54,7 +55,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler" schedutil "k8s.io/kubernetes/pkg/scheduler/util" testutils "k8s.io/kubernetes/test/utils" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "sigs.k8s.io/yaml" ) diff --git a/test/integration/scheduler_perf/executor_test.go b/test/integration/scheduler_perf/executor_test.go index dc589cd0022..b430951e312 100644 --- a/test/integration/scheduler_perf/executor_test.go +++ b/test/integration/scheduler_perf/executor_test.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/informers" coreinformers "k8s.io/client-go/informers/core/v1" + "k8s.io/client-go/ktesting" "k8s.io/client-go/kubernetes/fake" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler_perf/nodedeclaredfeatures/node_declared_features_test.go b/test/integration/scheduler_perf/nodedeclaredfeatures/node_declared_features_test.go index b6ce4fad702..b5a48f19cc7 100644 --- a/test/integration/scheduler_perf/nodedeclaredfeatures/node_declared_features_test.go +++ b/test/integration/scheduler_perf/nodedeclaredfeatures/node_declared_features_test.go @@ -29,13 +29,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/ktesting" _ "k8s.io/component-base/logs/json/register" ndf "k8s.io/component-helpers/nodedeclaredfeatures" ndffeatures "k8s.io/component-helpers/nodedeclaredfeatures/features" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler" perf "k8s.io/kubernetes/test/integration/scheduler_perf" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) // This test benchmarks the NodeDeclaredFeatures features performance impact. diff --git a/test/integration/scheduler_perf/operations.go b/test/integration/scheduler_perf/operations.go index c8525ab1cd4..5d75095cba7 100644 --- a/test/integration/scheduler_perf/operations.go +++ b/test/integration/scheduler_perf/operations.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/json" "k8s.io/client-go/discovery/cached/memory" + "k8s.io/client-go/ktesting" "k8s.io/client-go/restmapper" "k8s.io/klog/v2" - "k8s.io/kubernetes/test/utils/client-go/ktesting" "k8s.io/utils/ptr" "sigs.k8s.io/yaml" ) diff --git a/test/integration/scheduler_perf/options.go b/test/integration/scheduler_perf/options.go index d86e58f3bb3..fb682e4701a 100644 --- a/test/integration/scheduler_perf/options.go +++ b/test/integration/scheduler_perf/options.go @@ -20,9 +20,9 @@ import ( "time" v1 "k8s.io/api/core/v1" + "k8s.io/client-go/ktesting" "k8s.io/kubernetes/pkg/scheduler" frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) type SchedulerPerfOption func(options *schedulerPerfOptions) diff --git a/test/integration/scheduler_perf/scheduler_perf.go b/test/integration/scheduler_perf/scheduler_perf.go index c13ab89afd6..a562f6cd338 100644 --- a/test/integration/scheduler_perf/scheduler_perf.go +++ b/test/integration/scheduler_perf/scheduler_perf.go @@ -37,12 +37,14 @@ import ( "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/logs" logsapi "k8s.io/component-base/logs/api/v1" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/klog/v2" + "k8s.io/ktesting/initoption" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler/apis/config" @@ -53,8 +55,6 @@ import ( frameworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime" "k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/client-go/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/initoption" "sigs.k8s.io/yaml" ) diff --git a/test/integration/scheduler_perf/update.go b/test/integration/scheduler_perf/update.go index 0e6340e5995..e422173316a 100644 --- a/test/integration/scheduler_perf/update.go +++ b/test/integration/scheduler_perf/update.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/kubernetes/test/utils/client-go/ktesting" + "k8s.io/client-go/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/scheduler_perf/util.go b/test/integration/scheduler_perf/util.go index ca55554f6ae..449e6eab956 100644 --- a/test/integration/scheduler_perf/util.go +++ b/test/integration/scheduler_perf/util.go @@ -40,6 +40,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/informers" coreinformers "k8s.io/client-go/informers/core/v1" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" @@ -57,7 +58,6 @@ import ( schedutil "k8s.io/kubernetes/pkg/scheduler/util" "k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/util" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) const ( diff --git a/test/integration/service/service_test.go b/test/integration/service/service_test.go index c97f34b74b3..e93c884a338 100644 --- a/test/integration/service/service_test.go +++ b/test/integration/service/service_test.go @@ -42,12 +42,12 @@ import ( watchtools "k8s.io/client-go/tools/watch" "k8s.io/client-go/util/retry" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" + "k8s.io/ktesting/format" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/endpointslice" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" - "k8s.io/kubernetes/test/utils/ktesting/format" "k8s.io/utils/ptr" ) diff --git a/test/integration/serviceaccount/external_jwt_signer_test.go b/test/integration/serviceaccount/external_jwt_signer_test.go index 3309596dea0..79decdadb18 100644 --- a/test/integration/serviceaccount/external_jwt_signer_test.go +++ b/test/integration/serviceaccount/external_jwt_signer_test.go @@ -36,11 +36,11 @@ import ( "k8s.io/client-go/kubernetes" featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/features" v1testing "k8s.io/kubernetes/pkg/serviceaccount/externaljwt/plugin/testing/v1" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestExternalJWTSigningAndAuth(t *testing.T) { diff --git a/test/integration/serviceaccount/service_account_test.go b/test/integration/serviceaccount/service_account_test.go index 4b37d273178..0c743f4bcd6 100644 --- a/test/integration/serviceaccount/service_account_test.go +++ b/test/integration/serviceaccount/service_account_test.go @@ -38,6 +38,7 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/util/keyutil" + "k8s.io/ktesting" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controller" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" @@ -46,7 +47,6 @@ import ( "k8s.io/kubernetes/pkg/serviceaccount" serviceaccountadmission "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) const ( diff --git a/test/integration/servicecidr/allocator_test.go b/test/integration/servicecidr/allocator_test.go index a897881ff79..349abce05b8 100644 --- a/test/integration/servicecidr/allocator_test.go +++ b/test/integration/servicecidr/allocator_test.go @@ -30,11 +30,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controller/servicecidrs" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestServiceAllocation(t *testing.T) { diff --git a/test/integration/servicecidr/migration_test.go b/test/integration/servicecidr/migration_test.go index 54101e8d706..2749d4f488d 100644 --- a/test/integration/servicecidr/migration_test.go +++ b/test/integration/servicecidr/migration_test.go @@ -32,11 +32,11 @@ import ( "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/servicecidrs" "k8s.io/kubernetes/pkg/controlplane/controller/defaultservicecidr" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // TestMigrateServiceCIDR validates the steps necessary to migrate a cluster default ServiceCIDR diff --git a/test/integration/staleness/staleness_test.go b/test/integration/staleness/staleness_test.go index 0b09dc87203..6960c29795d 100644 --- a/test/integration/staleness/staleness_test.go +++ b/test/integration/staleness/staleness_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" + "k8s.io/ktesting" apiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func TestPodListerRV(t *testing.T) { diff --git a/test/integration/statefulset/statefulset_test.go b/test/integration/statefulset/statefulset_test.go index 45aa231fffd..85348d0f9f5 100644 --- a/test/integration/statefulset/statefulset_test.go +++ b/test/integration/statefulset/statefulset_test.go @@ -38,13 +38,13 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" apiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller/statefulset" "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/utils/ptr" ) diff --git a/test/integration/statefulset/util.go b/test/integration/statefulset/util.go index af15962e8ad..2bffcb474c2 100644 --- a/test/integration/statefulset/util.go +++ b/test/integration/statefulset/util.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/test/utils/ktesting" + "k8s.io/ktesting" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/test/integration/storageversionmigrator/storageversionmigrator_test.go b/test/integration/storageversionmigrator/storageversionmigrator_test.go index 220255b17b5..9356d02fd44 100644 --- a/test/integration/storageversionmigrator/storageversionmigrator_test.go +++ b/test/integration/storageversionmigrator/storageversionmigrator_test.go @@ -37,9 +37,9 @@ import ( clientgofeaturegate "k8s.io/client-go/features" "k8s.io/component-base/featuregate" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) // TestStorageVersionMigration is an integration test that verifies storage version migration works. diff --git a/test/integration/util/util.go b/test/integration/util/util.go index 4e6491e7610..0d1a9ebe1da 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -43,6 +43,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic/dynamicinformer" "k8s.io/client-go/informers" + "k8s.io/client-go/ktesting" clientset "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/metadata" @@ -75,7 +76,6 @@ import ( st "k8s.io/kubernetes/pkg/scheduler/testing" taintutils "k8s.io/kubernetes/pkg/util/taints" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/client-go/ktesting" imageutils "k8s.io/kubernetes/test/utils/image" ) diff --git a/test/integration/volume/attach_detach_test.go b/test/integration/volume/attach_detach_test.go index 87e45986899..92908ffd380 100644 --- a/test/integration/volume/attach_detach_test.go +++ b/test/integration/volume/attach_detach_test.go @@ -32,6 +32,7 @@ import ( "k8s.io/client-go/tools/cache" basemetric "k8s.io/component-base/metrics" metricstestutil "k8s.io/component-base/metrics/testutil" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/controller/podgc" podgcmetrics "k8s.io/kubernetes/pkg/controller/podgc/metrics" @@ -44,7 +45,6 @@ import ( volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" ) func fakePodWithVol(namespace string) *v1.Pod { diff --git a/test/integration/volume/persistent_volumes_test.go b/test/integration/volume/persistent_volumes_test.go index 286178b9618..75908a916f3 100644 --- a/test/integration/volume/persistent_volumes_test.go +++ b/test/integration/volume/persistent_volumes_test.go @@ -39,6 +39,7 @@ import ( ref "k8s.io/client-go/tools/reference" "k8s.io/client-go/util/retry" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/ktesting" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" @@ -47,7 +48,6 @@ import ( volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/test/integration/framework" - "k8s.io/kubernetes/test/utils/ktesting" "k8s.io/klog/v2" ) diff --git a/test/utils/client-go/ktesting/README.md b/test/utils/client-go/ktesting/README.md deleted file mode 100644 index f7233f958ad..00000000000 --- a/test/utils/client-go/ktesting/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# ktesting - -ktesting is a set of packages with the same name which are meant to simplify -writing tests. - -- k8s.io/klog/v2/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/klog/v2/ktesting.svg)](https://pkg.go.dev/k8s.io/klog/v2/ktesting): per-test structured logging -- k8s.io/kubernetes/test/utils/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/kubernetes/test/utils/ktesting.svg)](https://pkg.go.dev/k8s.io/kubernetes/test/utils/ktesting): API that enables writing code which can be used in tests based on `go test` (unit tests and integration tests in Kubernetes) and Ginkgo suites (E2E in Kubernetes). Automatically adds klog command line flags and reconfigures Gomega to log Kubernetes objects as YAML. -- k8s.io/kubernetes/test/utils/client-go/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/kubernetes/test/utils/client-go/ktesting.svg)](https://pkg.go.dev/k8s.io/kubernetes/test/utils/client-go/ktesting): Adds support for client-go to the API (client instance, test namespace, REST configuration), similar to test/e2e/framework.Framework. - -They build on top of each other such that the more advanced packages offer the -same API as the simpler packages and just add more functionality. - -Providing them in different modules avoids forcing dependencies on consumers -for functionality that they don't need. Consumers are free to choose the -package which meets their needs and can later switch to a more advanced one -just by changing the import statement. diff --git a/test/utils/format/format_test.go b/test/utils/format/format_test.go index 66d700a4acc..3081f1f95eb 100644 --- a/test/utils/format/format_test.go +++ b/test/utils/format/format_test.go @@ -27,7 +27,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - _ "k8s.io/kubernetes/test/utils/ktesting/format" // Register YAML formatting. + _ "k8s.io/ktesting/format" // Register YAML formatting. ) func TestGomegaFormatObject(t *testing.T) { diff --git a/test/utils/ktesting/README.md b/test/utils/ktesting/README.md deleted file mode 100644 index f7233f958ad..00000000000 --- a/test/utils/ktesting/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# ktesting - -ktesting is a set of packages with the same name which are meant to simplify -writing tests. - -- k8s.io/klog/v2/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/klog/v2/ktesting.svg)](https://pkg.go.dev/k8s.io/klog/v2/ktesting): per-test structured logging -- k8s.io/kubernetes/test/utils/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/kubernetes/test/utils/ktesting.svg)](https://pkg.go.dev/k8s.io/kubernetes/test/utils/ktesting): API that enables writing code which can be used in tests based on `go test` (unit tests and integration tests in Kubernetes) and Ginkgo suites (E2E in Kubernetes). Automatically adds klog command line flags and reconfigures Gomega to log Kubernetes objects as YAML. -- k8s.io/kubernetes/test/utils/client-go/ktesting [![Go Reference](https://pkg.go.dev/badge/k8s.io/kubernetes/test/utils/client-go/ktesting.svg)](https://pkg.go.dev/k8s.io/kubernetes/test/utils/client-go/ktesting): Adds support for client-go to the API (client instance, test namespace, REST configuration), similar to test/e2e/framework.Framework. - -They build on top of each other such that the more advanced packages offer the -same API as the simpler packages and just add more functionality. - -Providing them in different modules avoids forcing dependencies on consumers -for functionality that they don't need. Consumers are free to choose the -package which meets their needs and can later switch to a more advanced one -just by changing the import statement. diff --git a/test/utils/localupcluster/cmd.go b/test/utils/localupcluster/cmd.go index 1a405cde92b..203815657b0 100644 --- a/test/utils/localupcluster/cmd.go +++ b/test/utils/localupcluster/cmd.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "time" - "k8s.io/kubernetes/test/utils/client-go/ktesting" + "k8s.io/client-go/ktesting" ) type Cmd struct { diff --git a/test/utils/localupcluster/localupcluster.go b/test/utils/localupcluster/localupcluster.go index dd304d0d664..a31b4ea3a63 100644 --- a/test/utils/localupcluster/localupcluster.go +++ b/test/utils/localupcluster/localupcluster.go @@ -50,11 +50,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" + "k8s.io/client-go/ktesting" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/featuregate" - "k8s.io/kubernetes/test/utils/client-go/ktesting" ) type ClusterComponentName string diff --git a/vendor/modules.txt b/vendor/modules.txt index 54bd11ad984..b60ae2e7af2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1092,6 +1092,8 @@ k8s.io/klog/v2/test k8s.io/klog/v2/textlogger # k8s.io/kms v0.0.0 => ./staging/src/k8s.io/kms ## explicit; go 1.27.0 +# k8s.io/ktesting v0.0.0 => ./staging/src/k8s.io/ktesting +## explicit; go 1.27.0 # k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator ## explicit; go 1.27.0 # k8s.io/kube-controller-manager v0.0.0 => ./staging/src/k8s.io/kube-controller-manager