From 124a5ddf725c4862520d8619017cac9db7a03522 Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Fri, 24 Jul 2020 11:13:07 -0400
Subject: [PATCH] Fix int->string casts
---
pkg/kubelet/container/cache_test.go | 2 +-
pkg/kubelet/kubelet_test.go | 3 ++-
pkg/kubelet/network/dns/dns_test.go | 5 ++--
pkg/kubelet/pod_workers_test.go | 27 ++++++++++---------
pkg/scheduler/scheduler.go | 3 ++-
diff --git a/pkg/kubelet/container/cache_test.go b/pkg/kubelet/container/cache_test.go
index 5362bc5715895..04d1c2e32eb66 100644
--- a/pkg/kubelet/container/cache_test.go
+++ b/pkg/kubelet/container/cache_test.go
@@ -49,7 +49,7 @@ func getTestPodIDAndStatus(numContainers
status = &PodStatus{ID: id}
}
for i := 0; i < numContainers; i++ {
- status.ContainerStatuses = append(status.ContainerStatuses, &ContainerStatus{Name: string(i)})
+ status.ContainerStatuses = append(status.ContainerStatuses, &ContainerStatus{Name: strconv.Itoa(i)})
}
return id, status
}
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 2416f495ac1a8..73ac185b38c90 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -21,6 +21,7 @@ import (
"io/ioutil"
"os"
"sort"
+ "strconv"
"testing"
"time"
@@ -353,7 +354,7 @@ func newTestPods(count int) []*v1.Pod {
HostNetwork: true,
},
ObjectMeta: metav1.ObjectMeta{
- UID: types.UID(10000 + i),
+ UID: types.UID(strconv.Itoa(10000 + i)),
Name: fmt.Sprintf("pod%d", i),
},
}
diff --git a/pkg/kubelet/network/dns/dns_test.go b/pkg/kubelet/network/dns/dns_test.go
index de4bf62004114..9a0019686276e 100644
--- a/pkg/kubelet/network/dns/dns_test.go
+++ b/pkg/kubelet/network/dns/dns_test.go
@@ -21,10 +21,11 @@ import (
"io/ioutil"
"net"
"os"
+ "strconv"
"strings"
"testing"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
@@ -632,7 +633,7 @@ func newTestPods(count int) []*v1.Pod {
HostNetwork: true,
},
ObjectMeta: metav1.ObjectMeta{
- UID: types.UID(10000 + i),
+ UID: types.UID(strconv.Itoa(10000 + i)),
Name: fmt.Sprintf("pod%d", i),
},
}
diff --git a/pkg/kubelet/pod_workers_test.go b/pkg/kubelet/pod_workers_test.go
index 3584b54fa4921..f13761203ecc9 100644
--- a/pkg/kubelet/pod_workers_test.go
+++ b/pkg/kubelet/pod_workers_test.go
@@ -18,11 +18,12 @@ package kubelet
import (
"reflect"
+ "strconv"
"sync"
"testing"
"time"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/clock"
@@ -114,7 +115,7 @@ func drainWorkers(podWorkers *podWorkers
stillWorking := false
podWorkers.podLock.Lock()
for i := 0; i < numPods; i++ {
- if podWorkers.isWorking[types.UID(string(i))] {
+ if podWorkers.isWorking[types.UID(strconv.Itoa(i))] {
stillWorking = true
}
}
@@ -133,7 +134,7 @@ func TestUpdatePod(t *testing.T) {
for i := 0; i < numPods; i++ {
for j := i; j < numPods; j++ {
podWorkers.UpdatePod(&UpdatePodOptions{
- Pod: newPod(string(j), string(i)),
+ Pod: newPod(strconv.Itoa(j), strconv.Itoa(i)),
UpdateType: kubetypes.SyncPodCreate,
})
}
@@ -145,7 +146,7 @@ func TestUpdatePod(t *testing.T) {
return
}
for i := 0; i < numPods; i++ {
- uid := types.UID(i)
+ uid := types.UID(strconv.Itoa(i))
if len(processed[uid]) < 1 || len(processed[uid]) > i+1 {
t.Errorf("Pod %v processed %v times", i, len(processed[uid]))
continue
@@ -154,11 +155,11 @@ func TestUpdatePod(t *testing.T) {
// PodWorker guarantees the first and the last event will be processed
first := 0
last := len(processed[uid]) - 1
- if processed[uid][first].name != string(0) {
+ if processed[uid][first].name != "0" {
t.Errorf("Pod %v: incorrect order %v, %v", i, first, processed[uid][first])
}
- if processed[uid][last].name != string(i) {
+ if processed[uid][last].name != strconv.Itoa(i) {
t.Errorf("Pod %v: incorrect order %v, %v", i, last, processed[uid][last])
}
}
@@ -168,7 +169,7 @@ func TestUpdatePodDoesNotForgetSyncPodKi
podWorkers, processed := createPodWorkers()
numPods := 20
for i := 0; i < numPods; i++ {
- pod := newPod(string(i), string(i))
+ pod := newPod(strconv.Itoa(i), strconv.Itoa(i))
podWorkers.UpdatePod(&UpdatePodOptions{
Pod: pod,
UpdateType: kubetypes.SyncPodCreate,
@@ -188,7 +189,7 @@ func TestUpdatePodDoesNotForgetSyncPodKi
return
}
for i := 0; i < numPods; i++ {
- uid := types.UID(i)
+ uid := types.UID(strconv.Itoa(i))
// each pod should be processed two times (create, kill, but not update)
syncPodRecords := processed[uid]
if len(syncPodRecords) < 2 {
@@ -210,7 +211,7 @@ func TestForgetNonExistingPodWorkers(t *
numPods := 20
for i := 0; i < numPods; i++ {
podWorkers.UpdatePod(&UpdatePodOptions{
- Pod: newPod(string(i), "name"),
+ Pod: newPod(strconv.Itoa(i), "name"),
UpdateType: kubetypes.SyncPodUpdate,
})
}
@@ -221,16 +222,16 @@ func TestForgetNonExistingPodWorkers(t *
}
desiredPods := map[types.UID]sets.Empty{}
- desiredPods[types.UID(2)] = sets.Empty{}
- desiredPods[types.UID(14)] = sets.Empty{}
+ desiredPods[types.UID("2")] = sets.Empty{}
+ desiredPods[types.UID("14")] = sets.Empty{}
podWorkers.ForgetNonExistingPodWorkers(desiredPods)
if len(podWorkers.podUpdates) != 2 {
t.Errorf("Incorrect number of open channels %v", len(podWorkers.podUpdates))
}
- if _, exists := podWorkers.podUpdates[types.UID(2)]; !exists {
+ if _, exists := podWorkers.podUpdates[types.UID("2")]; !exists {
t.Errorf("No updates channel for pod 2")
}
- if _, exists := podWorkers.podUpdates[types.UID(14)]; !exists {
+ if _, exists := podWorkers.podUpdates[types.UID("14")]; !exists {
t.Errorf("No updates channel for pod 14")
}