Merge pull request #69866 from xichengliudui/fix181016

pkg/kubectl/apply/parse/factory.go

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

pkg/kubectl/cmd/annotate/annotate.go

@@ -245,7 +245,7 @@ func (o AnnotateOptions) RunAnnotate() error {
 
 	// only apply resource version locking on a single resource.
 	// 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.
 	if !singleItemImpliedResource && len(o.resourceVersion) > 0 {
 		return fmt.Errorf("--resource-version may only be used with a single resource")

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

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

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

@@ -817,7 +817,7 @@ func TestAuditIDHttpHeader(t *testing.T) {
 				t.Errorf("[%s] expected Audit-ID http header returned, but not returned", test.desc)
 				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 {
 				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"))
 			}