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

Merge pull request #105445 from ardaguclu/diff-invalid-arg-status-code 

Add diff command return status code greater than 1 when flags invalid

Kubernetes-commit: e054181e517b48a3c862207537092c28604aaad9
This commit is contained in:
Kubernetes Publisher 2021-10-12 15:43:48 -07:00
parent a8d3024f11 8307ca4a3c
commit 04a41bcaa8
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
go.mod
View File

@ -31,12 +31,12 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20211005163402-965a3d4efac6
k8s.io/apimachinery v0.0.0-20211005152320-968be710e37a
k8s.io/api v0.0.0-20211008163859-2a5dae08c42b
k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a
k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1
k8s.io/client-go v0.0.0-20211005163711-3511ef41b1fb
k8s.io/component-base v0.0.0-20211004123803-799bb6e531c3
k8s.io/component-helpers v0.0.0-20211001004347-11b67914ce96
k8s.io/client-go v0.0.0-20211011163815-7697067af710
k8s.io/component-base v0.0.0-20211011003846-8870347bee41
k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf
k8s.io/klog/v2 v2.20.0
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
k8s.io/metrics v0.0.0-20211001005724-9be6d708955e
@ -47,12 +47,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211005163402-965a3d4efac6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211005152320-968be710e37a
k8s.io/api => k8s.io/api v0.0.0-20211008163859-2a5dae08c42b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1
k8s.io/client-go => k8s.io/client-go v0.0.0-20211005163711-3511ef41b1fb
k8s.io/client-go => k8s.io/client-go v0.0.0-20211011163815-7697067af710
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210930223515-ede4574ee351
k8s.io/component-base => k8s.io/component-base v0.0.0-20211004123803-799bb6e531c3
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211001004347-11b67914ce96
k8s.io/component-base => k8s.io/component-base v0.0.0-20211011003846-8870347bee41
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf
k8s.io/metrics => k8s.io/metrics v0.0.0-20211001005724-9be6d708955e
)

20
go.sum
View File

@ -902,19 +902,19 @@ 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-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=
k8s.io/api v0.0.0-20211005163402-965a3d4efac6 h1:4nid4gaGt4QFtlvh0BuRJukvljt+Mwp7mhFhtNl5A80=
k8s.io/api v0.0.0-20211005163402-965a3d4efac6/go.mod h1:uigk499NtRe0ine9Jz9mxVwAjascSPD/Ojn9xYSyB58=
k8s.io/apimachinery v0.0.0-20211005152320-968be710e37a h1:vUbAbtv8pmpeY1rOEQZjy/ALaYwNKdUi3d6pyq9B7Os=
k8s.io/apimachinery v0.0.0-20211005152320-968be710e37a/go.mod h1:RAdi3McqM+9tkYHOyceb4XOeJWm9BCAF4BhZki5iiok=
k8s.io/api v0.0.0-20211008163859-2a5dae08c42b h1:Nz70nzsUXXw2WjuESe7doPFLamYCkuqPr0h4WNULijE=
k8s.io/api v0.0.0-20211008163859-2a5dae08c42b/go.mod h1:uigk499NtRe0ine9Jz9mxVwAjascSPD/Ojn9xYSyB58=
k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a h1:Fa8/LoJZy1sBTaigz7uy5FFq+UXaAqQMXBwek4HNQpM=
k8s.io/apimachinery v0.0.0-20211012003219-6c3d2b36a98a/go.mod h1:RAdi3McqM+9tkYHOyceb4XOeJWm9BCAF4BhZki5iiok=
k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1 h1:GvF0XFIO0Cuu5Ly8vnav4vMtzlWGoA5igAh33tUbDkw=
k8s.io/cli-runtime v0.0.0-20211001205205-cb123082bee1/go.mod h1:qYViNs18B5H9dPd0sBerg0p7e5BNc43CFWpK4/etB3Y=
k8s.io/client-go v0.0.0-20211005163711-3511ef41b1fb h1:nga8yAXtOwTu2rBXgL2RUbberetndy68JG90SrjS/84=
k8s.io/client-go v0.0.0-20211005163711-3511ef41b1fb/go.mod h1:dZcP7TWKqHJIMu4IsnFfjWNqT8QT8a42HCUk+yTX4uY=
k8s.io/client-go v0.0.0-20211011163815-7697067af710 h1:sjhDoyTtoJBdLy/j7u+ArsUBDo4nPzroR12DTMLxMMA=
k8s.io/client-go v0.0.0-20211011163815-7697067af710/go.mod h1:23ANvvt/Rdu4xgW4A1+kuplABnO2iM26sMSCe0iy4vc=
k8s.io/code-generator v0.0.0-20210930223515-ede4574ee351/go.mod h1:pxmv1vqS30f8CieYQvITL/Z2lV5G6+/Ze3wRjS3HXFo=
k8s.io/component-base v0.0.0-20211004123803-799bb6e531c3 h1:fFiiTCFhhnvzK2Ijlkvu0lILqg9tedrIBAH1kMKjBAY=
k8s.io/component-base v0.0.0-20211004123803-799bb6e531c3/go.mod h1:k8WbcY75pTS2zc0mVGbSkWIvjrqL51iRgENi98nxCog=
k8s.io/component-helpers v0.0.0-20211001004347-11b67914ce96 h1:5fnKBbxL2SG1vEH84wyKuN4KD1b5FrhfMCPj7miopFI=
k8s.io/component-helpers v0.0.0-20211001004347-11b67914ce96/go.mod h1:BE8rv6HCr8U9iH8YWO+p/lKTjLDQM6e3Am/K0LxZy28=
k8s.io/component-base v0.0.0-20211011003846-8870347bee41 h1:tvTzEXRVIHckQFJX2Ys8uRbVnfnwuCPVlMoamQAyYfo=
k8s.io/component-base v0.0.0-20211011003846-8870347bee41/go.mod h1:YPDB9OvJp4U0ttMfrwtCM8C2I7nx+m74DgAwYcvpFUo=
k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf h1:UTAkNKWDfNPryv8gYYaSlLSWRdHVqoQy5dEoj1aFFC8=
k8s.io/component-helpers v0.0.0-20211007164423-21d2fdede9bf/go.mod h1:UOhGtwDJlad/eM2Hw8FTUvJ8d6bKEO9OLAfkrvBwGek=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

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

@ -160,6 +160,14 @@ func NewCmdDiff(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C
},
}
// Flag errors exit with code 1, however according to the diff
// command it means changes were found.
// Thus, it should return status code greater than 1.
cmd.SetFlagErrorFunc(func(command *cobra.Command, err error) error {
cmdutil.CheckDiffErr(cmdutil.UsageErrorf(cmd, err.Error()))
return nil
})
usage := "contains the configuration to diff"
cmd.Flags().StringVarP(&options.Selector, "selector", "l", options.Selector, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)")
cmdutil.AddFilenameOptionFlags(cmd, &options.FilenameOptions, usage)