From 55251c716a6b4b06d408139ba296fa2e9d46ede8 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 27 Jul 2018 19:47:02 +0800 Subject: [PATCH 1/4] 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 6161f15d9fe..5e6cde8708f 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 1ee6fddedd4..f3e8c75b0b5 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 9122ec10096..be693f73c81 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 c39b8b2d4d7..f817d7e71c2 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 05006f9ac0b..9a2d502b145 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 419f5faaf1b..c3956eba598 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 56dc02b5ad3..5b3fb8bdf5f 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 94c077113c2..f4be8e798c2 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 3e7c115645a..37d1cce3745 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 5e7f1dbd8b1..8319da61f04 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 40693828a30..484cbf713a0 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 b87bbd2cf70..be10a078f5b 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 d6b6f7d6927..0bc76511e04 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 6de944685d0..9edf217ea41 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 7934dca42d4..e2b8cda4290 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 653540bcca7..97d5a06189e 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 7b3f8410e3f..7c7a4250d31 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 3e57103f5f5..0f9c8c5c179 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 cedb392d531..e646ea8c5a9 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 225b279a03c..e44b7447e62 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 668d287d411..b68e5f3ccb5 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 110ef54df10..622e239025f 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 e5fd61da161..4e4d6da5f0f 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 b1a1cf3e1e7..9b376426d4b 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 a3baf2f3143..171cfb2589c 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 fc851e3375d..754123e1d75 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 43a1302ae2a..6657bb2d704 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 649dea56aa1..a09e130d4dd 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 bafea3a899d..d15c72a0b3c 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 b96464c44c7..e133b881f41 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 fea368eb7bd..5cc6e56a7b5 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 32898091179..98f185968cd 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 24c9153ee0d..7ee136a72b4 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 d8e89d5cb38..030990a9a01 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 3f5a37f723c..0d785503e7f 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 53ae3967989..aa09be918e7 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) { From 649b46ff1dae8430536c172f08916ec3052a8d3c Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 27 Jul 2018 19:47:58 +0800 Subject: [PATCH 2/4] fix verify about import error --- cmd/kubeadm/.import-restrictions | 4 ++-- hack/import-restrictions.yaml | 1 + pkg/kubectl/.import-restrictions | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index a8bcd175b70..2e8ade294f5 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -33,7 +33,8 @@ { "SelectorRegexp": "k8s[.]io/utils", "AllowedPrefixes": [ - "k8s.io/utils/exec" + "k8s.io/utils/exec", + "k8s.io/utils/pointer" ] }, { @@ -135,7 +136,6 @@ "k8s.io/kubernetes/pkg/util/normalizer", "k8s.io/kubernetes/pkg/util/nsenter", "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/util/pointer", "k8s.io/kubernetes/pkg/util/procfs", "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/taints", diff --git a/hack/import-restrictions.yaml b/hack/import-restrictions.yaml index f9749300a83..be967a1f33a 100644 --- a/hack/import-restrictions.yaml +++ b/hack/import-restrictions.yaml @@ -7,6 +7,7 @@ - k8s.io/kubernetes/pkg/fieldpath - k8s.io/kubernetes/pkg/util - k8s.io/api/core/v1 + - k8s.io/utils/pointer # the following are temporary and should go away. Think twice (or more) before adding anything here. # Main goal: pkg/apis should be as self-contained as possible. diff --git a/pkg/kubectl/.import-restrictions b/pkg/kubectl/.import-restrictions index 8dc23442f02..79f6b5a9384 100644 --- a/pkg/kubectl/.import-restrictions +++ b/pkg/kubectl/.import-restrictions @@ -138,13 +138,13 @@ "k8s.io/kubernetes/pkg/util/node", "k8s.io/kubernetes/pkg/util/nsenter", "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/util/pointer", "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/pkg/version/prometheus", "k8s.io/kubernetes/pkg/volume", - "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/volume/util", + "k8s.io/utils/pointer" ], "ForbiddenPrefixes": [] }] From 0edd8313b6a2e43d06c0b2f7b8c30837997b207b Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 27 Jul 2018 18:01:31 +0800 Subject: [PATCH 3/4] update godep for for move util/pointer to k8s.io/utils --- Godeps/Godeps.json | 10 +- Godeps/LICENSES | 210 ++++++++++++++++++ pkg/util/pointer/BUILD | 32 --- pkg/util/pointer/pointer_test.go | 66 ------ .../k8s.io/utils}/pointer/pointer.go | 7 +- 5 files changed, 223 insertions(+), 102 deletions(-) delete mode 100644 pkg/util/pointer/BUILD delete mode 100644 pkg/util/pointer/pointer_test.go rename {pkg/util => vendor/k8s.io/utils}/pointer/pointer.go (92%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b25e197c10e..99a232f88b7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -3372,15 +3372,19 @@ }, { "ImportPath": "k8s.io/utils/clock", - "Rev": "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e" + "Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed" }, { "ImportPath": "k8s.io/utils/exec", - "Rev": "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e" + "Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed" }, { "ImportPath": "k8s.io/utils/exec/testing", - "Rev": "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e" + "Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed" + }, + { + "ImportPath": "k8s.io/utils/pointer", + "Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed" }, { "ImportPath": "vbom.ml/util/sortorder", diff --git a/Godeps/LICENSES b/Godeps/LICENSES index 9d3d45fa50a..ce038f5d349 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -103551,6 +103551,216 @@ Apache License ================================================================================ +================================================================================ += vendor/k8s.io/utils/pointer licensed under: = + + + 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. + += vendor/k8s.io/utils/LICENSE 3b83ef96387f14655fc854ddc3c6bd57 +================================================================================ + + ================================================================================ = vendor/vbom.ml/util/sortorder licensed under: = diff --git a/pkg/util/pointer/BUILD b/pkg/util/pointer/BUILD deleted file mode 100644 index d45d90005c7..00000000000 --- a/pkg/util/pointer/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["pointer_test.go"], - embed = [":go_default_library"], -) - -go_library( - name = "go_default_library", - srcs = ["pointer.go"], - importpath = "k8s.io/kubernetes/pkg/util/pointer", -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/util/pointer/pointer_test.go b/pkg/util/pointer/pointer_test.go deleted file mode 100644 index 59a6bd5d146..00000000000 --- a/pkg/util/pointer/pointer_test.go +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -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. -*/ - -package pointer - -import ( - "testing" -) - -func TestAllPtrFieldsNil(t *testing.T) { - testCases := []struct { - obj interface{} - expected bool - }{ - {struct{}{}, true}, - {struct{ Foo int }{12345}, true}, - {&struct{ Foo int }{12345}, true}, - {struct{ Foo *int }{nil}, true}, - {&struct{ Foo *int }{nil}, true}, - {struct { - Foo int - Bar *int - }{12345, nil}, true}, - {&struct { - Foo int - Bar *int - }{12345, nil}, true}, - {struct { - Foo *int - Bar *int - }{nil, nil}, true}, - {&struct { - Foo *int - Bar *int - }{nil, nil}, true}, - {struct{ Foo *int }{new(int)}, false}, - {&struct{ Foo *int }{new(int)}, false}, - {struct { - Foo *int - Bar *int - }{nil, new(int)}, false}, - {&struct { - Foo *int - Bar *int - }{nil, new(int)}, false}, - {(*struct{})(nil), true}, - } - for i, tc := range testCases { - if AllPtrFieldsNil(tc.obj) != tc.expected { - t.Errorf("case[%d]: expected %t, got %t", i, tc.expected, !tc.expected) - } - } -} diff --git a/pkg/util/pointer/pointer.go b/vendor/k8s.io/utils/pointer/pointer.go similarity index 92% rename from pkg/util/pointer/pointer.go rename to vendor/k8s.io/utils/pointer/pointer.go index 1a517e12cc5..5fbfc6e00fc 100644 --- a/pkg/util/pointer/pointer.go +++ b/vendor/k8s.io/utils/pointer/pointer.go @@ -1,5 +1,5 @@ /* -Copyright 2017 The Kubernetes Authors. +Copyright 2018 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -69,3 +69,8 @@ func Int32PtrDerefOr(ptr *int32, def int32) int32 { func BoolPtr(b bool) *bool { return &b } + +// StringPtr returns a pointer to the passed string. +func StringPtr(s string) *string { + return &s +} From f1343af5d726c65d911685632437376438b4cfbf Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 27 Jul 2018 14:54:53 +0800 Subject: [PATCH 4/4] auto-generated file --- cmd/kube-proxy/app/BUILD | 4 ++-- cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD | 2 +- cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD | 2 +- cmd/kubeadm/app/apis/kubeadm/validation/BUILD | 2 +- cmd/kubeadm/app/componentconfigs/BUILD | 4 ++-- cmd/kubeadm/app/phases/addons/proxy/BUILD | 2 +- cmd/kubeadm/app/phases/controlplane/BUILD | 2 +- pkg/apis/apps/v1/BUILD | 2 +- pkg/apis/apps/v1beta1/BUILD | 2 +- pkg/apis/apps/v1beta2/BUILD | 2 +- pkg/apis/autoscaling/v1/BUILD | 2 +- pkg/apis/autoscaling/v2beta1/BUILD | 2 +- pkg/apis/autoscaling/validation/BUILD | 2 +- pkg/apis/batch/v1/BUILD | 2 +- pkg/apis/batch/v1beta1/BUILD | 2 +- pkg/apis/componentconfig/v1alpha1/BUILD | 2 +- pkg/apis/core/v1/BUILD | 4 ++-- pkg/apis/core/validation/BUILD | 2 +- pkg/apis/extensions/v1beta1/BUILD | 2 +- pkg/kubectl/BUILD | 2 +- pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD | 2 +- pkg/kubemark/BUILD | 2 +- pkg/printers/internalversion/BUILD | 2 +- pkg/proxy/apis/kubeproxyconfig/fuzzer/BUILD | 2 +- pkg/proxy/apis/kubeproxyconfig/v1alpha1/BUILD | 2 +- .../apis/kubeproxyconfig/validation/BUILD | 2 +- pkg/util/BUILD | 1 - .../security/podsecuritypolicy/BUILD | 2 +- test/e2e/apps/BUILD | 2 +- test/e2e/auth/BUILD | 2 +- test/integration/deployment/BUILD | 2 +- vendor/BUILD | 1 + vendor/k8s.io/utils/pointer/BUILD | 23 +++++++++++++++++++ 33 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 vendor/k8s.io/utils/pointer/BUILD diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index 0a16cd87ee2..bef1d346c61 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -42,7 +42,6 @@ go_library( "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/oom:go_default_library", - "//pkg/util/pointer:go_default_library", "//pkg/util/resourcecontainer:go_default_library", "//pkg/util/sysctl:go_default_library", "//pkg/version:go_default_library", @@ -70,6 +69,7 @@ go_library( "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ "//pkg/proxy/metrics:go_default_library", @@ -154,10 +154,10 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/proxy/apis/kubeproxyconfig:go_default_library", "//pkg/util/configz:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ "//pkg/proxy/ipvs:go_default_library", diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD b/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD index c5cb9ac1c87..cbdd5f02d94 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD @@ -17,11 +17,11 @@ go_library( "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", "//pkg/proxy/apis/kubeproxyconfig:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/github.com/google/gofuzz:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD index 87c3fd48474..d598a4834cc 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/proxy/apis/kubeproxyconfig:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/scheme:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", @@ -35,6 +34,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/client-go/tools/bootstrap/token/api:go_default_library", "//staging/src/k8s.io/client-go/tools/bootstrap/token/util:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/BUILD b/cmd/kubeadm/app/apis/kubeadm/validation/BUILD index 1fd221cb0ed..444520b6fa8 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/validation/BUILD @@ -31,10 +31,10 @@ go_test( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library", "//pkg/proxy/apis/kubeproxyconfig:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/cmd/kubeadm/app/componentconfigs/BUILD b/cmd/kubeadm/app/componentconfigs/BUILD index 070f69733ea..835ab161180 100644 --- a/cmd/kubeadm/app/componentconfigs/BUILD +++ b/cmd/kubeadm/app/componentconfigs/BUILD @@ -21,13 +21,13 @@ go_library( "//pkg/proxy/apis/kubeproxyconfig:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library", "//pkg/proxy/apis/kubeproxyconfig/validation:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) @@ -53,7 +53,7 @@ go_test( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/proxy/apis/kubeproxyconfig:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/cmd/kubeadm/app/phases/addons/proxy/BUILD b/cmd/kubeadm/app/phases/addons/proxy/BUILD index 8b88308ca2b..a2f903507f6 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/BUILD +++ b/cmd/kubeadm/app/phases/addons/proxy/BUILD @@ -16,12 +16,12 @@ go_test( "//cmd/kubeadm/app/util/config:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/proxy/apis/kubeproxyconfig:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/cmd/kubeadm/app/phases/controlplane/BUILD b/cmd/kubeadm/app/phases/controlplane/BUILD index 8551e855423..f7f925cbcdb 100644 --- a/cmd/kubeadm/app/phases/controlplane/BUILD +++ b/cmd/kubeadm/app/phases/controlplane/BUILD @@ -20,10 +20,10 @@ go_test( "//cmd/kubeadm/app/phases/certs:go_default_library", "//cmd/kubeadm/test:go_default_library", "//pkg/kubeapiserver/authorizer/modes:go_default_library", - "//pkg/util/pointer:go_default_library", "//pkg/util/version:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/apps/v1/BUILD b/pkg/apis/apps/v1/BUILD index de6f65c6804..925be0c91ce 100644 --- a/pkg/apis/apps/v1/BUILD +++ b/pkg/apis/apps/v1/BUILD @@ -41,7 +41,6 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/apis/core/install:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -49,6 +48,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/apps/v1beta1/BUILD b/pkg/apis/apps/v1beta1/BUILD index 140c232a305..a4e8399d981 100644 --- a/pkg/apis/apps/v1beta1/BUILD +++ b/pkg/apis/apps/v1beta1/BUILD @@ -56,11 +56,11 @@ go_test( "//pkg/apis/apps/install:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/apps/v1beta2/BUILD b/pkg/apis/apps/v1beta2/BUILD index 4d590ada1ac..37816e1e3ca 100644 --- a/pkg/apis/apps/v1beta2/BUILD +++ b/pkg/apis/apps/v1beta2/BUILD @@ -62,7 +62,6 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/apis/core/install:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -70,5 +69,6 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/autoscaling/v1/BUILD b/pkg/apis/autoscaling/v1/BUILD index 83ab98c0ef4..bfd9fb1087b 100644 --- a/pkg/apis/autoscaling/v1/BUILD +++ b/pkg/apis/autoscaling/v1/BUILD @@ -38,9 +38,9 @@ go_test( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/autoscaling/install:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/autoscaling/v2beta1/BUILD b/pkg/apis/autoscaling/v2beta1/BUILD index 07aaa3081f6..c7c346918ed 100644 --- a/pkg/apis/autoscaling/v2beta1/BUILD +++ b/pkg/apis/autoscaling/v2beta1/BUILD @@ -51,10 +51,10 @@ go_test( "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/install:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/autoscaling/v2beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/autoscaling/validation/BUILD b/pkg/apis/autoscaling/validation/BUILD index 8281c9e8495..fb896feee99 100644 --- a/pkg/apis/autoscaling/validation/BUILD +++ b/pkg/apis/autoscaling/validation/BUILD @@ -26,9 +26,9 @@ go_test( deps = [ "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/core:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/batch/v1/BUILD b/pkg/apis/batch/v1/BUILD index c7c36b82401..20a1cd4907a 100644 --- a/pkg/apis/batch/v1/BUILD +++ b/pkg/apis/batch/v1/BUILD @@ -38,11 +38,11 @@ go_test( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/batch/install:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/batch/v1beta1/BUILD b/pkg/apis/batch/v1beta1/BUILD index 57391ed63ba..9cc1b867816 100644 --- a/pkg/apis/batch/v1beta1/BUILD +++ b/pkg/apis/batch/v1beta1/BUILD @@ -39,9 +39,9 @@ go_test( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/batch/install:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/componentconfig/v1alpha1/BUILD b/pkg/apis/componentconfig/v1alpha1/BUILD index 50a79bf925e..3b7896df3da 100644 --- a/pkg/apis/componentconfig/v1alpha1/BUILD +++ b/pkg/apis/componentconfig/v1alpha1/BUILD @@ -23,11 +23,11 @@ go_library( "//pkg/apis/core:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/master/ports:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/core/v1/BUILD b/pkg/apis/core/v1/BUILD index 328e2eb983c..bf8cfdc83b9 100644 --- a/pkg/apis/core/v1/BUILD +++ b/pkg/apis/core/v1/BUILD @@ -17,7 +17,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/features:go_default_library", "//pkg/util/parsers:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -28,6 +27,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) @@ -44,7 +44,6 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/apis/core/fuzzer:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -56,6 +55,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/core/validation/BUILD b/pkg/apis/core/validation/BUILD index 8dd3b22feda..fb9d6d48f6c 100644 --- a/pkg/apis/core/validation/BUILD +++ b/pkg/apis/core/validation/BUILD @@ -55,7 +55,6 @@ go_test( "//pkg/capabilities:go_default_library", "//pkg/features:go_default_library", "//pkg/security/apparmor:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -64,6 +63,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/apis/extensions/v1beta1/BUILD b/pkg/apis/extensions/v1beta1/BUILD index cbebc8d69b8..af78736d3d0 100644 --- a/pkg/apis/extensions/v1beta1/BUILD +++ b/pkg/apis/extensions/v1beta1/BUILD @@ -44,7 +44,6 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/apis/core/install:go_default_library", "//pkg/apis/extensions/install:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -52,6 +51,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 9bdf112658f..0a9e4706141 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -43,7 +43,6 @@ go_test( "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/kubectl/util:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -74,6 +73,7 @@ go_test( "//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD b/pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD index a74bcda1161..ec53d332233 100644 --- a/pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD +++ b/pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD @@ -22,12 +22,12 @@ go_library( "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/master/ports:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index 2c862030c23..e0c6badc478 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/oom:go_default_library", - "//pkg/util/pointer:go_default_library", "//pkg/util/sysctl:go_default_library", "//pkg/volume/empty_dir:go_default_library", "//pkg/volume/secret:go_default_library", @@ -53,6 +52,7 @@ go_library( "//test/utils:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/printers/internalversion/BUILD b/pkg/printers/internalversion/BUILD index 04e7ae152a8..1bbd50aa7f2 100644 --- a/pkg/printers/internalversion/BUILD +++ b/pkg/printers/internalversion/BUILD @@ -31,7 +31,6 @@ go_test( "//pkg/kubectl/genericclioptions:go_default_library", "//pkg/kubectl/genericclioptions/printers:go_default_library", "//pkg/printers:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", @@ -47,6 +46,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//vendor/github.com/ghodss/yaml:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/proxy/apis/kubeproxyconfig/fuzzer/BUILD b/pkg/proxy/apis/kubeproxyconfig/fuzzer/BUILD index b0be82ad083..50f3e90d630 100644 --- a/pkg/proxy/apis/kubeproxyconfig/fuzzer/BUILD +++ b/pkg/proxy/apis/kubeproxyconfig/fuzzer/BUILD @@ -7,10 +7,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/proxy/apis/kubeproxyconfig:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/github.com/google/gofuzz:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/BUILD b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/BUILD index 01ae113d611..7abc8512577 100644 --- a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/BUILD +++ b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/BUILD @@ -21,11 +21,11 @@ go_library( "//pkg/kubelet/qos:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/proxy/apis/kubeproxyconfig:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/proxy/apis/kubeproxyconfig/validation/BUILD b/pkg/proxy/apis/kubeproxyconfig/validation/BUILD index 1bf26fcfccc..1c277b298d5 100644 --- a/pkg/proxy/apis/kubeproxyconfig/validation/BUILD +++ b/pkg/proxy/apis/kubeproxyconfig/validation/BUILD @@ -38,8 +38,8 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/proxy/apis/kubeproxyconfig:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 27bee9d6cf6..2cd593108e7 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -46,7 +46,6 @@ filegroup( "//pkg/util/oom:all-srcs", "//pkg/util/parsers:all-srcs", "//pkg/util/pod:all-srcs", - "//pkg/util/pointer:all-srcs", "//pkg/util/procfs:all-srcs", "//pkg/util/reflector/prometheus:all-srcs", "//pkg/util/removeall:all-srcs", diff --git a/plugin/pkg/admission/security/podsecuritypolicy/BUILD b/plugin/pkg/admission/security/podsecuritypolicy/BUILD index 5d024b73b1c..aadfeeb6780 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/BUILD +++ b/plugin/pkg/admission/security/podsecuritypolicy/BUILD @@ -46,7 +46,6 @@ go_test( "//pkg/security/podsecuritypolicy:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -57,6 +56,7 @@ go_test( "//staging/src/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", "//staging/src/k8s.io/apiserver/pkg/authorization/authorizerfactory:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index e5317dc0415..473a97f1c03 100644 --- a/test/e2e/apps/BUILD +++ b/test/e2e/apps/BUILD @@ -37,7 +37,6 @@ go_library( "//pkg/controller/replication:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/scheduler/cache:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", @@ -66,6 +65,7 @@ go_library( "//vendor/github.com/davecgh/go-spew/spew:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/test/e2e/auth/BUILD b/test/e2e/auth/BUILD index a5afae44546..6ec1045c321 100644 --- a/test/e2e/auth/BUILD +++ b/test/e2e/auth/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", - "//pkg/util/pointer:go_default_library", "//plugin/pkg/admission/serviceaccount:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", @@ -53,6 +52,7 @@ go_library( "//vendor/github.com/evanphx/json-patch:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/test/integration/deployment/BUILD b/test/integration/deployment/BUILD index 0ebf01930f2..2467bf205f1 100644 --- a/test/integration/deployment/BUILD +++ b/test/integration/deployment/BUILD @@ -17,7 +17,6 @@ go_test( tags = ["integration"], deps = [ "//pkg/controller/deployment/util:go_default_library", - "//pkg/util/pointer:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -26,6 +25,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library", "//test/integration/framework:go_default_library", + "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/vendor/BUILD b/vendor/BUILD index 6ae9e144b6e..07c51e856e6 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -428,6 +428,7 @@ filegroup( "//vendor/k8s.io/kube-openapi/pkg/util:all-srcs", "//vendor/k8s.io/utils/clock:all-srcs", "//vendor/k8s.io/utils/exec:all-srcs", + "//vendor/k8s.io/utils/pointer:all-srcs", "//vendor/vbom.ml/util/sortorder:all-srcs", ], tags = ["automanaged"], diff --git a/vendor/k8s.io/utils/pointer/BUILD b/vendor/k8s.io/utils/pointer/BUILD new file mode 100644 index 00000000000..a41ce26388a --- /dev/null +++ b/vendor/k8s.io/utils/pointer/BUILD @@ -0,0 +1,23 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["pointer.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/utils/pointer", + importpath = "k8s.io/utils/pointer", + visibility = ["//visibility:public"], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +)