cleanup: remove duplicate import

Signed-off-by: Abirdcfly <[email protected]>

cmd/kube-apiserver/app/apiextensions.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/apiserver/pkg/features"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
-	"k8s.io/apiserver/pkg/util/feature"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/apiserver/pkg/util/webhook"
 	kubeexternalinformers "k8s.io/client-go/informers"
@@ -58,7 +57,7 @@ func createAPIExtensionsConfig(
 		&genericConfig,
 		externalInformers,
 		genericConfig.LoopbackClientConfig,
-		feature.DefaultFeatureGate,
+		utilfeature.DefaultFeatureGate,
 		pluginInitializers...)
 	if err != nil {
 		return nil, err

cmd/kubeadm/app/phases/upgrade/compute_test.go

@@ -26,7 +26,6 @@ import (
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/version"
 	versionutil "k8s.io/apimachinery/pkg/util/version"
 	clientsetfake "k8s.io/client-go/kubernetes/fake"
 
@@ -98,11 +97,11 @@ func TestGetAvailableUpgrades(t *testing.T) {
 	// variables are in the form v{MAJOR}{MINOR}{PATCH}, where MINOR is a variable so test are automatically uptodate to the latest MinimumControlPlaneVersion/
 
 	// v1.X series, e.g. v1.14
-	v1X0 := version.MustParseSemantic("v1.14.0")
+	v1X0 := versionutil.MustParseSemantic("v1.14.0")
 	v1X5 := v1X0.WithPatch(5)
 
 	// v1.Y series, where Y = X+1, e.g. v1.15
-	v1Y0 := version.MustParseSemantic("v1.15.0")
+	v1Y0 := versionutil.MustParseSemantic("v1.15.0")
 	v1Y0alpha0 := v1Y0.WithPreRelease("alpha.0")
 	v1Y0alpha1 := v1Y0.WithPreRelease("alpha.1")
 	v1Y1 := v1Y0.WithPatch(1)
@@ -111,7 +110,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
 	v1Y5 := v1Y0.WithPatch(5)
 
 	// v1.Z series, where Z = Y+1, e.g. v1.16
-	v1Z0 := version.MustParseSemantic("v1.16.0")
+	v1Z0 := versionutil.MustParseSemantic("v1.16.0")
 	v1Z0alpha1 := v1Z0.WithPreRelease("alpha.1")
 	v1Z0alpha2 := v1Z0.WithPreRelease("alpha.2")
 	v1Z0beta1 := v1Z0.WithPreRelease("beta.1")

cmd/kubeadm/app/preflight/checks.go

@@ -39,7 +39,6 @@ import (
 	netutil "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation"
-	"k8s.io/apimachinery/pkg/util/version"
 	versionutil "k8s.io/apimachinery/pkg/util/version"
 	kubeadmversion "k8s.io/component-base/version"
 	"k8s.io/klog/v2"
@@ -48,7 +47,6 @@ import (
 	netutils "k8s.io/utils/net"
 
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
-	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/kubernetes/cmd/kubeadm/app/images"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem"
@@ -598,7 +596,7 @@ func (kubever KubernetesVersionCheck) Check() (warnings, errorList []error) {
 // KubeletVersionCheck validates installed kubelet version
 type KubeletVersionCheck struct {
 	KubernetesVersion string
-	minKubeletVersion *version.Version
+	minKubeletVersion *versionutil.Version
 	exec              utilsexec.Interface
 }
 
@@ -615,7 +613,7 @@ func (kubever KubeletVersionCheck) Check() (warnings, errorList []error) {
 		return nil, []error{errors.Wrap(err, "couldn't get kubelet version")}
 	}
 	if kubever.minKubeletVersion == nil {
-		kubever.minKubeletVersion = constants.MinimumKubeletVersion
+		kubever.minKubeletVersion = kubeadmconstants.MinimumKubeletVersion
 	}
 	if kubeletVersion.LessThan(kubever.minKubeletVersion) {
 		return nil, []error{errors.Errorf("Kubelet version %q is lower than kubeadm can support. Please upgrade kubelet", kubeletVersion)}

cmd/kubeadm/app/util/dryrun/dryrun.go

@@ -26,7 +26,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	errorsutil "k8s.io/apimachinery/pkg/util/errors"
 
-	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
 )
@@ -124,9 +123,9 @@ func (w *Waiter) SetTimeout(_ time.Duration) {}
 // WaitForStaticPodControlPlaneHashes returns an empty hash for all control plane images;
 func (w *Waiter) WaitForStaticPodControlPlaneHashes(_ string) (map[string]string, error) {
 	return map[string]string{
-		constants.KubeAPIServer:         "",
-		constants.KubeControllerManager: "",
-		constants.KubeScheduler:         "",
+		kubeadmconstants.KubeAPIServer:         "",
+		kubeadmconstants.KubeControllerManager: "",
+		kubeadmconstants.KubeScheduler:         "",
 	}, nil
 }
 

pkg/apis/core/validation/validation.go

@@ -45,7 +45,6 @@ import (
 	schedulinghelper "k8s.io/component-helpers/scheduling/corev1"
 	apiservice "k8s.io/kubernetes/pkg/api/service"
 	"k8s.io/kubernetes/pkg/apis/core"
-	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/core/helper"
 	podshelper "k8s.io/kubernetes/pkg/apis/core/pods"
 	corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
@@ -4715,7 +4714,7 @@ func validateServicePort(sp *core.ServicePort, requireName, isHeadlessService bo
 	return allErrs
 }
 
-func needsExternalTrafficPolicy(svc *api.Service) bool {
+func needsExternalTrafficPolicy(svc *core.Service) bool {
 	return svc.Spec.Type == core.ServiceTypeLoadBalancer || svc.Spec.Type == core.ServiceTypeNodePort
 }
 
@@ -4760,7 +4759,7 @@ func validateServiceExternalTrafficPolicy(service *core.Service) field.ErrorList
 	return allErrs
 }
 
-func validateServiceExternalTrafficFieldsUpdate(before, after *api.Service) field.ErrorList {
+func validateServiceExternalTrafficFieldsUpdate(before, after *core.Service) field.ErrorList {
 	allErrs := field.ErrorList{}
 
 	if apiservice.NeedsHealthCheck(before) && apiservice.NeedsHealthCheck(after) {

pkg/apis/core/validation/validation_test.go

@@ -27,7 +27,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
-	asserttestify "github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 	v1 "k8s.io/api/core/v1"
@@ -43,7 +42,6 @@ import (
 	"k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/utils/pointer"
 	utilpointer "k8s.io/utils/pointer"
 )
 
@@ -18944,7 +18942,7 @@ func TestValidateTopologySpreadConstraints(t *testing.T) {
 					MaxSkew:           1,
 					TopologyKey:       "k8s.io/zone",
 					WhenUnsatisfiable: core.DoNotSchedule,
-					MinDomains:        pointer.Int32(3),
+					MinDomains:        utilpointer.Int32(3),
 				},
 			},
 			wantFieldErrors: field.ErrorList{},
@@ -18982,10 +18980,10 @@ func TestValidateTopologySpreadConstraints(t *testing.T) {
 					MaxSkew:           1,
 					TopologyKey:       "k8s.io/zone",
 					WhenUnsatisfiable: core.DoNotSchedule,
-					MinDomains:        pointer.Int32(-1),
+					MinDomains:        utilpointer.Int32(-1),
 				},
 			},
-			wantFieldErrors: []*field.Error{field.Invalid(fieldPathMinDomains, pointer.Int32(-1), isNotPositiveErrorMsg)},
+			wantFieldErrors: []*field.Error{field.Invalid(fieldPathMinDomains, utilpointer.Int32(-1), isNotPositiveErrorMsg)},
 		},
 		{
 			name: "cannot use non-nil MinDomains with ScheduleAnyway",
@@ -18994,10 +18992,10 @@ func TestValidateTopologySpreadConstraints(t *testing.T) {
 					MaxSkew:           1,
 					TopologyKey:       "k8s.io/zone",
 					WhenUnsatisfiable: core.ScheduleAnyway,
-					MinDomains:        pointer.Int32(10),
+					MinDomains:        utilpointer.Int32(10),
 				},
 			},
-			wantFieldErrors: []*field.Error{field.Invalid(fieldPathMinDomains, pointer.Int32(10), fmt.Sprintf("can only use minDomains if whenUnsatisfiable=%s, not %s", string(core.DoNotSchedule), string(core.ScheduleAnyway)))},
+			wantFieldErrors: []*field.Error{field.Invalid(fieldPathMinDomains, utilpointer.Int32(10), fmt.Sprintf("can only use minDomains if whenUnsatisfiable=%s, not %s", string(core.DoNotSchedule), string(core.ScheduleAnyway)))},
 		},
 		{
 			name: "use negative MinDomains with ScheduleAnyway(invalid)",
@@ -19006,12 +19004,12 @@ func TestValidateTopologySpreadConstraints(t *testing.T) {
 					MaxSkew:           1,
 					TopologyKey:       "k8s.io/zone",
 					WhenUnsatisfiable: core.ScheduleAnyway,
-					MinDomains:        pointer.Int32(-1),
+					MinDomains:        utilpointer.Int32(-1),
 				},
 			},
 			wantFieldErrors: []*field.Error{
-				field.Invalid(fieldPathMinDomains, pointer.Int32(-1), isNotPositiveErrorMsg),
-				field.Invalid(fieldPathMinDomains, pointer.Int32(-1), fmt.Sprintf("can only use minDomains if whenUnsatisfiable=%s, not %s", string(core.DoNotSchedule), string(core.ScheduleAnyway))),
+				field.Invalid(fieldPathMinDomains, utilpointer.Int32(-1), isNotPositiveErrorMsg),
+				field.Invalid(fieldPathMinDomains, utilpointer.Int32(-1), fmt.Sprintf("can only use minDomains if whenUnsatisfiable=%s, not %s", string(core.DoNotSchedule), string(core.ScheduleAnyway))),
 			},
 		},
 		{
@@ -19668,7 +19666,7 @@ func TestValidateSeccompAnnotationsAndFieldsMatch(t *testing.T) {
 
 	for i, test := range tests {
 		err := validateSeccompAnnotationsAndFieldsMatch(test.annotationValue, test.seccompField, test.fldPath)
-		asserttestify.Equal(t, test.expectedErr, err, "TestCase[%d]: %s", i, test.description)
+		assert.Equal(t, test.expectedErr, err, "TestCase[%d]: %s", i, test.description)
 	}
 }
 
@@ -19797,7 +19795,7 @@ func TestValidatePodTemplateSpecSeccomp(t *testing.T) {
 
 	for i, test := range tests {
 		err := ValidatePodTemplateSpec(test.spec, rootFld, PodValidationOptions{})
-		asserttestify.Equal(t, test.expectedErr, err, "TestCase[%d]: %s", i, test.description)
+		assert.Equal(t, test.expectedErr, err, "TestCase[%d]: %s", i, test.description)
 	}
 }
 

pkg/controller/endpointslice/metrics/cache_test.go

@@ -23,7 +23,6 @@ import (
 	discovery "k8s.io/api/discovery/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/controller/util/endpoint"
-	endpointutil "k8s.io/kubernetes/pkg/controller/util/endpoint"
 	utilpointer "k8s.io/utils/pointer"
 )
 
@@ -33,8 +32,8 @@ func TestNumEndpointsAndSlices(t *testing.T) {
 	p80 := int32(80)
 	p443 := int32(443)
 
-	pmKey80443 := endpointutil.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}, {Port: &p443}})
-	pmKey80 := endpointutil.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}})
+	pmKey80443 := endpoint.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}, {Port: &p443}})
+	pmKey80 := endpoint.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}})
 
 	spCacheEfficient := NewServicePortCache()
 	spCacheEfficient.Set(pmKey80, EfficiencyInfo{Endpoints: 45, Slices: 1})
@@ -66,8 +65,8 @@ func TestPlaceHolderSlice(t *testing.T) {
 	p80 := int32(80)
 	p443 := int32(443)
 
-	pmKey80443 := endpointutil.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}, {Port: &p443}})
-	pmKey80 := endpointutil.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}})
+	pmKey80443 := endpoint.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}, {Port: &p443}})
+	pmKey80 := endpoint.NewPortMapKey([]discovery.EndpointPort{{Port: &p80}})
 
 	sp := NewServicePortCache()
 	sp.Set(pmKey80, EfficiencyInfo{Endpoints: 0, Slices: 1})
@@ -95,7 +94,7 @@ func benchmarkUpdateServicePortCache(b *testing.B, num int) {
 	ns := "benchmark"
 	httpKey := endpoint.NewPortMapKey([]discovery.EndpointPort{{Port: utilpointer.Int32Ptr(80)}})
 	httpsKey := endpoint.NewPortMapKey([]discovery.EndpointPort{{Port: utilpointer.Int32Ptr(443)}})
-	spCache := &ServicePortCache{items: map[endpointutil.PortMapKey]EfficiencyInfo{
+	spCache := &ServicePortCache{items: map[endpoint.PortMapKey]EfficiencyInfo{
 		httpKey: {
 			Endpoints: 182,
 			Slices:    2,