github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix vet-go.sh and some things it complained about

Browse Source
This commit is contained in:
Daniel Smith 2014-10-15 11:56:19 -07:00
parent 68a784439b
commit d4c750a878
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/integration/integration.go
View File

@ -76,7 +76,7 @@ func (fakePodInfoGetter) GetPodInfo(host, podNamespace, podID string) (api.PodIn
Port: 10251, Port: 10251,
} }
default: default:
glog.Fatalf("Can't get info for: '%v', '%v'", host, podNamespace, podID) glog.Fatalf("Can't get info for: '%v', '%v - %v'", host, podNamespace, podID)
} }
return c.GetPodInfo("localhost", podNamespace, podID) return c.GetPodInfo("localhost", podNamespace, podID)
} }

4
hack/vet-go.sh
View File

@ -19,10 +19,10 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_REPO_ROOT=$(dirname "${BASH_SOURCE}")/..
# Set the environment variables required by the build. # Set the environment variables required by the build.
source "${KUBE_ROOT}/hack/config-go.sh" source "${KUBE_REPO_ROOT}/hack/config-go.sh"
# Go to the top of the tree. # Go to the top of the tree.
cd "${KUBE_REPO_ROOT}" cd "${KUBE_REPO_ROOT}"

2
pkg/api/latest/latest_test.go
View File

@ -139,7 +139,7 @@ func TestResourceVersioner(t *testing.T) {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
if version != "10" { if version != "10" {
t.Errorf("unexpected version %d", version) t.Errorf("unexpected version %v", version)
} }
} }

2
plugin/pkg/scheduler/factory/factory.go
View File

@ -211,7 +211,7 @@ func (s *storeToMinionLister) GetNodeInfo(id string) (*api.Minion, error) {
if minion, ok := s.Get(id); ok { if minion, ok := s.Get(id); ok {
return minion.(*api.Minion), nil return minion.(*api.Minion), nil
} }
return nil, fmt.Errorf("minion '%v' is not in cache") return nil, fmt.Errorf("minion '%v' is not in cache", id)
} }
// storeToPodLister turns a store into a pod lister. The store must contain (only) pods. // storeToPodLister turns a store into a pod lister. The store must contain (only) pods.