From 55251c716a6b4b06d408139ba296fa2e9d46ede8 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 27 Jul 2018 19:47:02 +0800 Subject: [PATCH] update the import file for move util/pointer to k8s.io/utils --- cmd/kube-proxy/app/server.go | 2 +- cmd/kube-proxy/app/server_test.go | 2 +- cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go | 2 +- cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go | 2 +- cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go | 2 +- cmd/kubeadm/app/componentconfigs/defaults.go | 2 +- cmd/kubeadm/app/componentconfigs/validation_test.go | 2 +- cmd/kubeadm/app/phases/addons/proxy/proxy_test.go | 2 +- cmd/kubeadm/app/phases/controlplane/manifests_test.go | 2 +- pkg/apis/apps/v1/conversion_test.go | 2 +- pkg/apis/apps/v1/defaults_test.go | 2 +- pkg/apis/apps/v1beta1/defaults_test.go | 2 +- pkg/apis/apps/v1beta2/conversion_test.go | 2 +- pkg/apis/apps/v1beta2/defaults_test.go | 2 +- pkg/apis/autoscaling/v1/defaults_test.go | 2 +- pkg/apis/autoscaling/v2beta1/defaults_test.go | 2 +- pkg/apis/autoscaling/validation/validation_test.go | 2 +- pkg/apis/batch/v1/defaults_test.go | 2 +- pkg/apis/batch/v1beta1/defaults_test.go | 2 +- pkg/apis/componentconfig/v1alpha1/defaults.go | 2 +- pkg/apis/core/v1/conversion_test.go | 2 +- pkg/apis/core/v1/defaults.go | 2 +- pkg/apis/core/v1/defaults_test.go | 2 +- pkg/apis/core/validation/validation_test.go | 2 +- pkg/apis/extensions/v1beta1/defaults_test.go | 2 +- pkg/kubectl/autoscale_test.go | 2 +- pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go | 2 +- pkg/kubemark/hollow_proxy.go | 2 +- pkg/printers/internalversion/describe_test.go | 2 +- pkg/proxy/apis/kubeproxyconfig/fuzzer/fuzzer.go | 2 +- pkg/proxy/apis/kubeproxyconfig/v1alpha1/defaults.go | 2 +- pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go | 2 +- .../pkg/admission/security/podsecuritypolicy/admission_test.go | 2 +- test/e2e/apps/deployment.go | 2 +- test/e2e/auth/pod_security_policy.go | 2 +- test/integration/deployment/deployment_test.go | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 6161f15d9f..5e6cde8708 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -70,11 +70,11 @@ import ( utilipvs "k8s.io/kubernetes/pkg/util/ipvs" utilnode "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/oom" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" "k8s.io/kubernetes/pkg/util/resourcecontainer" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/utils/exec" + utilpointer "k8s.io/utils/pointer" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/cmd/kube-proxy/app/server_test.go b/cmd/kube-proxy/app/server_test.go index 1ee6fddedd..f3e8c75b0b 100644 --- a/cmd/kube-proxy/app/server_test.go +++ b/cmd/kube-proxy/app/server_test.go @@ -31,7 +31,7 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" "k8s.io/kubernetes/pkg/util/configz" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) type fakeNodeInterface struct { diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go index 9122ec1009..be693f73c8 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go @@ -30,7 +30,7 @@ import ( kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) // Funcs returns the fuzzer functions for the kubeadm apis. diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go index c39b8b2d4d..f817d7e71c 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go @@ -27,7 +27,7 @@ import ( kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" kubeproxyscheme "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/scheme" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) const ( diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go index 05006f9ac0..9a2d502b14 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestValidateToken(t *testing.T) { diff --git a/cmd/kubeadm/app/componentconfigs/defaults.go b/cmd/kubeadm/app/componentconfigs/defaults.go index 419f5faaf1..c3956eba59 100644 --- a/cmd/kubeadm/app/componentconfigs/defaults.go +++ b/cmd/kubeadm/app/componentconfigs/defaults.go @@ -24,7 +24,7 @@ import ( kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) const ( diff --git a/cmd/kubeadm/app/componentconfigs/validation_test.go b/cmd/kubeadm/app/componentconfigs/validation_test.go index 56dc02b5ad..5b3fb8bdf5 100644 --- a/cmd/kubeadm/app/componentconfigs/validation_test.go +++ b/cmd/kubeadm/app/componentconfigs/validation_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestValidateKubeProxyConfiguration(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go index 94c077113c..f4be8e798c 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go @@ -31,7 +31,7 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" - "k8s.io/kubernetes/pkg/util/pointer" + "k8s.io/utils/pointer" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index 3e7c115645..37d1cce374 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/util/version" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) const ( diff --git a/pkg/apis/apps/v1/conversion_test.go b/pkg/apis/apps/v1/conversion_test.go index 5e7f1dbd8b..8319da61f0 100644 --- a/pkg/apis/apps/v1/conversion_test.go +++ b/pkg/apis/apps/v1/conversion_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/apis/apps" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/extensions" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestV12StatefulSetSpecConversion(t *testing.T) { diff --git a/pkg/apis/apps/v1/defaults_test.go b/pkg/apis/apps/v1/defaults_test.go index 40693828a3..484cbf713a 100644 --- a/pkg/apis/apps/v1/defaults_test.go +++ b/pkg/apis/apps/v1/defaults_test.go @@ -32,7 +32,7 @@ import ( . "k8s.io/kubernetes/pkg/apis/apps/v1" api "k8s.io/kubernetes/pkg/apis/core" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultDaemonSetSpec(t *testing.T) { diff --git a/pkg/apis/apps/v1beta1/defaults_test.go b/pkg/apis/apps/v1beta1/defaults_test.go index b87bbd2cf7..be10a078f5 100644 --- a/pkg/apis/apps/v1beta1/defaults_test.go +++ b/pkg/apis/apps/v1beta1/defaults_test.go @@ -31,7 +31,7 @@ import ( . "k8s.io/kubernetes/pkg/apis/apps/v1beta1" api "k8s.io/kubernetes/pkg/apis/core" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultDeployment(t *testing.T) { diff --git a/pkg/apis/apps/v1beta2/conversion_test.go b/pkg/apis/apps/v1beta2/conversion_test.go index d6b6f7d692..0bc76511e0 100644 --- a/pkg/apis/apps/v1beta2/conversion_test.go +++ b/pkg/apis/apps/v1beta2/conversion_test.go @@ -30,7 +30,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestV1beta2StatefulSetSpecConversion(t *testing.T) { diff --git a/pkg/apis/apps/v1beta2/defaults_test.go b/pkg/apis/apps/v1beta2/defaults_test.go index 6de944685d..9edf217ea4 100644 --- a/pkg/apis/apps/v1beta2/defaults_test.go +++ b/pkg/apis/apps/v1beta2/defaults_test.go @@ -32,7 +32,7 @@ import ( . "k8s.io/kubernetes/pkg/apis/apps/v1beta2" api "k8s.io/kubernetes/pkg/apis/core" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultDaemonSetSpec(t *testing.T) { diff --git a/pkg/apis/autoscaling/v1/defaults_test.go b/pkg/apis/autoscaling/v1/defaults_test.go index 7934dca42d..e2b8cda429 100644 --- a/pkg/apis/autoscaling/v1/defaults_test.go +++ b/pkg/apis/autoscaling/v1/defaults_test.go @@ -27,7 +27,7 @@ import ( _ "k8s.io/kubernetes/pkg/apis/autoscaling/install" . "k8s.io/kubernetes/pkg/apis/autoscaling/v1" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultHPA(t *testing.T) { diff --git a/pkg/apis/autoscaling/v2beta1/defaults_test.go b/pkg/apis/autoscaling/v2beta1/defaults_test.go index 653540bcca..97d5a06189 100644 --- a/pkg/apis/autoscaling/v2beta1/defaults_test.go +++ b/pkg/apis/autoscaling/v2beta1/defaults_test.go @@ -29,7 +29,7 @@ import ( _ "k8s.io/kubernetes/pkg/apis/autoscaling/install" . "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultHPA(t *testing.T) { diff --git a/pkg/apis/autoscaling/validation/validation_test.go b/pkg/apis/autoscaling/validation/validation_test.go index 7b3f8410e3..7c7a4250d3 100644 --- a/pkg/apis/autoscaling/validation/validation_test.go +++ b/pkg/apis/autoscaling/validation/validation_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" api "k8s.io/kubernetes/pkg/apis/core" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestValidateScale(t *testing.T) { diff --git a/pkg/apis/batch/v1/defaults_test.go b/pkg/apis/batch/v1/defaults_test.go index 3e57103f5f..0f9c8c5c17 100644 --- a/pkg/apis/batch/v1/defaults_test.go +++ b/pkg/apis/batch/v1/defaults_test.go @@ -29,7 +29,7 @@ import ( _ "k8s.io/kubernetes/pkg/apis/batch/install" . "k8s.io/kubernetes/pkg/apis/batch/v1" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultJob(t *testing.T) { diff --git a/pkg/apis/batch/v1beta1/defaults_test.go b/pkg/apis/batch/v1beta1/defaults_test.go index cedb392d53..e646ea8c5a 100644 --- a/pkg/apis/batch/v1beta1/defaults_test.go +++ b/pkg/apis/batch/v1beta1/defaults_test.go @@ -27,7 +27,7 @@ import ( _ "k8s.io/kubernetes/pkg/apis/batch/install" . "k8s.io/kubernetes/pkg/apis/batch/v1beta1" _ "k8s.io/kubernetes/pkg/apis/core/install" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultCronJob(t *testing.T) { diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 225b279a03..e44b7447e6 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -26,7 +26,7 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/master/ports" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *kruntime.Scheme) error { diff --git a/pkg/apis/core/v1/conversion_test.go b/pkg/apis/core/v1/conversion_test.go index 668d287d41..b68e5f3ccb 100644 --- a/pkg/apis/core/v1/conversion_test.go +++ b/pkg/apis/core/v1/conversion_test.go @@ -38,7 +38,7 @@ import ( corefuzzer "k8s.io/kubernetes/pkg/apis/core/fuzzer" corev1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/apis/extensions" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" // enforce that all types are installed _ "k8s.io/kubernetes/pkg/api/testapi" diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go index 110ef54df1..622e239025 100644 --- a/pkg/apis/core/v1/defaults.go +++ b/pkg/apis/core/v1/defaults.go @@ -25,7 +25,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/util/parsers" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/pkg/apis/core/v1/defaults_test.go b/pkg/apis/core/v1/defaults_test.go index e5fd61da16..4e4d6da5f0 100644 --- a/pkg/apis/core/v1/defaults_test.go +++ b/pkg/apis/core/v1/defaults_test.go @@ -29,7 +29,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/api/legacyscheme" corev1 "k8s.io/kubernetes/pkg/apis/core/v1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" // enforce that all types are installed _ "k8s.io/kubernetes/pkg/api/testapi" diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index b1a1cf3e1e..9b376426d4 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/security/apparmor" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) const ( diff --git a/pkg/apis/extensions/v1beta1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go index a3baf2f314..171cfb2589 100644 --- a/pkg/apis/extensions/v1beta1/defaults_test.go +++ b/pkg/apis/extensions/v1beta1/defaults_test.go @@ -33,7 +33,7 @@ import ( _ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install" . "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestSetDefaultDaemonSetSpec(t *testing.T) { diff --git a/pkg/kubectl/autoscale_test.go b/pkg/kubectl/autoscale_test.go index fc851e3375..754123e1d7 100644 --- a/pkg/kubectl/autoscale_test.go +++ b/pkg/kubectl/autoscale_test.go @@ -22,7 +22,7 @@ import ( autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) func TestHPAGenerate(t *testing.T) { diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go b/pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go index 43a1302ae2..6657bb2d70 100644 --- a/pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go +++ b/pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/master/ports" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) const ( diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go index 649dea56aa..a09e130d4d 100644 --- a/pkg/kubemark/hollow_proxy.go +++ b/pkg/kubemark/hollow_proxy.go @@ -34,9 +34,9 @@ import ( "k8s.io/kubernetes/pkg/proxy/iptables" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilnode "k8s.io/kubernetes/pkg/util/node" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" utilexec "k8s.io/utils/exec" + utilpointer "k8s.io/utils/pointer" "github.com/golang/glog" ) diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go index bafea3a899..d15c72a0b3 100644 --- a/pkg/printers/internalversion/describe_test.go +++ b/pkg/printers/internalversion/describe_test.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/printers" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) type describeClient struct { diff --git a/pkg/proxy/apis/kubeproxyconfig/fuzzer/fuzzer.go b/pkg/proxy/apis/kubeproxyconfig/fuzzer/fuzzer.go index b96464c44c..e133b881f4 100644 --- a/pkg/proxy/apis/kubeproxyconfig/fuzzer/fuzzer.go +++ b/pkg/proxy/apis/kubeproxyconfig/fuzzer/fuzzer.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) // Funcs returns the fuzzer functions for the kube-proxy apis. diff --git a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/defaults.go b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/defaults.go index fea368eb7b..5cc6e56a7b 100644 --- a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/defaults.go +++ b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/defaults.go @@ -25,7 +25,7 @@ import ( kruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/master/ports" - "k8s.io/kubernetes/pkg/util/pointer" + "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *kruntime.Scheme) error { diff --git a/pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go b/pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go index 3289809117..98f185968c 100644 --- a/pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go +++ b/pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" - "k8s.io/kubernetes/pkg/util/pointer" + "k8s.io/utils/pointer" ) func TestValidateKubeProxyConfiguration(t *testing.T) { diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go index 24c9153ee0..7ee136a72b 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go @@ -42,7 +42,7 @@ import ( kpsp "k8s.io/kubernetes/pkg/security/podsecuritypolicy" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" + utilpointer "k8s.io/utils/pointer" ) const defaultContainerName = "test-c" diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index d8e89d5cb3..030990a9a0 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -38,9 +38,9 @@ import ( clientset "k8s.io/client-go/kubernetes" appsinternal "k8s.io/kubernetes/pkg/apis/apps" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" "k8s.io/kubernetes/test/e2e/framework" testutil "k8s.io/kubernetes/test/utils" + utilpointer "k8s.io/utils/pointer" ) const ( diff --git a/test/e2e/auth/pod_security_policy.go b/test/e2e/auth/pod_security_policy.go index 3f5a37f723..0d785503e7 100644 --- a/test/e2e/auth/pod_security_policy.go +++ b/test/e2e/auth/pod_security_policy.go @@ -32,10 +32,10 @@ import ( "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" - utilpointer "k8s.io/kubernetes/pkg/util/pointer" "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" + utilpointer "k8s.io/utils/pointer" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/integration/deployment/deployment_test.go b/test/integration/deployment/deployment_test.go index 53ae396798..aa09be918e 100644 --- a/test/integration/deployment/deployment_test.go +++ b/test/integration/deployment/deployment_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" - "k8s.io/kubernetes/pkg/util/pointer" "k8s.io/kubernetes/test/integration/framework" + "k8s.io/utils/pointer" ) func TestNewDeployment(t *testing.T) {