From 5f2df1f88f6a0c31e4cbc042a19ed9f1cc6bb7a9 Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Fri, 3 Mar 2017 15:33:54 +0530 Subject: [PATCH 1/2] remove unused federation_util.go --- test/e2e/framework/federation_util.go | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 test/e2e/framework/federation_util.go diff --git a/test/e2e/framework/federation_util.go b/test/e2e/framework/federation_util.go deleted file mode 100644 index da5caacf097..00000000000 --- a/test/e2e/framework/federation_util.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2016 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 framework - -import ( - "fmt" - "regexp" - - validationutil "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/kubernetes/pkg/api/validation" -) - -// GetValidDNSSubdomainName massages the given name to be a valid dns subdomain name. -// Most resources (such as secrets, clusters) require the names to be valid dns subdomain. -// This is a generic function (not specific to federation). Should be moved to a more generic location if others want to use it. -func GetValidDNSSubdomainName(name string) (string, error) { - // "_" are not allowed. Replace them by "-". - name = regexp.MustCompile("_").ReplaceAllLiteralString(name, "-") - maxLength := validationutil.DNS1123SubdomainMaxLength - if len(name) > maxLength { - name = name[0 : maxLength-1] - } - // Verify that name now passes the validation. - if errors := validation.NameIsDNSSubdomain(name, false); len(errors) != 0 { - return "", fmt.Errorf("errors in converting name to a valid DNS subdomain %s", errors) - } - return name, nil -} From 0fe664c2648352fe227f82d739d91e8cf6d9ec58 Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Fri, 3 Mar 2017 15:34:40 +0530 Subject: [PATCH 2/2] auto generated bazel build file --- test/e2e/framework/BUILD | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index a3fa78a6ad7..08f154082dc 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -13,7 +13,6 @@ go_library( "authorizer_util.go", "cleanup.go", "exec_util.go", - "federation_util.go", "firewall_util.go", "framework.go", "get-kubemark-resource-usage.go", @@ -39,7 +38,6 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/service:go_default_library", - "//pkg/api/validation:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/apis/batch:go_default_library", @@ -117,7 +115,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/util/uuid", - "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apimachinery/pkg/util/yaml", "//vendor:k8s.io/apimachinery/pkg/watch",