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

Merge pull request #107909 from sebastiansterk/master 

🤓 simple grammar fix

Kubernetes-commit: 4033355d292505eaed05655bd91f4ea9edc7ef27
This commit is contained in:
Kubernetes Publisher 2022-02-15 12:15:18 -08:00
parent 171f5b9905 31436b2c03
commit 86f2109086
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go.mod
View File

@ -32,9 +32,9 @@ require (
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220211180231-29fd43e6ca1e
k8s.io/apimachinery v0.0.0-20220211180034-1a1682da6e3c
k8s.io/apimachinery v0.0.0-20220215034602-14143357d417
k8s.io/cli-runtime v0.0.0-20220211182418-ce08a7c816b2
k8s.io/client-go v0.0.0-20220211180521-b74c541cff29
k8s.io/client-go v0.0.0-20220215060521-a7d2e0118033
k8s.io/component-base v0.0.0-20220214200630-8ffe7361d341
k8s.io/component-helpers v0.0.0-20220211181107-590c06cbb7ac
k8s.io/klog/v2 v2.40.1
@ -49,10 +49,10 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220211180231-29fd43e6ca1e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220211180034-1a1682da6e3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220215034602-14143357d417
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220211182418-ce08a7c816b2
k8s.io/client-go => k8s.io/client-go v0.0.0-20220211180521-b74c541cff29
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220211175847-bbecdaac97e8
k8s.io/client-go => k8s.io/client-go v0.0.0-20220215060521-a7d2e0118033
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220215034602-cad66f3e2848
k8s.io/component-base => k8s.io/component-base v0.0.0-20220214200630-8ffe7361d341
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220211181107-590c06cbb7ac
k8s.io/metrics => k8s.io/metrics v0.0.0-20220211182304-30fa1ea194c5

10
go.sum
View File

@ -917,13 +917,13 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220211180231-29fd43e6ca1e h1:yXpTN5xO/yZqIouUTCMDCacOcNa+0Ycy/1tVJltMGe0=
k8s.io/api v0.0.0-20220211180231-29fd43e6ca1e/go.mod h1:eqKeSWEJHaiCAExYjXn8c59z8QbcBfB1mDZxz2KB0bA=
k8s.io/apimachinery v0.0.0-20220211180034-1a1682da6e3c h1:yqNX4hYvquMkOzQ2ed1SdywKRMSE3ASNHXXTFpfUPH0=
k8s.io/apimachinery v0.0.0-20220211180034-1a1682da6e3c/go.mod h1:NkKr4Y6EHrxZYK5GCJIxxio58KsT/e3jmTsC9u1PYlA=
k8s.io/apimachinery v0.0.0-20220215034602-14143357d417 h1:W/775y0B+ZMNzve0SjV0LlG1u3VA+m6ZMn+y5tSQxs8=
k8s.io/apimachinery v0.0.0-20220215034602-14143357d417/go.mod h1:NkKr4Y6EHrxZYK5GCJIxxio58KsT/e3jmTsC9u1PYlA=
k8s.io/cli-runtime v0.0.0-20220211182418-ce08a7c816b2 h1:8bxBcDue7vWT/qdL97qiGuIABRkQ4oOu+K5JGKDsK0o=
k8s.io/cli-runtime v0.0.0-20220211182418-ce08a7c816b2/go.mod h1:w2Mas6X074d0B6b6mWy54EtbUHNANxqO0mVM/GHK/tM=
k8s.io/client-go v0.0.0-20220211180521-b74c541cff29 h1:MgJnQBnmTjX43xqfHLtJ2MRwYreC7Z4qhHoWfKweMw4=
k8s.io/client-go v0.0.0-20220211180521-b74c541cff29/go.mod h1:ogF7pgWupOsxNeKMSy1QP9Q/vXzPCF9rIIHy+BbYIJ0=
k8s.io/code-generator v0.0.0-20220211175847-bbecdaac97e8/go.mod h1:RGBk0F4ZD2LgSn/a0UQWbmrfdaz0dYeEGJ1d8FZhkuU=
k8s.io/client-go v0.0.0-20220215060521-a7d2e0118033 h1:DhsDKPoQGKFwNUX2zTe1L/WrzCz1OGP2T7PFsHWB3fw=
k8s.io/client-go v0.0.0-20220215060521-a7d2e0118033/go.mod h1:PjjDoc1wUIl1n2K2ZVzcdBuGRhDbuf/7fmJElPkMk0w=
k8s.io/code-generator v0.0.0-20220215034602-cad66f3e2848/go.mod h1:RGBk0F4ZD2LgSn/a0UQWbmrfdaz0dYeEGJ1d8FZhkuU=
k8s.io/component-base v0.0.0-20220214200630-8ffe7361d341 h1:fMAdodfRoQSdcDIh55AfjVoGMcwEtvR9s3PMBf/TRB8=
k8s.io/component-base v0.0.0-20220214200630-8ffe7361d341/go.mod h1:/s3QExh9khLqplagLYESXtVTwBEUn60uy6001zqQXXY=
k8s.io/component-helpers v0.0.0-20220211181107-590c06cbb7ac h1:W5JkgqwRKPz8NU7Y30fdPXbWIEvmzrK2lkq645lTkgY=

2
pkg/cmd/config/view.go
View File

@ -123,7 +123,7 @@ func (o *ViewOptions) Complete(cmd *cobra.Command, args []string) error {
// Validate makes sure that provided values for command-line options are valid
func (o ViewOptions) Validate() error {
if !o.Merge.Value() && !o.ConfigAccess.IsExplicitFile() {
return errors.New("if merge==false a precise file must to specified")
return errors.New("if merge==false a precise file must be specified")
}
return nil