Skip to content

Commit

Permalink
Merge pull request #109639 from Abirdcfly/fixduplicateimport
Browse files Browse the repository at this point in the history
cleanup: remove all duplicate import

Kubernetes-commit: 1c1efde70dbefe88ead207293810a38a6ea5e3c1
  • Loading branch information
k8s-publishing-bot committed Jul 22, 2022
2 parents 0c42a8e + 3614667 commit 1ca7fe3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions pkg/cmd/create/create_pdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/resource"
resourcecli "k8s.io/cli-runtime/pkg/resource"
policyv1client "k8s.io/client-go/kubernetes/typed/policy/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme"
Expand Down Expand Up @@ -72,7 +71,7 @@ type PodDisruptionBudgetOpts struct {

Client *policyv1client.PolicyV1Client
DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resourcecli.QueryParamVerifier
DryRunVerifier *resource.QueryParamVerifier
ValidationDirective string

genericclioptions.IOStreams
Expand Down
5 changes: 2 additions & 3 deletions pkg/cmd/create/create_quota.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/resource"
resourcecli "k8s.io/cli-runtime/pkg/resource"
coreclient "k8s.io/client-go/kubernetes/typed/core/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme"
Expand Down Expand Up @@ -68,7 +67,7 @@ type QuotaOpts struct {

Client *coreclient.CoreV1Client
DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resourcecli.QueryParamVerifier
DryRunVerifier *resource.QueryParamVerifier
ValidationDirective string

genericclioptions.IOStreams
Expand Down Expand Up @@ -138,7 +137,7 @@ func (o *QuotaOpts) Complete(f cmdutil.Factory, cmd *cobra.Command, args []strin
if err != nil {
return err
}
o.DryRunVerifier = resourcecli.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)

o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil {
Expand Down

0 comments on commit 1ca7fe3

Please sign in to comment.