kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108620 from kevindelgado/query-param-verifier 

Generalize Query Param Verifier

Kubernetes-commit: 226a76235abe42e49c6bd6390658645d861ba178
This commit is contained in:
Kubernetes Publisher 2022-03-14 18:50:09 -07:00
parent ce2c05b6e9 7e681490ec
commit fdbcc27104
42 changed files with 96 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
go.mod
View File

@ -31,10 +31,10 @@ require (
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220226220324-b8c40e080bc5 k8s.io/api v0.0.0-20220314180925-ee4a7624f6d5
k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715 k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715
k8s.io/cli-runtime v0.0.0-20220311062925-f9e0463e8d04 k8s.io/cli-runtime v0.0.0-20220315022811-009217a3bd69
k8s.io/client-go v0.0.0-20220308221144-2f52a105e63e k8s.io/client-go v0.0.0-20220314181218-ab732f5dd632
k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4 k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4
k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da
k8s.io/klog/v2 v2.40.1 k8s.io/klog/v2 v2.40.1
@ -48,10 +48,10 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220226220324-b8c40e080bc5 k8s.io/api => k8s.io/api v0.0.0-20220314180925-ee4a7624f6d5
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220311062925-f9e0463e8d04 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220315022811-009217a3bd69
k8s.io/client-go => k8s.io/client-go v0.0.0-20220308221144-2f52a105e63e k8s.io/client-go => k8s.io/client-go v0.0.0-20220314181218-ab732f5dd632
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220226191723-8d7923dd2451 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220226191723-8d7923dd2451
k8s.io/component-base => k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4 k8s.io/component-base => k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220221181225-89b3c2ca20da

12
go.sum
View File

@ -848,14 +848,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220226220324-b8c40e080bc5 h1:z4oqfOInb6p7EwsJbKUe2IcKaeSBWmfYEIsIdFHq6ak= k8s.io/api v0.0.0-20220314180925-ee4a7624f6d5 h1:oAeLhvrUBB+bviyhwzPknIzIdXw5KBMsRhJg50z1iM4=
k8s.io/api v0.0.0-20220226220324-b8c40e080bc5/go.mod h1:xmVR3mDgBB2FAJoueQFwuWn03L5odGCiOKivsptcgRU= k8s.io/api v0.0.0-20220314180925-ee4a7624f6d5/go.mod h1:93BzndRxB3dlJ9ccm/g86TvrPVpjL4gY+lzvZ8lam9Q=
k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715 h1:aEJAi7cAk/Tdn4gS+ENqYU/eFdT+f+QRy2Z+fC7tNzU= k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715 h1:aEJAi7cAk/Tdn4gS+ENqYU/eFdT+f+QRy2Z+fC7tNzU=
k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715/go.mod h1:6HjHJr7AD3yHuu+gOdE3O1dqE21lBVCDBk5W7wry/WI= k8s.io/apimachinery v0.0.0-20220309082612-aa725640f715/go.mod h1:6HjHJr7AD3yHuu+gOdE3O1dqE21lBVCDBk5W7wry/WI=
k8s.io/cli-runtime v0.0.0-20220311062925-f9e0463e8d04 h1:8JM4xe/PneH8yi2uGYIUlzdu6PiICSWyFuc8CeyvsAc= k8s.io/cli-runtime v0.0.0-20220315022811-009217a3bd69 h1:4u4GN8w6r48c000ETDh/oZWGY8nJcZD1ixNf+1tiQaU=
k8s.io/cli-runtime v0.0.0-20220311062925-f9e0463e8d04/go.mod h1:G45twNmKvsSKVot0fwak8QQzdCB2qQh3AhY+2v7PMGo= k8s.io/cli-runtime v0.0.0-20220315022811-009217a3bd69/go.mod h1:oKDQLpRk6TnldiL6TrAdlH7pidMcd9Kd5EVEOAM4244=
k8s.io/client-go v0.0.0-20220308221144-2f52a105e63e h1:qX/9E7tnbtpQ57WiGjJNvmiJ9BD1lkptbLj7oKxKwYY= k8s.io/client-go v0.0.0-20220314181218-ab732f5dd632 h1:E7Dof4iOwW94q1TZNmxdZmB/xJ2K2RqcSq4nnA3o0d0=
k8s.io/client-go v0.0.0-20220308221144-2f52a105e63e/go.mod h1:jk4568EW9+eYwEkJh+0fP6CmWVDSYeFM2okIbNwRdaw= k8s.io/client-go v0.0.0-20220314181218-ab732f5dd632/go.mod h1:tCiYV9dB1DrghaGL3kYb10EUf8l6LcRw8NaGl3kQ+bg=
k8s.io/code-generator v0.0.0-20220226191723-8d7923dd2451/go.mod h1:BunYIiSvEAW736r5Q7j7shOSPkb80INs0kWYJvW2o6I= k8s.io/code-generator v0.0.0-20220226191723-8d7923dd2451/go.mod h1:BunYIiSvEAW736r5Q7j7shOSPkb80INs0kWYJvW2o6I=
k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4 h1:8uQAPWPkI5Ut1gQVtvxQ/lTGEP3+oGHq6vAEcYo7pE8= k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4 h1:8uQAPWPkI5Ut1gQVtvxQ/lTGEP3+oGHq6vAEcYo7pE8=
k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4/go.mod h1:R4ZFlBfRZBH/Q93mp0quV0YIT8J9yNeI0A6qzhX7Xt8= k8s.io/component-base v0.0.0-20220311061329-c90e8e65f8c4/go.mod h1:R4ZFlBfRZBH/Q93mp0quV0YIT8J9yNeI0A6qzhX7Xt8=

4
pkg/cmd/annotate/annotate.go
View File

@ -57,7 +57,7 @@ type AnnotateOptions struct {
list bool list bool
local bool local bool
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
fieldManager string fieldManager string
all bool all bool
allNamespaces bool allNamespaces bool
@ -182,7 +182,7 @@ func (o *AnnotateOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.dryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.dryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/apply/apply.go
View File

@ -85,7 +85,7 @@ type ApplyOptions struct {
FieldManager string FieldManager string
Selector string Selector string
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
Prune bool Prune bool
PruneResources []prune.Resource PruneResources []prune.Resource
cmdBaseName string cmdBaseName string
@ -237,7 +237,7 @@ func (flags *ApplyFlags) ToOptions(cmd *cobra.Command, baseName string, args []s
return nil, err return nil, err
} }
dryRunVerifier := resource.NewDryRunVerifier(dynamicClient, flags.Factory.OpenAPIGetter()) dryRunVerifier := resource.NewQueryParamVerifier(dynamicClient, flags.Factory.OpenAPIGetter(), resource.QueryParamDryRun)
fieldManager := GetApplyFieldManagerFlag(cmd, serverSideApply) fieldManager := GetApplyFieldManagerFlag(cmd, serverSideApply)
// allow for a success message operation to be specified at print time // allow for a success message operation to be specified at print time

4
pkg/cmd/apply/apply_set_last_applied.go
View File

@ -50,7 +50,7 @@ type SetLastAppliedOptions struct {
namespace string namespace string
enforceNamespace bool enforceNamespace bool
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
shortOutput bool shortOutput bool
output string output string
patchBufferList []PatchBuffer patchBufferList []PatchBuffer
@ -128,7 +128,7 @@ func (o *SetLastAppliedOptions) Complete(f cmdutil.Factory, cmd *cobra.Command)
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.output = cmdutil.GetFlagString(cmd, "output") o.output = cmdutil.GetFlagString(cmd, "output")
o.shortOutput = o.output == "name" o.shortOutput = o.output == "name"

4
pkg/cmd/autoscale/autoscale.go
View File

@ -73,7 +73,7 @@ type AutoscaleOptions struct {
enforceNamespace bool enforceNamespace bool
namespace string namespace string
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
builder *resource.Builder builder *resource.Builder
fieldManager string fieldManager string
@ -145,7 +145,7 @@ func (o *AutoscaleOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.createAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag) o.createAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag)
o.builder = f.NewBuilder() o.builder = f.NewBuilder()
o.scaleKindResolver = scale.NewDiscoveryScaleKindResolver(discoveryClient) o.scaleKindResolver = scale.NewDiscoveryScaleKindResolver(discoveryClient)

8
pkg/cmd/create/create.go
View File

@ -52,7 +52,7 @@ type CreateOptions struct {
RecordFlags *genericclioptions.RecordFlags RecordFlags *genericclioptions.RecordFlags
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
fieldManager string fieldManager string
@ -207,7 +207,7 @@ func (o *CreateOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()
if err != nil { if err != nil {
@ -344,7 +344,7 @@ type CreateSubcommandOptions struct {
// StructuredGenerator is the resource generator for the object being created // StructuredGenerator is the resource generator for the object being created
StructuredGenerator generate.StructuredGenerator StructuredGenerator generate.StructuredGenerator
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
CreateAnnotation bool CreateAnnotation bool
FieldManager string FieldManager string
@ -384,7 +384,7 @@ func (o *CreateSubcommandOptions) Complete(f cmdutil.Factory, cmd *cobra.Command
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.CreateAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag) o.CreateAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)

4
pkg/cmd/create/create_clusterrolebinding.go
View File

@ -61,7 +61,7 @@ type ClusterRoleBindingOptions struct {
Client rbacclientv1.RbacV1Interface Client rbacclientv1.RbacV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -139,7 +139,7 @@ func (o *ClusterRoleBindingOptions) Complete(f cmdutil.Factory, cmd *cobra.Comma
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

5
pkg/cmd/create/create_configmap.go
View File

@ -98,7 +98,7 @@ type ConfigMapOptions struct {
Client corev1client.CoreV1Interface Client corev1client.CoreV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -173,13 +173,12 @@ func (o *ConfigMapOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
if err != nil { if err != nil {
return err return err
} }
discoveryClient, err := f.ToDiscoveryClient() discoveryClient, err := f.ToDiscoveryClient()
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, discoveryClient) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, discoveryClient, resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/create/create_cronjob.go
View File

@ -64,7 +64,7 @@ type CreateCronJobOptions struct {
EnforceNamespace bool EnforceNamespace bool
Client batchv1client.BatchV1Interface Client batchv1client.BatchV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
Builder *resource.Builder Builder *resource.Builder
FieldManager string FieldManager string
CreateAnnotation bool CreateAnnotation bool
@ -150,7 +150,7 @@ func (o *CreateCronJobOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, a
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()
if err != nil { if err != nil {

4
pkg/cmd/create/create_deployment.go
View File

@ -74,7 +74,7 @@ type CreateDeploymentOptions struct {
Client appsv1client.AppsV1Interface Client appsv1client.AppsV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -156,7 +156,7 @@ func (o *CreateDeploymentOptions) Complete(f cmdutil.Factory, cmd *cobra.Command
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/create/create_ingress.go
View File

@ -118,7 +118,7 @@ type CreateIngressOptions struct {
Client networkingv1client.NetworkingV1Interface Client networkingv1client.NetworkingV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
FieldManager string FieldManager string
@ -198,7 +198,7 @@ func (o *CreateIngressOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, a
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/create/create_job.go
View File

@ -66,7 +66,7 @@ type CreateJobOptions struct {
EnforceNamespace bool EnforceNamespace bool
Client batchv1client.BatchV1Interface Client batchv1client.BatchV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
Builder *resource.Builder Builder *resource.Builder
FieldManager string FieldManager string
CreateAnnotation bool CreateAnnotation bool
@ -145,7 +145,7 @@ func (o *CreateJobOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()
if err != nil { if err != nil {

5
pkg/cmd/create/create_namespace.go
View File

@ -19,6 +19,7 @@ package create
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -52,7 +53,7 @@ type NamespaceOptions struct {
Name string Name string
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
CreateAnnotation bool CreateAnnotation bool
FieldManager string FieldManager string
@ -129,7 +130,7 @@ func (o *NamespaceOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, discoveryClient) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, discoveryClient, resource.QueryParamDryRun)
o.CreateAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag) o.CreateAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

5
pkg/cmd/create/create_pdb.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/resource"
resourcecli "k8s.io/cli-runtime/pkg/resource" resourcecli "k8s.io/cli-runtime/pkg/resource"
policyv1client "k8s.io/client-go/kubernetes/typed/policy/v1" policyv1client "k8s.io/client-go/kubernetes/typed/policy/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
@ -71,7 +72,7 @@ type PodDisruptionBudgetOpts struct {
Client *policyv1client.PolicyV1Client Client *policyv1client.PolicyV1Client
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resourcecli.DryRunVerifier DryRunVerifier *resourcecli.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -146,7 +147,7 @@ func (o *PodDisruptionBudgetOpts) Complete(f cmdutil.Factory, cmd *cobra.Command
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resourcecli.NewDryRunVerifier(dynamicClient, discoveryClient) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, discoveryClient, resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/create/create_priorityclass.go
View File

@ -66,7 +66,7 @@ type PriorityClassOptions struct {
Client *schedulingv1client.SchedulingV1Client Client *schedulingv1client.SchedulingV1Client
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -138,7 +138,7 @@ func (o *PriorityClassOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, a
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

5
pkg/cmd/create/create_quota.go
View File

@ -28,6 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/resource"
resourcecli "k8s.io/cli-runtime/pkg/resource" resourcecli "k8s.io/cli-runtime/pkg/resource"
coreclient "k8s.io/client-go/kubernetes/typed/core/v1" coreclient "k8s.io/client-go/kubernetes/typed/core/v1"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
@ -67,7 +68,7 @@ type QuotaOpts struct {
Client *coreclient.CoreV1Client Client *coreclient.CoreV1Client
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resourcecli.DryRunVerifier DryRunVerifier *resourcecli.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -136,7 +137,7 @@ func (o *QuotaOpts) Complete(f cmdutil.Factory, cmd *cobra.Command, args []strin
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resourcecli.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resourcecli.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/create/create_role.go
View File

@ -137,7 +137,7 @@ type CreateRoleOptions struct {
ResourceNames []string ResourceNames []string
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
OutputFormat string OutputFormat string
Namespace string Namespace string
EnforceNamespace bool EnforceNamespace bool
@ -258,7 +258,7 @@ func (o *CreateRoleOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.OutputFormat = cmdutil.GetFlagString(cmd, "output") o.OutputFormat = cmdutil.GetFlagString(cmd, "output")
o.CreateAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag) o.CreateAnnotation = cmdutil.GetFlagBool(cmd, cmdutil.ApplyAnnotationsFlag)

6
pkg/cmd/create/create_rolebinding.go
View File

@ -63,7 +63,7 @@ type RoleBindingOptions struct {
Client rbacclientv1.RbacV1Interface Client rbacclientv1.RbacV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -136,11 +136,11 @@ func (o *RoleBindingOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, arg
if err != nil { if err != nil {
return err return err
} }
dynamicCient, err := f.DynamicClient() dynamicClient, err := f.DynamicClient()
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicCient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()
if err != nil { if err != nil {

4
pkg/cmd/create/create_secret.go
View File

@ -114,7 +114,7 @@ type CreateSecretOptions struct {
Client corev1client.CoreV1Interface Client corev1client.CoreV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -195,7 +195,7 @@ func (o *CreateSecretOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, ar
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, discoveryClient) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, discoveryClient, resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/create/create_secret_docker.go
View File

@ -110,7 +110,7 @@ type CreateSecretDockerRegistryOptions struct {
Client corev1client.CoreV1Interface Client corev1client.CoreV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -194,7 +194,7 @@ func (o *CreateSecretDockerRegistryOptions) Complete(f cmdutil.Factory, cmd *cob
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, discoveryClient) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, discoveryClient, resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/create/create_secret_tls.go
View File

@ -71,7 +71,7 @@ type CreateSecretTLSOptions struct {
Client corev1client.CoreV1Interface Client corev1client.CoreV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -151,7 +151,7 @@ func (o *CreateSecretTLSOptions) Complete(f cmdutil.Factory, cmd *cobra.Command,
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, discoveryClient) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, discoveryClient, resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/create/create_service.go
View File

@ -76,7 +76,7 @@ type ServiceOptions struct {
Client corev1client.CoreV1Interface Client corev1client.CoreV1Interface
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -119,7 +119,7 @@ func (o *ServiceOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/create/create_serviceaccount.go
View File

@ -53,7 +53,7 @@ type ServiceAccountOpts struct {
// Name of resource being created // Name of resource being created
Name string Name string
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
CreateAnnotation bool CreateAnnotation bool
FieldManager string FieldManager string
@ -128,7 +128,7 @@ func (o *ServiceAccountOpts) Complete(f cmdutil.Factory, cmd *cobra.Command, arg
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/delete/delete.go
View File

@ -121,7 +121,7 @@ type DeleteOptions struct {
Timeout time.Duration Timeout time.Duration
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
Output string Output string
@ -195,7 +195,7 @@ func (o *DeleteOptions) Complete(f cmdutil.Factory, args []string, cmd *cobra.Co
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
if len(o.Raw) == 0 { if len(o.Raw) == 0 {
r := f.NewBuilder(). r := f.NewBuilder().

4
pkg/cmd/diff/diff.go
View File

@ -112,7 +112,7 @@ type DiffOptions struct {
OpenAPISchema openapi.Resources OpenAPISchema openapi.Resources
DiscoveryClient discovery.DiscoveryInterface DiscoveryClient discovery.DiscoveryInterface
DynamicClient dynamic.Interface DynamicClient dynamic.Interface
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
CmdNamespace string CmdNamespace string
EnforceNamespace bool EnforceNamespace bool
Builder *resource.Builder Builder *resource.Builder
@ -639,7 +639,7 @@ func (o *DiffOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(o.DynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(o.DynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.CmdNamespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.CmdNamespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

2
pkg/cmd/drain/drain.go
View File

@ -227,7 +227,7 @@ func (o *DrainCmdOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
if err != nil { if err != nil {
return err return err
} }
o.drainer.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.drainer.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
if o.drainer.Client, err = f.KubernetesClientSet(); err != nil { if o.drainer.Client, err = f.KubernetesClientSet(); err != nil {
return err return err

4
pkg/cmd/expose/expose.go
View File

@ -91,7 +91,7 @@ type ExposeServiceOptions struct {
PrintObj printers.ResourcePrinterFunc PrintObj printers.ResourcePrinterFunc
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
EnforceNamespace bool EnforceNamespace bool
fieldManager string fieldManager string
@ -181,7 +181,7 @@ func (o *ExposeServiceOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) e
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/label/label.go
View File

@ -83,7 +83,7 @@ type LabelOptions struct {
enforceNamespace bool enforceNamespace bool
builder *resource.Builder builder *resource.Builder
unstructuredClientForMapping func(mapping *meta.RESTMapping) (resource.RESTClient, error) unstructuredClientForMapping func(mapping *meta.RESTMapping) (resource.RESTClient, error)
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
// Common shared fields // Common shared fields
genericclioptions.IOStreams genericclioptions.IOStreams
@ -185,7 +185,7 @@ func (o *LabelOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.dryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.dryRunStrategy)
o.ToPrinter = func(operation string) (printers.ResourcePrinter, error) { o.ToPrinter = func(operation string) (printers.ResourcePrinter, error) {

4
pkg/cmd/patch/patch.go
View File

@ -64,7 +64,7 @@ type PatchOptions struct {
namespace string namespace string
enforceNamespace bool enforceNamespace bool
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
outputFormat string outputFormat string
args []string args []string
builder *resource.Builder builder *resource.Builder
@ -169,7 +169,7 @@ func (o *PatchOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
return nil return nil
} }

4
pkg/cmd/replace/replace.go
View File

@ -75,7 +75,7 @@ type ReplaceOptions struct {
DeleteOptions *delete.DeleteOptions DeleteOptions *delete.DeleteOptions
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
PrintObj func(obj runtime.Object) error PrintObj func(obj runtime.Object) error
@ -156,7 +156,7 @@ func (o *ReplaceOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/rollout/rollout_undo.go
View File

@ -41,7 +41,7 @@ type UndoOptions struct {
Builder func() *resource.Builder Builder func() *resource.Builder
ToRevision int64 ToRevision int64
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
Resources []string Resources []string
Namespace string Namespace string
LabelSelector string LabelSelector string
@ -117,7 +117,7 @@ func (o *UndoOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []str
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
if o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace(); err != nil { if o.Namespace, o.EnforceNamespace, err = f.ToRawKubeConfigLoader().Namespace(); err != nil {
return err return err

4
pkg/cmd/run/run.go
View File

@ -109,7 +109,7 @@ type RunOptions struct {
DeleteOptions *cmddelete.DeleteOptions DeleteOptions *cmddelete.DeleteOptions
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
PrintObj func(runtime.Object) error PrintObj func(runtime.Object) error
Recorder genericclioptions.Recorder Recorder genericclioptions.Recorder
@ -218,7 +218,7 @@ func (o *RunOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
attachFlag := cmd.Flags().Lookup("attach") attachFlag := cmd.Flags().Lookup("attach")
if !attachFlag.Changed && o.Interactive { if !attachFlag.Changed && o.Interactive {

4
pkg/cmd/scale/scale.go
View File

@ -87,7 +87,7 @@ type ScaleOptions struct {
unstructuredClientForMapping func(mapping *meta.RESTMapping) (resource.RESTClient, error) unstructuredClientForMapping func(mapping *meta.RESTMapping) (resource.RESTClient, error)
parent string parent string
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -158,7 +158,7 @@ func (o *ScaleOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.namespace, o.enforceNamespace, err = f.ToRawKubeConfigLoader().Namespace() o.namespace, o.enforceNamespace, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {

4
pkg/cmd/set/set_env.go
View File

@ -122,7 +122,7 @@ type EnvOptions struct {
resources []string resources []string
output string output string
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
builder func() *resource.Builder builder func() *resource.Builder
updatePodSpecForObject polymorphichelpers.UpdatePodSpecForObjectFunc updatePodSpecForObject polymorphichelpers.UpdatePodSpecForObjectFunc
namespace string namespace string
@ -233,7 +233,7 @@ func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []stri
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.dryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.dryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/set/set_image.go
View File

@ -47,7 +47,7 @@ type SetImageOptions struct {
Infos []*resource.Info Infos []*resource.Info
Selector string Selector string
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
All bool All bool
Output string Output string
Local bool Local bool
@ -158,7 +158,7 @@ func (o *SetImageOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args [
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.Output = cmdutil.GetFlagString(cmd, "output") o.Output = cmdutil.GetFlagString(cmd, "output")
o.ResolveImage = ImageResolver o.ResolveImage = ImageResolver

4
pkg/cmd/set/set_resources.go
View File

@ -86,7 +86,7 @@ type SetResourcesOptions struct {
UpdatePodSpecForObject polymorphichelpers.UpdatePodSpecForObjectFunc UpdatePodSpecForObject polymorphichelpers.UpdatePodSpecForObjectFunc
Resources []string Resources []string
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
genericclioptions.IOStreams genericclioptions.IOStreams
} }
@ -161,7 +161,7 @@ func (o *SetResourcesOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, ar
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/set/set_selector.go
View File

@ -45,7 +45,7 @@ type SetSelectorOptions struct {
PrintFlags *genericclioptions.PrintFlags PrintFlags *genericclioptions.PrintFlags
RecordFlags *genericclioptions.RecordFlags RecordFlags *genericclioptions.RecordFlags
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
fieldManager string fieldManager string
// set by args // set by args
@ -140,7 +140,7 @@ func (o *SetSelectorOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, arg
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.resources, o.selector, err = getResourcesAndSelector(args) o.resources, o.selector, err = getResourcesAndSelector(args)
if err != nil { if err != nil {

4
pkg/cmd/set/set_serviceaccount.go
View File

@ -63,7 +63,7 @@ type SetServiceAccountOptions struct {
fileNameOptions resource.FilenameOptions fileNameOptions resource.FilenameOptions
dryRunStrategy cmdutil.DryRunStrategy dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier dryRunVerifier *resource.QueryParamVerifier
shortOutput bool shortOutput bool
all bool all bool
output string output string
@ -142,7 +142,7 @@ func (o *SetServiceAccountOptions) Complete(f cmdutil.Factory, cmd *cobra.Comman
if err != nil { if err != nil {
return err return err
} }
o.dryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.dryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
o.output = cmdutil.GetFlagString(cmd, "output") o.output = cmdutil.GetFlagString(cmd, "output")
o.updatePodSpecForObject = polymorphichelpers.UpdatePodSpecForObjectFn o.updatePodSpecForObject = polymorphichelpers.UpdatePodSpecForObjectFn

4
pkg/cmd/set/set_subject.go
View File

@ -66,7 +66,7 @@ type SubjectOptions struct {
Output string Output string
All bool All bool
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
Local bool Local bool
fieldManager string fieldManager string
@ -132,7 +132,7 @@ func (o *SubjectOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
printer, err := o.PrintFlags.ToPrinter() printer, err := o.PrintFlags.ToPrinter()

4
pkg/cmd/taint/taint.go
View File

@ -48,7 +48,7 @@ type TaintOptions struct {
ToPrinter func(string) (printers.ResourcePrinter, error) ToPrinter func(string) (printers.ResourcePrinter, error)
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
resources []string resources []string
taintsToAdd []v1.Taint taintsToAdd []v1.Taint
@ -147,7 +147,7 @@ func (o *TaintOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
if err != nil { if err != nil {
return err return err
} }
o.DryRunVerifier = resource.NewDryRunVerifier(dynamicClient, f.OpenAPIGetter()) o.DryRunVerifier = resource.NewQueryParamVerifier(dynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy) cmdutil.PrintFlagsWithDryRunStrategy(o.PrintFlags, o.DryRunStrategy)
// retrieves resource and taint args from args // retrieves resource and taint args from args

2
pkg/drain/drain.go
View File

@ -83,7 +83,7 @@ type Helper struct {
ErrOut io.Writer ErrOut io.Writer
DryRunStrategy cmdutil.DryRunStrategy DryRunStrategy cmdutil.DryRunStrategy
DryRunVerifier *resource.DryRunVerifier DryRunVerifier *resource.QueryParamVerifier
// OnPodDeletedOrEvicted is called when a pod is evicted/deleted; for printing progress output // OnPodDeletedOrEvicted is called when a pod is evicted/deleted; for printing progress output
OnPodDeletedOrEvicted func(pod *corev1.Pod, usingEviction bool) OnPodDeletedOrEvicted func(pod *corev1.Pod, usingEviction bool)