diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b5dc7fa83..80f3f248c 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -596,7 +596,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "442f8fb2f03a" + "Rev": "0ee8b4573e3a" }, { "ImportPath": "k8s.io/cli-runtime", diff --git a/go.mod b/go.mod index d355c5d77..282bf0ad7 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( gopkg.in/yaml.v2 v2.2.4 gotest.tools v2.2.0+incompatible // indirect k8s.io/api v0.0.0-20191214185829-ca1d04f8b0d3 - k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a + k8s.io/apimachinery v0.0.0-20191216025728-0ee8b4573e3a k8s.io/cli-runtime v0.0.0-20191214191754-e6dc6d5c8724 k8s.io/client-go v0.0.0-20191214190045-a32a6f7a3052 k8s.io/component-base v0.0.0-20191214190519-d868452632e2 @@ -54,7 +54,7 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 k8s.io/api => k8s.io/api v0.0.0-20191214185829-ca1d04f8b0d3 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191216025728-0ee8b4573e3a k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191214191754-e6dc6d5c8724 k8s.io/client-go => k8s.io/client-go v0.0.0-20191214190045-a32a6f7a3052 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191214185510-0b9b3c99f9f2 diff --git a/go.sum b/go.sum index df76dba99..9b2e7c2fb 100644 --- a/go.sum +++ b/go.sum @@ -324,7 +324,7 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.0.0-20191214185829-ca1d04f8b0d3/go.mod h1:itOjKREfmUTvcjantxOsyYU5mbFsU7qUnyUuRfF5+5M= -k8s.io/apimachinery v0.0.0-20191214185652-442f8fb2f03a/go.mod h1:Ng1IY8TS7sC44KJxT/WUR6qFRfWwahYYYpNXyYRKOCY= +k8s.io/apimachinery v0.0.0-20191216025728-0ee8b4573e3a/go.mod h1:Ng1IY8TS7sC44KJxT/WUR6qFRfWwahYYYpNXyYRKOCY= k8s.io/cli-runtime v0.0.0-20191214191754-e6dc6d5c8724/go.mod h1:wzlq80lvjgHW9if6MlE4OIGC86MDKsy5jtl9nxz/IYY= k8s.io/client-go v0.0.0-20191214190045-a32a6f7a3052/go.mod h1:tAaoc/sYuIL0+njJefSAmE28CIcxyaFV4kbIujBlY2s= k8s.io/code-generator v0.0.0-20191214185510-0b9b3c99f9f2/go.mod h1:BjGKcoq1MRUmcssvHiSxodCco1T6nVIt4YeCT5CMSao= diff --git a/pkg/cmd/annotate/annotate.go b/pkg/cmd/annotate/annotate.go index 35da6cfa9..3db68106b 100644 --- a/pkg/cmd/annotate/annotate.go +++ b/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 {