Merge pull request #110267 from TinySong/auth-cani

update auto can-i error message

Kubernetes-commit: 5858aa2befe2ab6b5c0f9d0556da77c812eaf8e9
This commit is contained in:
Kubernetes Publisher 2022-09-12 12:01:05 -07:00
commit a38f2f2f78
3 changed files with 7 additions and 5 deletions

4
go.mod
View File

@ -32,7 +32,7 @@ require (
k8s.io/api v0.0.0-20220909223647-30ff9916664f
k8s.io/apimachinery v0.0.0-20220909223208-6d854d747c21
k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812
k8s.io/client-go v0.0.0-20220909224245-ab826d2728f3
k8s.io/client-go v0.0.0-20220912183627-9dae6917fba0
k8s.io/component-base v0.0.0-20220909225306-3f8aa5a81d31
k8s.io/component-helpers v0.0.0-20220909225538-674a89f0140e
k8s.io/klog/v2 v2.80.1
@ -96,7 +96,7 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20220909223647-30ff9916664f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220909223208-6d854d747c21
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812
k8s.io/client-go => k8s.io/client-go v0.0.0-20220909224245-ab826d2728f3
k8s.io/client-go => k8s.io/client-go v0.0.0-20220912183627-9dae6917fba0
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220909222852-c3fdc3ca70f8
k8s.io/component-base => k8s.io/component-base v0.0.0-20220909225306-3f8aa5a81d31
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220909225538-674a89f0140e

4
go.sum
View File

@ -549,8 +549,8 @@ k8s.io/apimachinery v0.0.0-20220909223208-6d854d747c21 h1:/RMUsMMVr3xRUWpyOQKagJ
k8s.io/apimachinery v0.0.0-20220909223208-6d854d747c21/go.mod h1:uBlVnHT48nY5oV6uG8J4eVKMg56CZnmtHewbsBFKgJA=
k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812 h1:mbNy/DNFTZhwURg5iq1SgGqcVJPtVCd5Ye8dnmP0WKg=
k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812/go.mod h1:VNSlkRvUTUdIfrZikvh+1F0uJyRlLclE7JwYraYvIMk=
k8s.io/client-go v0.0.0-20220909224245-ab826d2728f3 h1:PkVMH2O/rFAMo1rTkgR3Z350vHfprbaG295igiMTdWk=
k8s.io/client-go v0.0.0-20220909224245-ab826d2728f3/go.mod h1:0uMSNDHUsMhV/kWEx8KQztCZHSWwprrUaWZebaf3QPc=
k8s.io/client-go v0.0.0-20220912183627-9dae6917fba0 h1:cgoKCqSOa1s3Cd0LPl0H8XNOywKBmrf7+wHN8KHoPbY=
k8s.io/client-go v0.0.0-20220912183627-9dae6917fba0/go.mod h1:0uMSNDHUsMhV/kWEx8KQztCZHSWwprrUaWZebaf3QPc=
k8s.io/component-base v0.0.0-20220909225306-3f8aa5a81d31 h1:D6/Snav0hNqj59CtxCw1b/7uDpt0bh/LJ3EgaJexFdA=
k8s.io/component-base v0.0.0-20220909225306-3f8aa5a81d31/go.mod h1:vqup2ywrSckV+vGOpXZJ8wKhAiqse0XTB6qKJVUmQBc=
k8s.io/component-helpers v0.0.0-20220909225538-674a89f0140e h1:kbPvRRhjajJNCygkNqgyQv8fQ4MqTLPspvXMSfU0U/Y=

View File

@ -174,7 +174,9 @@ func (o *CanIOptions) Complete(f cmdutil.Factory, args []string) error {
o.ResourceName = resourceTokens[1]
}
default:
return errors.New("you must specify two or three arguments: verb, resource, and optional resourceName")
errString := "you must specify two arguments: verb resource or verb resource/resourceName."
usageString := "See 'kubectl auth can-i -h' for help and examples."
return errors.New(fmt.Sprintf("%s\n%s", errString, usageString))
}
}