mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Make a few code paths compile cleanly with 32-bit Go.
This commit is contained in:
parent
e04b91facf
commit
0067002db8
@ -109,7 +109,7 @@ var (
|
|||||||
{
|
{
|
||||||
Resources: v1.ResourceRequirements{
|
Resources: v1.ResourceRequirements{
|
||||||
Requests: v1.ResourceList{
|
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"),
|
v1.ResourceName(v1.ResourceCPU): resource.MustParse("5m"),
|
||||||
},
|
},
|
||||||
Limits: v1.ResourceList{
|
Limits: v1.ResourceList{
|
||||||
@ -127,7 +127,7 @@ var (
|
|||||||
{
|
{
|
||||||
Resources: v1.ResourceRequirements{
|
Resources: v1.ResourceRequirements{
|
||||||
Requests: v1.ResourceList{
|
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"),
|
v1.ResourceName(v1.ResourceCPU): resource.MustParse("5m"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -27,6 +27,7 @@ import (
|
|||||||
// util.go uses api.Codecs.LegacyCodec so import this package to do some
|
// util.go uses api.Codecs.LegacyCodec so import this package to do some
|
||||||
// resource initialization.
|
// resource initialization.
|
||||||
"hash/fnv"
|
"hash/fnv"
|
||||||
|
|
||||||
_ "k8s.io/kubernetes/pkg/apis/core/install"
|
_ "k8s.io/kubernetes/pkg/apis/core/install"
|
||||||
"k8s.io/kubernetes/pkg/apis/core/v1/helper"
|
"k8s.io/kubernetes/pkg/apis/core/v1/helper"
|
||||||
"k8s.io/kubernetes/pkg/util/mount"
|
"k8s.io/kubernetes/pkg/util/mount"
|
||||||
@ -547,12 +548,12 @@ func createVolumeSpecWithMountOption(name string, mountOptions string, spec v1.P
|
|||||||
return &volume.Spec{PersistentVolume: pv}
|
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 := fnv.New32()
|
||||||
h.Write([]byte(s))
|
h.Write([]byte(s))
|
||||||
h.Sum32()
|
h.Sum32()
|
||||||
|
|
||||||
if int(h.Sum32()) != expected {
|
if h.Sum32() != expected {
|
||||||
t.Fatalf("hash of %q was %v, expected %v", s, h.Sum32(), expected)
|
t.Fatalf("hash of %q was %v, expected %v", s, h.Sum32(), expected)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user