Merge pull request #59725 from wgliang/master.vet

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix some syntax related errors

**What this PR does / why we need it**:
fix some syntax related errors

**Special notes for your reviewer**:
None

```release-note
NONE
```

Kubernetes-commit: effa021db773fb95c9e8fbe5646d01784bb2f7f6
This commit is contained in:
Kubernetes Publisher 2018-02-27 01:45:01 -08:00
commit 601d858a59
2 changed files with 581 additions and 581 deletions

106
Godeps/Godeps.json generated
View File

@ -364,215 +364,215 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "bf4c8d907ba9e7fee82a73bad5346aeebff5d06e"
"Rev": "0406a944760b00b7a75b559f642673d7bb07b48a"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -206,7 +206,7 @@ func TestSetRotationDeadline(t *testing.T) {
t.Errorf("%d metrics were recorded, wanted %d", g.calls, 1)
}
if g.lastValue != float64(tc.notAfter.Unix()) {
t.Errorf("%d value for metric was recorded, wanted %d", g.lastValue, tc.notAfter.Unix())
t.Errorf("%f value for metric was recorded, wanted %d", g.lastValue, tc.notAfter.Unix())
}
})
}