From 0067002db82126ec725aeabbd1dced9e3e318f01 Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Fri, 2 Feb 2018 13:51:59 -0800 Subject: [PATCH] Make a few code paths compile cleanly with 32-bit Go. --- pkg/kubelet/qos/policy_test.go | 4 ++-- pkg/volume/util/util_test.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/qos/policy_test.go b/pkg/kubelet/qos/policy_test.go index 258576b1cae..b713766960c 100644 --- a/pkg/kubelet/qos/policy_test.go +++ b/pkg/kubelet/qos/policy_test.go @@ -109,7 +109,7 @@ var ( { Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ - v1.ResourceName(v1.ResourceMemory): resource.MustParse(strconv.Itoa(standardMemoryAmount / 2)), + v1.ResourceName(v1.ResourceMemory): resource.MustParse(strconv.FormatInt(standardMemoryAmount/2, 10)), v1.ResourceName(v1.ResourceCPU): resource.MustParse("5m"), }, Limits: v1.ResourceList{ @@ -127,7 +127,7 @@ var ( { Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ - v1.ResourceName(v1.ResourceMemory): resource.MustParse(strconv.Itoa(standardMemoryAmount - 1)), + v1.ResourceName(v1.ResourceMemory): resource.MustParse(strconv.FormatInt(standardMemoryAmount-1, 10)), v1.ResourceName(v1.ResourceCPU): resource.MustParse("5m"), }, }, diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go index 35563b93fec..ae4e6587d4b 100644 --- a/pkg/volume/util/util_test.go +++ b/pkg/volume/util/util_test.go @@ -27,6 +27,7 @@ import ( // util.go uses api.Codecs.LegacyCodec so import this package to do some // resource initialization. "hash/fnv" + _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/util/mount" @@ -547,12 +548,12 @@ func createVolumeSpecWithMountOption(name string, mountOptions string, spec v1.P return &volume.Spec{PersistentVolume: pv} } -func checkFnv32(t *testing.T, s string, expected int) { +func checkFnv32(t *testing.T, s string, expected uint32) { h := fnv.New32() h.Write([]byte(s)) h.Sum32() - if int(h.Sum32()) != expected { + if h.Sum32() != expected { t.Fatalf("hash of %q was %v, expected %v", s, h.Sum32(), expected) } }