From 8323fb4b4fc64bb91ec90eef09b5b8c131bfcff1 Mon Sep 17 00:00:00 2001 From: mattjmcnaughton Date: Sat, 9 Sep 2017 19:52:12 -0400 Subject: [PATCH] Modify `apimachinery` imports using `staging` Currently some of the imports of `apimachinery` use `k8s.io/kubernetes/staging/src/k8s.io/apimachinery...`. Replace these with `k8s.io/apimachinery`, as is in use throughout the rest of the code base. Signed-off-by: mattjmcnaughton --- cmd/kubeadm/app/phases/certs/BUILD | 2 +- cmd/kubeadm/app/phases/certs/certs.go | 2 +- pkg/controller/daemon/BUILD | 2 +- pkg/controller/daemon/update.go | 2 +- pkg/controller/deployment/BUILD | 2 +- pkg/controller/deployment/sync.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/kubeadm/app/phases/certs/BUILD b/cmd/kubeadm/app/phases/certs/BUILD index 16e44355db9..34822d4b96e 100644 --- a/cmd/kubeadm/app/phases/certs/BUILD +++ b/cmd/kubeadm/app/phases/certs/BUILD @@ -30,7 +30,7 @@ go_library( "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/phases/certs/pkiutil:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//vendor/k8s.io/client-go/util/cert:go_default_library", ], ) diff --git a/cmd/kubeadm/app/phases/certs/certs.go b/cmd/kubeadm/app/phases/certs/certs.go index f96fe7ef7dd..3eebcfc2846 100644 --- a/cmd/kubeadm/app/phases/certs/certs.go +++ b/cmd/kubeadm/app/phases/certs/certs.go @@ -24,12 +24,12 @@ import ( "os" "path/filepath" + "k8s.io/apimachinery/pkg/util/validation" certutil "k8s.io/client-go/util/cert" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/pkiutil" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/validation" ) // CreatePKIAssets will create and write to disk all PKI assets necessary to establish the control plane. diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index cedbe39e124..f3edd8dc2e4 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -25,7 +25,6 @@ go_library( "//plugin/pkg/scheduler/algorithm:go_default_library", "//plugin/pkg/scheduler/algorithm/predicates:go_default_library", "//plugin/pkg/scheduler/schedulercache:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", @@ -37,6 +36,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/json:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/rand:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", diff --git a/pkg/controller/daemon/update.go b/pkg/controller/daemon/update.go index bbbb4d68f91..1ed7f3f0f5e 100644 --- a/pkg/controller/daemon/update.go +++ b/pkg/controller/daemon/update.go @@ -32,11 +32,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" intstrutil "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/json" + "k8s.io/apimachinery/pkg/util/rand" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/daemon/util" labelsutil "k8s.io/kubernetes/pkg/util/labels" - "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/rand" ) // rollingUpdate deletes old daemon set pods making sure that no more than diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 44b5cdea411..6350804a678 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -21,7 +21,6 @@ go_library( "//pkg/controller/deployment/util:go_default_library", "//pkg/util/labels:go_default_library", "//pkg/util/metrics:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", @@ -30,6 +29,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/rand:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/client-go/informers/core/v1:go_default_library", diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index cd08decd60d..4006ee2379e 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -29,10 +29,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" labelsutil "k8s.io/kubernetes/pkg/util/labels" - "k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/rand" ) // syncStatusOnly only updates Deployments Status and doesn't take any mutating actions.