Merge pull request kubernetes#131488 from sivchari/apply-slices-package

kubeadm: use slices package to reduce the codes

Author: k8s-ci-robot

cmd/kubeadm/app/cmd/init.go

@@ -21,6 +21,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -643,10 +644,5 @@ func manageSkippedAddons(cfg *kubeadmapi.ClusterConfiguration, skipPhases []stri
 }
 
 func isPhaseInSkipPhases(phase string, skipPhases []string) bool {
-	for _, item := range skipPhases {
-		if item == phase {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(skipPhases, phase)
 }

cmd/kubeadm/app/phases/controlplane/manifests.go

@@ -21,6 +21,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -295,12 +296,7 @@ func isValidAuthzMode(authzMode string) bool {
 		kubeadmconstants.ModeAlwaysDeny,
 	}
 
-	for _, mode := range allModes {
-		if authzMode == mode {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(allModes, authzMode)
 }
 
 // getControllerManagerCommand builds the right controller manager command from the given config object and version

cmd/kubeadm/app/phases/etcd/local.go

@@ -21,6 +21,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -105,11 +106,9 @@ func RemoveStackedEtcdMemberFromCluster(client clientset.Interface, cfg *kubeadm
 	// is not needed.
 	if len(members) == 1 {
 		etcdClientAddress := etcdutil.GetClientURL(&cfg.LocalAPIEndpoint)
-		for _, endpoint := range etcdClient.Endpoints {
-			if endpoint == etcdClientAddress {
-				klog.V(1).Info("[etcd] This is the only remaining etcd member in the etcd cluster, skip removing it")
-				return nil
-			}
+		if slices.Contains(etcdClient.Endpoints, etcdClientAddress) {
+			klog.V(1).Info("[etcd] This is the only remaining etcd member in the etcd cluster, skip removing it")
+			return nil
 		}
 	}
 

cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go

@@ -25,6 +25,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"slices"
 	"time"
 
 	"github.com/pkg/errors"
@@ -280,15 +281,7 @@ func validateKubeConfig(outDir, filename string, config *clientcmdapi.Config) er
 	currentCaCert := currentCACerts[0]
 
 	// Find a common trust anchor
-	trustAnchorFound := false
-	for _, expectedCaCert := range expectedCACerts {
-		// Compare the current CA cert to the expected CA cert.
-		// If the certificates match then a common trust anchor was found.
-		if currentCaCert.Equal(expectedCaCert) {
-			trustAnchorFound = true
-			break
-		}
-	}
+	trustAnchorFound := slices.ContainsFunc(expectedCACerts, currentCaCert.Equal)
 	if !trustAnchorFound {
 		return errors.Errorf("a kubeconfig file %q exists but does not contain a trusted CA in its current context's "+
 			"cluster. Total CA certificates found: %d", kubeConfigFilePath, len(currentCACerts))

cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane.go

@@ -18,6 +18,7 @@ package markcontrolplane
 
 import (
 	"fmt"
+	"slices"
 
 	v1 "k8s.io/api/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
@@ -50,23 +51,13 @@ func MarkControlPlane(client clientset.Interface, controlPlaneName string, taint
 	})
 }
 
-func taintExists(taint v1.Taint, taints []v1.Taint) bool {
-	for _, t := range taints {
-		if t == taint {
-			return true
-		}
-	}
-
-	return false
-}
-
 func markControlPlaneNode(n *v1.Node, taints []v1.Taint) {
 	for _, label := range labelsToAdd {
 		n.ObjectMeta.Labels[label] = ""
 	}
 
 	for _, nt := range n.Spec.Taints {
-		if !taintExists(nt, taints) {
+		if !slices.Contains(taints, nt) {
 			taints = append(taints, nt)
 		}
 	}

cmd/kubeadm/app/util/certs/util.go

@@ -22,6 +22,7 @@ import (
 	"crypto/x509"
 	"net"
 	"path/filepath"
+	"slices"
 	"testing"
 	"time"
 
@@ -115,21 +116,17 @@ func AssertCertificateHasOrganizations(t *testing.T, cert *x509.Certificate, org
 // AssertCertificateHasClientAuthUsage is a utility function for kubeadm testing that asserts if a given certificate has
 // the expected ExtKeyUsageClientAuth
 func AssertCertificateHasClientAuthUsage(t *testing.T, cert *x509.Certificate) {
-	for i := range cert.ExtKeyUsage {
-		if cert.ExtKeyUsage[i] == x509.ExtKeyUsageClientAuth {
-			return
-		}
+	if slices.Contains(cert.ExtKeyUsage, x509.ExtKeyUsageClientAuth) {
+		return
 	}
 	t.Error("cert has not ClientAuth usage as expected")
 }
 
 // AssertCertificateHasServerAuthUsage is a utility function for kubeadm testing that asserts if a given certificate has
 // the expected ExtKeyUsageServerAuth
 func AssertCertificateHasServerAuthUsage(t *testing.T, cert *x509.Certificate) {
-	for i := range cert.ExtKeyUsage {
-		if cert.ExtKeyUsage[i] == x509.ExtKeyUsageServerAuth {
-			return
-		}
+	if slices.Contains(cert.ExtKeyUsage, x509.ExtKeyUsageServerAuth) {
+		return
 	}
 	t.Error("cert is not a ServerAuth")
 }
@@ -138,13 +135,7 @@ func AssertCertificateHasServerAuthUsage(t *testing.T, cert *x509.Certificate) {
 // the expected DNSNames
 func AssertCertificateHasDNSNames(t *testing.T, cert *x509.Certificate, DNSNames ...string) {
 	for _, DNSName := range DNSNames {
-		found := false
-		for _, val := range cert.DNSNames {
-			if val == DNSName {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(cert.DNSNames, DNSName)
 
 		if !found {
 			t.Errorf("cert does not contain DNSName %s", DNSName)

cmd/kubeadm/app/util/patches/patches.go

@@ -24,6 +24,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 	"sync"
 
@@ -170,14 +171,7 @@ func (pm *PatchManager) ApplyPatchesToTarget(patchTarget *PatchTarget) error {
 	var err error
 	var patchedData []byte
 
-	var found bool
-	for _, pt := range pm.knownTargets {
-		if pt == patchTarget.Name {
-			found = true
-			break
-		}
-	}
-	if !found {
+	if !slices.Contains(pm.knownTargets, patchTarget.Name) {
 		return errors.Errorf("unknown patch target name %q, must be one of %v", patchTarget.Name, pm.knownTargets)
 	}
 

cmd/kubeadm/app/util/pkiutil/pki_helpers.go

@@ -32,6 +32,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"slices"
 	"time"
 
 	"github.com/pkg/errors"
@@ -127,12 +128,7 @@ func NewCSRAndKey(config *CertConfig) (*x509.CertificateRequest, crypto.Signer,
 
 // HasServerAuth returns true if the given certificate is a ServerAuth
 func HasServerAuth(cert *x509.Certificate) bool {
-	for i := range cert.ExtKeyUsage {
-		if cert.ExtKeyUsage[i] == x509.ExtKeyUsageServerAuth {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(cert.ExtKeyUsage, x509.ExtKeyUsageServerAuth)
 }
 
 // WriteCertAndKey stores certificate and key at the specified location

cmd/kubeadm/app/util/pkiutil/pki_helpers_test.go

@@ -27,6 +27,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"slices"
 	"testing"
 
 	certutil "k8s.io/client-go/util/cert"
@@ -634,13 +635,7 @@ func TestGetAPIServerAltNames(t *testing.T) {
 			}
 
 			for _, DNSName := range rt.expectedDNSNames {
-				found := false
-				for _, val := range altNames.DNSNames {
-					if val == DNSName {
-						found = true
-						break
-					}
-				}
+				found := slices.Contains(altNames.DNSNames, DNSName)
 
 				if !found {
 					t.Errorf("%s: altNames does not contain DNSName %s but %v", rt.name, DNSName, altNames.DNSNames)
@@ -696,13 +691,7 @@ func TestGetEtcdAltNames(t *testing.T) {
 	expectedDNSNames := []string{"myNode", "localhost", proxy}
 	for _, DNSName := range expectedDNSNames {
 		t.Run(DNSName, func(t *testing.T) {
-			found := false
-			for _, val := range altNames.DNSNames {
-				if val == DNSName {
-					found = true
-					break
-				}
-			}
+			found := slices.Contains(altNames.DNSNames, DNSName)
 
 			if !found {
 				t.Errorf("altNames does not contain DNSName %s", DNSName)
@@ -758,13 +747,7 @@ func TestGetEtcdPeerAltNames(t *testing.T) {
 	expectedDNSNames := []string{hostname, proxy}
 	for _, DNSName := range expectedDNSNames {
 		t.Run(DNSName, func(t *testing.T) {
-			found := false
-			for _, val := range altNames.DNSNames {
-				if val == DNSName {
-					found = true
-					break
-				}
-			}
+			found := slices.Contains(altNames.DNSNames, DNSName)
 
 			if !found {
 				t.Errorf("altNames does not contain DNSName %s", DNSName)

cmd/kubeadm/app/util/runtime/runtime_test.go

@@ -21,6 +21,7 @@ import (
 	"net"
 	"os"
 	"runtime"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -447,12 +448,7 @@ func TestDetectCRISocketImpl(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			socket, err := detectCRISocketImpl(func(path string) bool {
-				for _, existing := range test.existingSockets {
-					if path == existing {
-						return true
-					}
-				}
-				return false
+				return slices.Contains(test.existingSockets, path)
 			}, test.existingSockets)
 
 			if (err != nil) != test.expectedError {