github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69866 from xichengliudui/fix181016 

Remove duplicate words
pull/58/head
k8s-ci-robot 2018-10-22 15:35:36 -07:00 committed by GitHub
parent 8e7e226422 e394482373
commit 1af393d58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/apply/parse/factory.go
View File

@ -116,5 +116,5 @@ func (v *ElementBuildingVisitor) getItem(s proto.Schema, name string, data apply
}, },
}, nil }, nil
} }
return nil, fmt.Errorf("unsupported type type %v", kind) return nil, fmt.Errorf("unsupported type %v", kind)
} }

2
pkg/kubectl/cmd/annotate/annotate.go
View File

@ -245,7 +245,7 @@ func (o AnnotateOptions) RunAnnotate() error {
// only apply resource version locking on a single resource. // only apply resource version locking on a single resource.
// we must perform this check after o.builder.Do() as // we must perform this check after o.builder.Do() as
// []o.resources can not not accurately return the proper number // []o.resources can not accurately return the proper number
// of resources when they are not passed in "resource/name" format. // of resources when they are not passed in "resource/name" format.
if !singleItemImpliedResource && len(o.resourceVersion) > 0 { if !singleItemImpliedResource && len(o.resourceVersion) > 0 {
return fmt.Errorf("--resource-version may only be used with a single resource") return fmt.Errorf("--resource-version may only be used with a single resource")

2
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go
View File

@ -74,7 +74,7 @@ func getSchema(f Fake, model string) (openapi.Schema, error) {
return m.LookupModel(model), nil return m.LookupModel(model), nil
} }
// GetSchemaOrDie returns returns the openapi schema. // GetSchemaOrDie returns the openapi schema.
func GetSchemaOrDie(f Fake, model string) openapi.Schema { func GetSchemaOrDie(f Fake, model string) openapi.Schema {
s, err := getSchema(f, model) s, err := getSchema(f, model)
if err != nil { if err != nil {

2
staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit_test.go
View File

@ -817,7 +817,7 @@ func TestAuditIDHttpHeader(t *testing.T) {
t.Errorf("[%s] expected Audit-ID http header returned, but not returned", test.desc) t.Errorf("[%s] expected Audit-ID http header returned, but not returned", test.desc)
continue continue
} }
// if get Audit-ID returned, it should be the same same with the requested one // if get Audit-ID returned, it should be the same with the requested one
if test.requestHeader != "" && resp.Header.Get("Audit-ID") != test.requestHeader { if test.requestHeader != "" && resp.Header.Get("Audit-ID") != test.requestHeader {
t.Errorf("[%s] returned audit http header is not the same with the requested http header, expected: %s, get %s", test.desc, test.requestHeader, resp.Header.Get("Audit-ID")) t.Errorf("[%s] returned audit http header is not the same with the requested http header, expected: %s, get %s", test.desc, test.requestHeader, resp.Header.Get("Audit-ID"))
} }