github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93425 from liggitt/string-cast

Browse Source 
Fix int->string casts
This commit is contained in:
Kubernetes Prow Robot 2020-07-24 23:12:16 -07:00 committed by GitHub
commit 19caf38665
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/container/cache_test.go
View File

@ -49,7 +49,7 @@ func getTestPodIDAndStatus(numContainers int) (types.UID, *PodStatus) {
status = &PodStatus{ID: id} status = &PodStatus{ID: id}
} }
for i := 0; i < numContainers; i++ { for i := 0; i < numContainers; i++ {
status.ContainerStatuses = append(status.ContainerStatuses, &Status{Name: string(i)}) status.ContainerStatuses = append(status.ContainerStatuses, &Status{Name: strconv.Itoa(i)})
} }
return id, status return id, status
} }

3
pkg/kubelet/kubelet_test.go
View File

@ -21,6 +21,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"sort" "sort"
"strconv"
"testing" "testing"
"time" "time"
@ -355,7 +356,7 @@ func newTestPods(count int) []*v1.Pod {
HostNetwork: true, HostNetwork: true,
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
UID: types.UID(10000 + i), UID: types.UID(strconv.Itoa(10000 + i)),
Name: fmt.Sprintf("pod%d", i), Name: fmt.Sprintf("pod%d", i),
}, },
} }

5
pkg/kubelet/network/dns/dns_test.go
View File

@ -21,10 +21,11 @@ import (
"io/ioutil" "io/ioutil"
"net" "net"
"os" "os"
"strconv"
"strings" "strings"
"testing" "testing"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
@ -632,7 +633,7 @@ func newTestPods(count int) []*v1.Pod {
HostNetwork: true, HostNetwork: true,
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
UID: types.UID(10000 + i), UID: types.UID(strconv.Itoa(10000 + i)),
Name: fmt.Sprintf("pod%d", i), Name: fmt.Sprintf("pod%d", i),
}, },
} }

27
pkg/kubelet/pod_workers_test.go
View File

@ -18,11 +18,12 @@ package kubelet
import ( import (
"reflect" "reflect"
"strconv"
"sync" "sync"
"testing" "testing"
"time" "time"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/clock"
@ -114,7 +115,7 @@ func drainWorkers(podWorkers *podWorkers, numPods int) {
stillWorking := false stillWorking := false
podWorkers.podLock.Lock() podWorkers.podLock.Lock()
for i := 0; i < numPods; i++ { for i := 0; i < numPods; i++ {
if podWorkers.isWorking[types.UID(string(i))] { if podWorkers.isWorking[types.UID(strconv.Itoa(i))] {
stillWorking = true stillWorking = true
} }
} }
@ -133,7 +134,7 @@ func TestUpdatePod(t *testing.T) {
for i := 0; i < numPods; i++ { for i := 0; i < numPods; i++ {
for j := i; j < numPods; j++ { for j := i; j < numPods; j++ {
podWorkers.UpdatePod(&UpdatePodOptions{ podWorkers.UpdatePod(&UpdatePodOptions{
Pod: newPod(string(j), string(i)), Pod: newPod(strconv.Itoa(j), strconv.Itoa(i)),
UpdateType: kubetypes.SyncPodCreate, UpdateType: kubetypes.SyncPodCreate,
}) })
} }
@ -145,7 +146,7 @@ func TestUpdatePod(t *testing.T) {
return return
} }
for i := 0; i < numPods; i++ { 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 { if len(processed[uid]) < 1 || len(processed[uid]) > i+1 {
t.Errorf("Pod %v processed %v times", i, len(processed[uid])) t.Errorf("Pod %v processed %v times", i, len(processed[uid]))
continue continue
@ -154,11 +155,11 @@ func TestUpdatePod(t *testing.T) {
// PodWorker guarantees the first and the last event will be processed // PodWorker guarantees the first and the last event will be processed
first := 0 first := 0
last := len(processed[uid]) - 1 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]) 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]) t.Errorf("Pod %v: incorrect order %v, %v", i, last, processed[uid][last])
} }
} }
@ -168,7 +169,7 @@ func TestUpdatePodDoesNotForgetSyncPodKill(t *testing.T) {
podWorkers, processed := createPodWorkers() podWorkers, processed := createPodWorkers()
numPods := 20 numPods := 20
for i := 0; i < numPods; i++ { for i := 0; i < numPods; i++ {
pod := newPod(string(i), string(i)) pod := newPod(strconv.Itoa(i), strconv.Itoa(i))
podWorkers.UpdatePod(&UpdatePodOptions{ podWorkers.UpdatePod(&UpdatePodOptions{
Pod: pod, Pod: pod,
UpdateType: kubetypes.SyncPodCreate, UpdateType: kubetypes.SyncPodCreate,
@ -188,7 +189,7 @@ func TestUpdatePodDoesNotForgetSyncPodKill(t *testing.T) {
return return
} }
for i := 0; i < numPods; i++ { 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) // each pod should be processed two times (create, kill, but not update)
syncPodRecords := processed[uid] syncPodRecords := processed[uid]
if len(syncPodRecords) < 2 { if len(syncPodRecords) < 2 {
@ -210,7 +211,7 @@ func TestForgetNonExistingPodWorkers(t *testing.T) {
numPods := 20 numPods := 20
for i := 0; i < numPods; i++ { for i := 0; i < numPods; i++ {
podWorkers.UpdatePod(&UpdatePodOptions{ podWorkers.UpdatePod(&UpdatePodOptions{
Pod: newPod(string(i), "name"), Pod: newPod(strconv.Itoa(i), "name"),
UpdateType: kubetypes.SyncPodUpdate, UpdateType: kubetypes.SyncPodUpdate,
}) })
} }
@ -221,16 +222,16 @@ func TestForgetNonExistingPodWorkers(t *testing.T) {
} }
desiredPods := map[types.UID]sets.Empty{} desiredPods := map[types.UID]sets.Empty{}
desiredPods[types.UID(2)] = sets.Empty{} desiredPods[types.UID("2")] = sets.Empty{}
desiredPods[types.UID(14)] = sets.Empty{} desiredPods[types.UID("14")] = sets.Empty{}
podWorkers.ForgetNonExistingPodWorkers(desiredPods) podWorkers.ForgetNonExistingPodWorkers(desiredPods)
if len(podWorkers.podUpdates) != 2 { if len(podWorkers.podUpdates) != 2 {
t.Errorf("Incorrect number of open channels %v", len(podWorkers.podUpdates)) 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") 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") t.Errorf("No updates channel for pod 14")
} }

3
pkg/scheduler/scheduler.go
View File

@ -22,6 +22,7 @@ import (
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"
"strconv"
"time" "time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -613,7 +614,7 @@ func getAttemptsLabel(p *framework.QueuedPodInfo) string {
if p.Attempts >= 15 { if p.Attempts >= 15 {
return "15+" return "15+"
} }
return string(p.Attempts) return strconv.Itoa(p.Attempts)
} }
func (sched *Scheduler) profileForPod(pod *v1.Pod) (*profile.Profile, error) { func (sched *Scheduler) profileForPod(pod *v1.Pod) (*profile.Profile, error) {

4
staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure_test.go
View File

@ -185,7 +185,7 @@ func TestAzureTokenSource(t *testing.T) {
expiresOn = "foo" expiresOn = "foo"
) )
cfg := map[string]string{ cfg := map[string]string{
cfgConfigMode: string(configMode), cfgConfigMode: strconv.Itoa(int(configMode)),
cfgApiserverID: serverID, cfgApiserverID: serverID,
cfgClientID: clientID, cfgClientID: clientID,
cfgTenantID: tenantID, cfgTenantID: tenantID,
@ -365,7 +365,7 @@ func TestAzureTokenSourceScenarios(t *testing.T) {
persister := newFakePersister() persister := newFakePersister()
cfg := map[string]string{ cfg := map[string]string{
cfgConfigMode: string(configMode), cfgConfigMode: strconv.Itoa(int(configMode)),
} }
if tc.configToken != nil { if tc.configToken != nil {
cfg = token2Cfg(tc.configToken) cfg = token2Cfg(tc.configToken)

4
staging/src/k8s.io/client-go/tools/record/event_test.go
View File

@ -24,7 +24,7 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sruntime "k8s.io/apimachinery/pkg/runtime" k8sruntime "k8s.io/apimachinery/pkg/runtime"
@ -509,7 +509,7 @@ func TestLotsOfEvents(t *testing.T) {
APIVersion: "version", APIVersion: "version",
} }
// we need to vary the reason to prevent aggregation // we need to vary the reason to prevent aggregation
go recorder.Eventf(ref, v1.EventTypeNormal, "Reason-"+string(i), strconv.Itoa(i)) go recorder.Eventf(ref, v1.EventTypeNormal, "Reason-"+strconv.Itoa(i), strconv.Itoa(i))
} }
// Make sure no events were dropped by either of the listeners. // Make sure no events were dropped by either of the listeners.
for i := 0; i < maxQueuedEvents; i++ { for i := 0; i < maxQueuedEvents; i++ {

11
staging/src/k8s.io/client-go/tools/record/events_cache_test.go
View File

@ -18,6 +18,7 @@ package record
import ( import (
"reflect" "reflect"
"strconv"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -69,10 +70,10 @@ func makeUniqueEvents(num int) []v1.Event {
events := []v1.Event{} events := []v1.Event{}
kind := "Pod" kind := "Pod"
for i := 0; i < num; i++ { for i := 0; i < num; i++ {
reason := strings.Join([]string{"reason", string(i)}, "-") reason := strings.Join([]string{"reason", strconv.Itoa(i)}, "-")
message := strings.Join([]string{"message", string(i)}, "-") message := strings.Join([]string{"message", strconv.Itoa(i)}, "-")
name := strings.Join([]string{"pod", string(i)}, "-") name := strings.Join([]string{"pod", strconv.Itoa(i)}, "-")
namespace := strings.Join([]string{"ns", string(i)}, "-") namespace := strings.Join([]string{"ns", strconv.Itoa(i)}, "-")
involvedObject := makeObjectReference(kind, name, namespace) involvedObject := makeObjectReference(kind, name, namespace)
events = append(events, makeEvent(reason, message, involvedObject)) events = append(events, makeEvent(reason, message, involvedObject))
} }
@ -82,7 +83,7 @@ func makeUniqueEvents(num int) []v1.Event {
func makeSimilarEvents(num int, template v1.Event, messagePrefix string) []v1.Event { func makeSimilarEvents(num int, template v1.Event, messagePrefix string) []v1.Event {
events := makeEvents(num, template) events := makeEvents(num, template)
for i := range events { for i := range events {
events[i].Message = strings.Join([]string{messagePrefix, string(i), events[i].Message}, "-") events[i].Message = strings.Join([]string{messagePrefix, strconv.Itoa(i), events[i].Message}, "-")
} }
return events return events
} }

5
staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go
View File

@ -17,11 +17,12 @@ limitations under the License.
package create package create
import ( import (
"strconv"
"testing" "testing"
rbac "k8s.io/api/rbac/v1" rbac "k8s.io/api/rbac/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )
func TestCreateClusterRoleBinding(t *testing.T) { func TestCreateClusterRoleBinding(t *testing.T) {
@ -72,7 +73,7 @@ func TestCreateClusterRoleBinding(t *testing.T) {
} }
for i, tc := range tests { for i, tc := range tests {
t.Run(string(i), func(t *testing.T) { t.Run(strconv.Itoa(i), func(t *testing.T) {
clusterRoleBinding, err := tc.options.createClusterRoleBinding() clusterRoleBinding, err := tc.options.createClusterRoleBinding()
if err != nil { if err != nil {
t.Errorf("unexpected error:\n%#v\n", err) t.Errorf("unexpected error:\n%#v\n", err)

2
staging/src/k8s.io/kubectl/pkg/drain/drain_test.go
View File

@ -196,7 +196,7 @@ func createPods(ifCreateNewPods bool) (map[string]corev1.Pod, []corev1.Pod) {
for i := 0; i < 8; i++ { for i := 0; i < 8; i++ {
var uid types.UID var uid types.UID
if ifCreateNewPods { if ifCreateNewPods {
uid = types.UID(i) uid = types.UID(strconv.Itoa(i))
} else { } else {
uid = types.UID(strconv.Itoa(i) + strconv.Itoa(i)) uid = types.UID(strconv.Itoa(i) + strconv.Itoa(i))
} }

3
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_metrics_test.go
View File

@ -19,6 +19,7 @@ limitations under the License.
package gce package gce
import ( import (
"strconv"
"testing" "testing"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
@ -149,7 +150,7 @@ func TestComputeL4ILBMetrics(t *testing.T) {
l4ILBServiceMap: make(map[string]L4ILBServiceState), l4ILBServiceMap: make(map[string]L4ILBServiceState),
} }
for i, serviceState := range tc.serviceStates { for i, serviceState := range tc.serviceStates {
newMetrics.SetL4ILBService(string(i), serviceState) newMetrics.SetL4ILBService(strconv.Itoa(i), serviceState)
} }
got := newMetrics.computeL4ILBMetrics() got := newMetrics.computeL4ILBMetrics()
if diff := cmp.Diff(tc.expectL4ILBCount, got); diff != "" { if diff := cmp.Diff(tc.expectL4ILBCount, got); diff != "" {