From d91c82a30d23c506faba4393ae5a315caffd742c Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans@google.com>
Date: Thu, 9 Aug 2018 15:52:59 -0700
Subject: [PATCH] Move validation dependency from pkg/apis/core/validation to
 staging

---
 pkg/kubectl/metricsutil/BUILD             | 2 +-
 pkg/kubectl/metricsutil/metrics_client.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/kubectl/metricsutil/BUILD b/pkg/kubectl/metricsutil/BUILD
index b4b5a1c3b0..9cb194df73 100644
--- a/pkg/kubectl/metricsutil/BUILD
+++ b/pkg/kubectl/metricsutil/BUILD
@@ -14,10 +14,10 @@ go_library(
         "//build/visible_to:pkg_kubectl_metricsutil_CONSUMERS",
     ],
     deps = [
-        "//pkg/apis/core/validation:go_default_library",
         "//pkg/printers: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/api/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
diff --git a/pkg/kubectl/metricsutil/metrics_client.go b/pkg/kubectl/metricsutil/metrics_client.go
index 95309608f0..7b7c13d0b8 100644
--- a/pkg/kubectl/metricsutil/metrics_client.go
+++ b/pkg/kubectl/metricsutil/metrics_client.go
@@ -21,11 +21,11 @@ import (
 	"errors"
 	"fmt"
 
+	"k8s.io/apimachinery/pkg/api/validation"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/kubernetes/pkg/apis/core/validation"
 	metricsapi "k8s.io/metrics/pkg/apis/metrics"
 	metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
 )
@@ -74,7 +74,7 @@ func podMetricsUrl(namespace string, name string) (string, error) {
 		return "", errors.New(message)
 	}
 	if len(name) > 0 {
-		errs = validation.ValidatePodName(name, false)
+		errs = validation.NameIsDNSSubdomain(name, false)
 		if len(errs) > 0 {
 			message := fmt.Sprintf("invalid pod name: %s - %v", name, errs)
 			return "", errors.New(message)
@@ -85,7 +85,7 @@ func podMetricsUrl(namespace string, name string) (string, error) {
 
 func nodeMetricsUrl(name string) (string, error) {
 	if len(name) > 0 {
-		errs := validation.ValidateNodeName(name, false)
+		errs := validation.NameIsDNSSubdomain(name, false)
 		if len(errs) > 0 {
 			message := fmt.Sprintf("invalid node name: %s - %v", name, errs)
 			return "", errors.New(message)