github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Use for-range in cmd/{kubelet,kubeadm}

Browse Source 
Fixed using the modernize tool. These were the only instances under
cmd/
This commit is contained in:
Mads Jensen
2026-02-07 09:01:59 +01:00
parent 90a76aaa9a
commit d137915f1d
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/addons/dns/dns_test.go
View File

@@ -1679,7 +1679,7 @@ func newMockClientForTest(t *testing.T, replicas int32, deploymentSize int, imag
image = "registry.k8s.io/coredns/coredns:" + kubeadmconstants.CoreDNSVersion
}
client := clientsetfake.NewSimpleClientset()
for i := 0; i < deploymentSize; i++ {
for i := range deploymentSize {
_, err := client.AppsV1().Deployments(metav1.NamespaceSystem).Create(context.TODO(), &apps.Deployment{
TypeMeta: metav1.TypeMeta{
Kind: "Deployment",

2
cmd/kubeadm/app/util/apiclient/wait.go
View File

@@ -315,7 +315,7 @@ func (w *KubeWaiter) WaitForControlPlaneComponents(podMap map[string]*v1.Pod, ap
}(comp)
}
for i := 0; i < len(components); i++ {
for range components {
if err := <-errChan; err != nil {
errs = append(errs, err)
}

2
cmd/kubeadm/app/util/etcd/etcd.go
View File

@@ -677,7 +677,7 @@ func (c *Client) getClusterStatus() (map[string]*clientv3.StatusResponse, error)
// WaitForClusterAvailable returns true if all endpoints in the cluster are available after retry attempts, an error is returned otherwise
func (c *Client) WaitForClusterAvailable(retries int, retryInterval time.Duration) (bool, error) {
for i := 0; i < retries; i++ {
for i := range retries {
if i > 0 {
klog.V(1).Infof("[etcd] Waiting %v until next retry\n", retryInterval)
time.Sleep(retryInterval)

6
cmd/kubeadm/app/util/runtime/runtime.go
View File

@@ -157,7 +157,7 @@ func (runtime *CRIRuntime) RemoveContainers(containers []string) error {
errs := []error{}
for _, container := range containers {
var lastErr error
for i := 0; i < constants.RemoveContainerRetry; i++ {
for range constants.RemoveContainerRetry {
klog.V(5).Infof("Attempting to remove container %v", container)
ctx, cancel := defaultContext()
@@ -189,7 +189,7 @@ func (runtime *CRIRuntime) RemoveContainers(containers []string) error {
// PullImage pulls the image
func (runtime *CRIRuntime) PullImage(image string) (err error) {
for i := 0; i < constants.PullImageRetry; i++ {
for range constants.PullImageRetry {
if _, err = runtime.impl.PullImage(context.Background(), runtime.imageService, &runtimeapi.ImageSpec{Image: image}, nil, nil); err == nil {
return nil
}
@@ -235,7 +235,7 @@ func pullImagesInParallelImpl(images []string, ifNotPresent bool,
}()
}
for i := 0; i < len(images); i++ {
for range images {
if err := <-errChan; err != nil {
errs = append(errs, err)
}

2
cmd/kubeadm/app/util/staticpod/utils_test.go
View File

@@ -845,7 +845,7 @@ func TestManifestFilesAreEqual(t *testing.T) {
tmpdir := t.TempDir()
// write 2 manifests
for i := 0; i < 2; i++ {
for i := range 2 {
if rt.podYamls[i] != "" {
manifestPath := filepath.Join(tmpdir, strconv.Itoa(i)+".yaml")
err := os.WriteFile(manifestPath, []byte(rt.podYamls[i]), 0644)

4
cmd/kubelet/app/server.go
View File

@@ -1155,7 +1155,7 @@ func InitializeTLS(ctx context.Context, kf *options.KubeletFlags, kc *kubeletcon
if len(tlsCipherSuites) > 0 {
insecureCiphers := cliflag.InsecureTLSCiphers()
for i := 0; i < len(tlsCipherSuites); i++ {
for i := range tlsCipherSuites {
for cipherName, cipherID := range insecureCiphers {
if tlsCipherSuites[i] == cipherID {
logger.Info("Use of insecure cipher detected.", "cipher", cipherName)
@@ -1395,7 +1395,7 @@ func getCgroupDriverFromCRI(ctx context.Context, s *options.KubeletServer, kubeD
)
// Retry a couple of times, hoping that any errors are transient.
// Fail quickly on known, non transient errors.
for i := 0; i < 3; i++ {
for range 3 {
runtimeConfig, err = kubeDeps.RemoteRuntimeService.RuntimeConfig(ctx)
if err != nil {
s, ok := status.FromError(err)