From 96a8ff6bd63105e6ac7f8d8daf1be8a6dd4118e3 Mon Sep 17 00:00:00 2001
From: linweibin <linweibin1@huawei.com>
Date: Wed, 6 Dec 2017 15:15:35 +0800
Subject: [PATCH] Remove unused code in pkg/api/,pkg/apis/

---
 pkg/api/resource/BUILD                        |  1 -
 pkg/api/resource/helpers_test.go              | 20 -------------------
 pkg/api/testing/BUILD                         |  1 -
 pkg/api/testing/serialization_test.go         | 13 ------------
 pkg/apis/core/validation/validation.go        |  9 ---------
 .../extensions/validation/validation_test.go  |  7 -------
 6 files changed, 51 deletions(-)

diff --git a/pkg/api/resource/BUILD b/pkg/api/resource/BUILD
index f31dbd9db26..47850ca889a 100644
--- a/pkg/api/resource/BUILD
+++ b/pkg/api/resource/BUILD
@@ -37,6 +37,5 @@ go_test(
     deps = [
         "//pkg/apis/core:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
     ],
 )
diff --git a/pkg/api/resource/helpers_test.go b/pkg/api/resource/helpers_test.go
index 7d55c18d80b..b8917a58483 100644
--- a/pkg/api/resource/helpers_test.go
+++ b/pkg/api/resource/helpers_test.go
@@ -18,10 +18,8 @@ package resource
 
 import (
 	"testing"
-	"time"
 
 	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
@@ -62,21 +60,3 @@ func TestDefaultResourceHelpers(t *testing.T) {
 		t.Errorf("expected %v, actual %v", resource.BinarySI, resourceList.Memory().Format)
 	}
 }
-
-func newPod(now metav1.Time, ready bool, beforeSec int) *api.Pod {
-	conditionStatus := api.ConditionFalse
-	if ready {
-		conditionStatus = api.ConditionTrue
-	}
-	return &api.Pod{
-		Status: api.PodStatus{
-			Conditions: []api.PodCondition{
-				{
-					Type:               api.PodReady,
-					LastTransitionTime: metav1.NewTime(now.Time.Add(-1 * time.Duration(beforeSec) * time.Second)),
-					Status:             conditionStatus,
-				},
-			},
-		},
-	}
-}
diff --git a/pkg/api/testing/BUILD b/pkg/api/testing/BUILD
index 9c04ee34584..8d52ce4c2b0 100644
--- a/pkg/api/testing/BUILD
+++ b/pkg/api/testing/BUILD
@@ -85,7 +85,6 @@ go_test(
         "//pkg/apis/extensions:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//vendor/github.com/gogo/protobuf/proto:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
         "//vendor/github.com/google/gofuzz:go_default_library",
         "//vendor/github.com/json-iterator/go:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
diff --git a/pkg/api/testing/serialization_test.go b/pkg/api/testing/serialization_test.go
index d47fad73fd7..64f6a7d7ec3 100644
--- a/pkg/api/testing/serialization_test.go
+++ b/pkg/api/testing/serialization_test.go
@@ -23,10 +23,8 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"reflect"
-	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	jsoniter "github.com/json-iterator/go"
 
 	"k8s.io/api/core/v1"
@@ -66,17 +64,6 @@ func fuzzInternalObject(t *testing.T, forVersion schema.GroupVersion, item runti
 	return item
 }
 
-// dataAsString returns the given byte array as a string; handles detecting
-// protocol buffers.
-func dataAsString(data []byte) string {
-	dataString := string(data)
-	if !strings.HasPrefix(dataString, "{") {
-		dataString = "\n" + hex.Dump(data)
-		proto.NewBuffer(make([]byte, 0, 1024)).DebugPrint("decoded object", data)
-	}
-	return dataString
-}
-
 func Convert_v1beta1_ReplicaSet_to_api_ReplicationController(in *v1beta1.ReplicaSet, out *api.ReplicationController, s conversion.Scope) error {
 	intermediate1 := &extensions.ReplicaSet{}
 	if err := k8s_v1beta1.Convert_v1beta1_ReplicaSet_To_extensions_ReplicaSet(in, intermediate1, s); err != nil {
diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go
index 655d0bf2163..708165255f1 100644
--- a/pkg/apis/core/validation/validation.go
+++ b/pkg/apis/core/validation/validation.go
@@ -212,15 +212,6 @@ func ValidateOwnerReferences(ownerReferences []metav1.OwnerReference, fldPath *f
 // value that were not valid.  Otherwise this returns an empty list or nil.
 type ValidateNameFunc apimachineryvalidation.ValidateNameFunc
 
-// maskTrailingDash replaces the final character of a string with a subdomain safe
-// value if is a dash.
-func maskTrailingDash(name string) string {
-	if strings.HasSuffix(name, "-") {
-		return name[:len(name)-2] + "a"
-	}
-	return name
-}
-
 // ValidatePodName can be used to check whether the given pod name is valid.
 // Prefix indicates this name will be used as part of generation, in which case
 // trailing dashes are allowed.
diff --git a/pkg/apis/extensions/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go
index 4a3818801ff..d3a0d0fce1d 100644
--- a/pkg/apis/extensions/validation/validation_test.go
+++ b/pkg/apis/extensions/validation/validation_test.go
@@ -1232,11 +1232,6 @@ func TestValidateDeployment(t *testing.T) {
 	}
 }
 
-func int64p(i int) *int64 {
-	i64 := int64(i)
-	return &i64
-}
-
 func TestValidateDeploymentStatus(t *testing.T) {
 	collisionCount := int32(-3)
 	tests := []struct {
@@ -1473,8 +1468,6 @@ func TestValidateDeploymentRollback(t *testing.T) {
 	}
 }
 
-type ingressRules map[string]string
-
 func TestValidateIngress(t *testing.T) {
 	defaultBackend := extensions.IngressBackend{
 		ServiceName: "default-backend",