From 8debebccfb637d2d81add8e74ba61f4ec009af4a Mon Sep 17 00:00:00 2001 From: Jeffrey Regan Date: Fri, 19 May 2017 14:33:08 -0700 Subject: [PATCH] **What this PR does / why we need it**: Remove kubectl's dependence on pkg/api/helper, as part of broader effort to isolate kubectl from the rest of k8s. In this case, the code becomes private to kubectl; nobody else uses it. **Which issue this PR fixes** Part of a series of PRs to address kubernetes/community#598 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` Kubernetes-commit: 5a9b06b717805ad47da1edda6018fea107ac4ce9 --- Godeps/Godeps.json | 2 +- pkg/api/helper/BUILD | 1 - pkg/api/helper/helpers.go | 23 ----------------------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 4fcf2261..c226ee1d 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/client-go", - "GoVersion": "go1.8", + "GoVersion": "go1.7", "GodepVersion": "v79", "Packages": [ "./..." diff --git a/pkg/api/helper/BUILD b/pkg/api/helper/BUILD index 0fd3da5a..80f9cc2c 100644 --- a/pkg/api/helper/BUILD +++ b/pkg/api/helper/BUILD @@ -19,7 +19,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/selection:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/client-go/pkg/api:go_default_library", diff --git a/pkg/api/helper/helpers.go b/pkg/api/helper/helpers.go index 72fae6bf..3bce0e54 100644 --- a/pkg/api/helper/helpers.go +++ b/pkg/api/helper/helpers.go @@ -17,18 +17,15 @@ limitations under the License. package helper import ( - "crypto/md5" "encoding/json" "fmt" "strings" - "time" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" @@ -262,14 +259,6 @@ func AddToNodeAddresses(addresses *[]api.NodeAddress, addAddresses ...api.NodeAd } } -func HashObject(obj runtime.Object, codec runtime.Codec) (string, error) { - data, err := runtime.Encode(codec, obj) - if err != nil { - return "", err - } - return fmt.Sprintf("%x", md5.Sum(data)), nil -} - // TODO: make method on LoadBalancerStatus? func LoadBalancerStatusEqual(l, r *api.LoadBalancerStatus) bool { return ingressSliceEqual(l.Ingress, r.Ingress) @@ -362,18 +351,6 @@ func containsAccessMode(modes []api.PersistentVolumeAccessMode, mode api.Persist return false } -// ParseRFC3339 parses an RFC3339 date in either RFC3339Nano or RFC3339 format. -func ParseRFC3339(s string, nowFn func() metav1.Time) (metav1.Time, error) { - if t, timeErr := time.Parse(time.RFC3339Nano, s); timeErr == nil { - return metav1.Time{Time: t}, nil - } - t, err := time.Parse(time.RFC3339, s) - if err != nil { - return metav1.Time{}, err - } - return metav1.Time{Time: t}, nil -} - // NodeSelectorRequirementsAsSelector converts the []NodeSelectorRequirement api type into a struct that implements // labels.Selector. func NodeSelectorRequirementsAsSelector(nsm []api.NodeSelectorRequirement) (labels.Selector, error) {