Merge pull request kubernetes#86040 from haosdent/fix-staticcheck-annotate

k8s-ci-robot · web-flow · commit 623b6978866b · 2019-12-17T06:18:27.000-08:00
fix static check in kubectl/pkg/cmd/annotate.
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -143,7 +143,6 @@ vendor/k8s.io/client-go/restmapper
 vendor/k8s.io/client-go/tools/leaderelection
 vendor/k8s.io/client-go/transport
 vendor/k8s.io/component-base/metrics
-vendor/k8s.io/kubectl/pkg/cmd/annotate
 vendor/k8s.io/kubectl/pkg/cmd/certificates
 vendor/k8s.io/kubectl/pkg/cmd/config
 vendor/k8s.io/kubectl/pkg/cmd/edit
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate.go
@@ -328,7 +328,7 @@ func validateAnnotations(removeAnnotations []string, newAnnotations map[string]s
 			if modifyRemoveBuf.Len() > 0 {
 				modifyRemoveBuf.WriteString(", ")
 			}
-			modifyRemoveBuf.WriteString(fmt.Sprintf(removeAnnotation))
+			modifyRemoveBuf.WriteString(fmt.Sprint(removeAnnotation))
 		}
 	}
 	if modifyRemoveBuf.Len() > 0 {

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ func validateAnnotations(removeAnnotations []string, newAnnotations map[string]s`
`328`	`328`	`if modifyRemoveBuf.Len() > 0 {`
`329`	`329`	`modifyRemoveBuf.WriteString(", ")`
`330`	`330`	`}`
`331`		`- modifyRemoveBuf.WriteString(fmt.Sprintf(removeAnnotation))`
	`331`	`+ modifyRemoveBuf.WriteString(fmt.Sprint(removeAnnotation))`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`	`if modifyRemoveBuf.Len() > 0 {`