From e35eb4a0b5ceacb674dbb0ef7462a6c0d421fb4d Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Thu, 19 Sep 2019 14:27:07 +0200 Subject: [PATCH] Run ./hack/update-gofmt --- hack/update-gofmt.sh | 49 +++++++++++++++++++ hack/verify-gofmt.sh | 4 +- pkg/descheduler/evictions/evictions_test.go | 2 +- pkg/descheduler/node/node.go | 2 +- pkg/descheduler/node/node_test.go | 2 +- pkg/descheduler/pod/pods_test.go | 2 +- pkg/descheduler/strategies/duplicates_test.go | 2 +- .../strategies/lownodeutilization_test.go | 4 +- pkg/descheduler/strategies/node_affinity.go | 2 +- .../strategies/node_affinity_test.go | 6 +-- .../strategies/pod_antiaffinity_test.go | 2 +- test/e2e/e2e_test.go | 10 ++-- 12 files changed, 68 insertions(+), 19 deletions(-) create mode 100755 hack/update-gofmt.sh diff --git a/hack/update-gofmt.sh b/hack/update-gofmt.sh new file mode 100755 index 000000000..4bef00ed8 --- /dev/null +++ b/hack/update-gofmt.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# Copyright 2017 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. + + +set -o errexit +set -o nounset +set -o pipefail + +DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/.. + +GO_VERSION=($(go version)) + +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|go1.9|go1.10|go1.11|go1.12') ]]; then + echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." + exit 1 +fi + +cd "${DESCHEDULER_ROOT}" + +find_files() { + find . -not \( \ + \( \ + -wholename './output' \ + -o -wholename './_output' \ + -o -wholename './release' \ + -o -wholename './target' \ + -o -wholename './.git' \ + -o -wholename '*/third_party/*' \ + -o -wholename '*/Godeps/*' \ + -o -wholename '*/vendor/*' \ + \) -prune \ + \) -name '*.go' +} + +GOFMT="gofmt -s -w" +find_files | xargs $GOFMT -l diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 08ab75f21..747e54a71 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -23,7 +23,7 @@ DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/.. GO_VERSION=($(go version)) -if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|go1.9|go1.10|go1.11') ]]; then +if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6|go1.7|go1.8|go1.9|go1.10|go1.11|go1.12') ]]; then echo "Unknown go version '${GO_VERSION[2]}', skipping gofmt." exit 1 fi @@ -45,7 +45,7 @@ find_files() { \) -name '*.go' } -GOFMT="gofmt -s" +GOFMT="gofmt -s" bad_files=$(find_files | xargs $GOFMT -l) if [[ -n "${bad_files}" ]]; then echo "!!! '$GOFMT' needs to be run on the following files: " diff --git a/pkg/descheduler/evictions/evictions_test.go b/pkg/descheduler/evictions/evictions_test.go index 79f177c41..fb1e942cc 100644 --- a/pkg/descheduler/evictions/evictions_test.go +++ b/pkg/descheduler/evictions/evictions_test.go @@ -17,11 +17,11 @@ limitations under the License. package evictions import ( - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "sigs.k8s.io/descheduler/test" "testing" ) diff --git a/pkg/descheduler/node/node.go b/pkg/descheduler/node/node.go index cdcfdc070..7ab39051d 100644 --- a/pkg/descheduler/node/node.go +++ b/pkg/descheduler/node/node.go @@ -20,7 +20,6 @@ import ( "time" "github.com/golang/glog" - "sigs.k8s.io/descheduler/pkg/utils" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -28,6 +27,7 @@ import ( clientset "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" + "sigs.k8s.io/descheduler/pkg/utils" ) // ReadyNodes returns ready nodes irrespective of whether they are diff --git a/pkg/descheduler/node/node_test.go b/pkg/descheduler/node/node_test.go index 27b7b3ea4..5cf5797b7 100644 --- a/pkg/descheduler/node/node_test.go +++ b/pkg/descheduler/node/node_test.go @@ -19,10 +19,10 @@ package node import ( "testing" - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" + "sigs.k8s.io/descheduler/test" ) func TestReadyNodes(t *testing.T) { diff --git a/pkg/descheduler/pod/pods_test.go b/pkg/descheduler/pod/pods_test.go index a6f54d484..2c87e3874 100644 --- a/pkg/descheduler/pod/pods_test.go +++ b/pkg/descheduler/pod/pods_test.go @@ -19,9 +19,9 @@ package pod import ( "testing" - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" + "sigs.k8s.io/descheduler/test" ) func TestPodTypes(t *testing.T) { diff --git a/pkg/descheduler/strategies/duplicates_test.go b/pkg/descheduler/strategies/duplicates_test.go index d5dd31042..d80625727 100644 --- a/pkg/descheduler/strategies/duplicates_test.go +++ b/pkg/descheduler/strategies/duplicates_test.go @@ -19,12 +19,12 @@ package strategies import ( "testing" - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "sigs.k8s.io/descheduler/test" ) func TestFindDuplicatePods(t *testing.T) { diff --git a/pkg/descheduler/strategies/lownodeutilization_test.go b/pkg/descheduler/strategies/lownodeutilization_test.go index e6ebc296c..a35a44afa 100644 --- a/pkg/descheduler/strategies/lownodeutilization_test.go +++ b/pkg/descheduler/strategies/lownodeutilization_test.go @@ -21,14 +21,14 @@ import ( "strings" "testing" - "sigs.k8s.io/descheduler/pkg/api" - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" "reflect" + "sigs.k8s.io/descheduler/pkg/api" + "sigs.k8s.io/descheduler/test" ) // TODO: Make this table driven. diff --git a/pkg/descheduler/strategies/node_affinity.go b/pkg/descheduler/strategies/node_affinity.go index cd4506a0e..3a697960e 100644 --- a/pkg/descheduler/strategies/node_affinity.go +++ b/pkg/descheduler/strategies/node_affinity.go @@ -18,12 +18,12 @@ package strategies import ( "github.com/golang/glog" + "k8s.io/api/core/v1" "sigs.k8s.io/descheduler/cmd/descheduler/app/options" "sigs.k8s.io/descheduler/pkg/api" "sigs.k8s.io/descheduler/pkg/descheduler/evictions" nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node" podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod" - "k8s.io/api/core/v1" ) func RemovePodsViolatingNodeAffinity(ds *options.DeschedulerServer, strategy api.DeschedulerStrategy, evictionPolicyGroupVersion string, nodes []*v1.Node, nodePodCount nodePodEvictedCount) { diff --git a/pkg/descheduler/strategies/node_affinity_test.go b/pkg/descheduler/strategies/node_affinity_test.go index 039b7bdcd..792a7afa0 100644 --- a/pkg/descheduler/strategies/node_affinity_test.go +++ b/pkg/descheduler/strategies/node_affinity_test.go @@ -19,13 +19,13 @@ package strategies import ( "testing" - "sigs.k8s.io/descheduler/cmd/descheduler/app/options" - "sigs.k8s.io/descheduler/pkg/api" - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "sigs.k8s.io/descheduler/cmd/descheduler/app/options" + "sigs.k8s.io/descheduler/pkg/api" + "sigs.k8s.io/descheduler/test" ) func TestRemovePodsViolatingNodeAffinity(t *testing.T) { diff --git a/pkg/descheduler/strategies/pod_antiaffinity_test.go b/pkg/descheduler/strategies/pod_antiaffinity_test.go index 4d672d67e..1cb62786a 100644 --- a/pkg/descheduler/strategies/pod_antiaffinity_test.go +++ b/pkg/descheduler/strategies/pod_antiaffinity_test.go @@ -19,12 +19,12 @@ package strategies import ( "testing" - "sigs.k8s.io/descheduler/test" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + "sigs.k8s.io/descheduler/test" ) func TestPodAntiAffinity(t *testing.T) { diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index b203bb09f..e190affcd 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -22,6 +22,11 @@ import ( "testing" "time" + "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/kubernetes/pkg/api/testapi" "sigs.k8s.io/descheduler/cmd/descheduler/app/options" deschedulerapi "sigs.k8s.io/descheduler/pkg/api" "sigs.k8s.io/descheduler/pkg/descheduler/client" @@ -29,11 +34,6 @@ import ( nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node" podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod" "sigs.k8s.io/descheduler/pkg/descheduler/strategies" - "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/pkg/api/testapi" ) func MakePodSpec() v1.PodSpec {