karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5333 from a7i/duplicate-import 

chore: remove duplicate imports
This commit is contained in:
karmada-bot 2024-08-09 14:52:29 +08:00 committed by GitHub
parent fa05f9b600 010d38954e
commit 052b06ecc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/registry/cluster/storage/aggregate.go
View File

@ -34,7 +34,6 @@ import (
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/request"
apirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/rest"
restclient "k8s.io/client-go/rest"
"k8s.io/klog/v2"
@ -359,7 +358,7 @@ func doClusterRequest(
}
// requestURLStr returns the request resource url string.
func requestURLStr(urlStr string, requestInfo *apirequest.RequestInfo) string {
func requestURLStr(urlStr string, requestInfo *request.RequestInfo) string {
parts := []string{requestInfo.APIPrefix}
if requestInfo.APIGroup != "" {
parts = append(parts, requestInfo.APIGroup)

3
pkg/util/lifted/validatingfhpa.go
View File

@ -20,7 +20,6 @@ import (
"fmt"
autoscalingv2 "k8s.io/api/autoscaling/v2"
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
apivalidation "k8s.io/apimachinery/pkg/api/validation"
pathvalidation "k8s.io/apimachinery/pkg/api/validation/path"
"k8s.io/apimachinery/pkg/util/sets"
@ -46,7 +45,7 @@ const (
func ValidateFederatedHPA(fhpa *autoscalingv1alpha1.FederatedHPA) field.ErrorList {
errs := field.ErrorList{}
errs = append(errs, apimachineryvalidation.ValidateObjectMeta(&fhpa.ObjectMeta, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
errs = append(errs, apivalidation.ValidateObjectMeta(&fhpa.ObjectMeta, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
// MinReplicasLowerBound represents a minimum value for minReplicas
// 0 when HPA scale-to-zero feature is enabled

5
test/e2e/karmadactl_test.go
View File

@ -50,7 +50,6 @@ import (
"github.com/karmada-io/karmada/pkg/util/names"
"github.com/karmada-io/karmada/test/e2e/framework"
"github.com/karmada-io/karmada/test/helper"
testhelper "github.com/karmada-io/karmada/test/helper"
)
const (
@ -501,7 +500,7 @@ var _ = ginkgo.Describe("Karmadactl exec testing", func() {
ginkgo.BeforeEach(func() {
policyName = podNamePrefix + rand.String(RandomStrLength)
pod = helper.NewPod(testNamespace, podNamePrefix+rand.String(RandomStrLength))
policy = testhelper.NewPropagationPolicy(testNamespace, policyName, []policyv1alpha1.ResourceSelector{
policy = helper.NewPropagationPolicy(testNamespace, policyName, []policyv1alpha1.ResourceSelector{
{
APIVersion: pod.APIVersion,
Kind: pod.Kind,
@ -557,7 +556,7 @@ var _ = ginkgo.Describe("Karmadactl top testing", func() {
// create a pod and a propagationPolicy
policyName = podNamePrefix + rand.String(RandomStrLength)
pod = helper.NewPod(testNamespace, podNamePrefix+rand.String(RandomStrLength))
policy = testhelper.NewPropagationPolicy(testNamespace, policyName, []policyv1alpha1.ResourceSelector{
policy = helper.NewPropagationPolicy(testNamespace, policyName, []policyv1alpha1.ResourceSelector{
{
APIVersion: pod.APIVersion,
Kind: pod.Kind,

9
test/e2e/mcs_test.go
View File

@ -42,7 +42,6 @@ import (
"github.com/karmada-io/karmada/pkg/util/names"
"github.com/karmada-io/karmada/test/e2e/framework"
"github.com/karmada-io/karmada/test/helper"
testhelper "github.com/karmada-io/karmada/test/helper"
)
var (
@ -155,7 +154,7 @@ func getPrepareInfo() (serviceExport mcsv1alpha1.ServiceExport, serviceImport mc
exportPolicyNamespace := serviceExport.Namespace
exportPolicyName := fmt.Sprintf("export-%s-policy", serviceExport.Name)
exportPolicy = testhelper.NewPropagationPolicy(exportPolicyNamespace, exportPolicyName, []policyv1alpha1.ResourceSelector{
exportPolicy = helper.NewPropagationPolicy(exportPolicyNamespace, exportPolicyName, []policyv1alpha1.ResourceSelector{
{
APIVersion: serviceExport.APIVersion,
Kind: serviceExport.Kind,
@ -170,7 +169,7 @@ func getPrepareInfo() (serviceExport mcsv1alpha1.ServiceExport, serviceImport mc
importPolicyNamespace := serviceImport.Namespace
importPolicyName := fmt.Sprintf("import-%s-policy", serviceImport.Name)
importPolicy = testhelper.NewPropagationPolicy(importPolicyNamespace, importPolicyName, []policyv1alpha1.ResourceSelector{
importPolicy = helper.NewPropagationPolicy(importPolicyNamespace, importPolicyName, []policyv1alpha1.ResourceSelector{
{
APIVersion: serviceImport.APIVersion,
Kind: serviceImport.Kind,
@ -209,7 +208,7 @@ var _ = ginkgo.Describe("Multi-Cluster Service testing", func() {
serviceExportPolicyName = fmt.Sprintf("%s-%s-policy", serviceExportResource, rand.String(RandomStrLength))
serviceImportPolicyName = fmt.Sprintf("%s-%s-policy", serviceImportResource, rand.String(RandomStrLength))
serviceExportPolicy = testhelper.NewClusterPropagationPolicy(serviceExportPolicyName, []policyv1alpha1.ResourceSelector{
serviceExportPolicy = helper.NewClusterPropagationPolicy(serviceExportPolicyName, []policyv1alpha1.ResourceSelector{
{
APIVersion: apiextensionsv1.SchemeGroupVersion.String(),
Kind: util.CRDKind,
@ -220,7 +219,7 @@ var _ = ginkgo.Describe("Multi-Cluster Service testing", func() {
ClusterNames: framework.ClusterNames(),
},
})
serviceImportPolicy = testhelper.NewClusterPropagationPolicy(serviceImportPolicyName, []policyv1alpha1.ResourceSelector{
serviceImportPolicy = helper.NewClusterPropagationPolicy(serviceImportPolicyName, []policyv1alpha1.ResourceSelector{
{
APIVersion: apiextensionsv1.SchemeGroupVersion.String(),
Kind: util.CRDKind,