github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112227 from viveksahu26/fix_warnings

Browse Source 
fix  linter errors
This commit is contained in:
Kubernetes Prow Robot 2022-09-16 06:31:17 -07:00 committed by GitHub
commit a43e80f21f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go
View File

@ -670,7 +670,7 @@ func (c *Cacher) GetList(ctx context.Context, key string, opts storage.ListOptio
}
trace := utiltrace.New("cacher list",
utiltrace.Field{"audit-id", endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{Key: "audit-id", Value: endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{Key: "type", Value: c.groupResource.String()})
defer trace.LogIfLong(500 * time.Millisecond)

2
staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_test.go
View File

@ -536,7 +536,7 @@ func TestReflectorForWatchCache(t *testing.T) {
}
lw := &testLW{
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
WatchFunc: func(_ metav1.ListOptions) (watch.Interface, error) {
fw := watch.NewFake()
go fw.Stop()
return fw, nil

44
staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
View File

@ -153,10 +153,10 @@ func (s *store) Get(ctx context.Context, key string, opts storage.GetOptions, ou
// Create implements storage.Interface.Create.
func (s *store) Create(ctx context.Context, key string, obj, out runtime.Object, ttl uint64) error {
trace := utiltrace.New("Create etcd3",
utiltrace.Field{"audit-id", endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{"key", key},
utiltrace.Field{"type", getTypeName(obj)},
utiltrace.Field{"resource", s.groupResourceString},
utiltrace.Field{Key: "audit-id", Value: endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{Key: "key", Value: key},
utiltrace.Field{Key: "type", Value: getTypeName(obj)},
utiltrace.Field{Key: "resource", Value: s.groupResourceString},
)
defer trace.LogIfLong(500 * time.Millisecond)
if version, err := s.versioner.ObjectResourceVersion(obj); err == nil && version != 0 {
@ -167,7 +167,7 @@ func (s *store) Create(ctx context.Context, key string, obj, out runtime.Object,
}
trace.Step("About to Encode")
data, err := runtime.Encode(s.codec, obj)
trace.Step("Encode finished", utiltrace.Field{"len", len(data)}, utiltrace.Field{"err", err})
trace.Step("Encode finished", utiltrace.Field{Key: "len", Value: len(data)}, utiltrace.Field{Key: "err", Value: err})
if err != nil {
return err
}
@ -179,7 +179,7 @@ func (s *store) Create(ctx context.Context, key string, obj, out runtime.Object,
}
newData, err := s.transformer.TransformToStorage(ctx, data, authenticatedDataString(key))
trace.Step("TransformToStorage finished", utiltrace.Field{"err", err})
trace.Step("TransformToStorage finished", utiltrace.Field{Key: "err", Value: err})
if err != nil {
return storage.NewInternalError(err.Error())
}
@ -191,7 +191,7 @@ func (s *store) Create(ctx context.Context, key string, obj, out runtime.Object,
clientv3.OpPut(key, string(newData), opts...),
).Commit()
metrics.RecordEtcdRequestLatency("create", s.groupResourceString, startTime)
trace.Step("Txn call finished", utiltrace.Field{"err", err})
trace.Step("Txn call finished", utiltrace.Field{Key: "err", Value: err})
if err != nil {
return err
}
@ -203,7 +203,7 @@ func (s *store) Create(ctx context.Context, key string, obj, out runtime.Object,
if out != nil {
putResp := txnResp.Responses[0].GetResponsePut()
err = decode(s.codec, s.versioner, data, out, putResp.Header.Revision)
trace.Step("decode finished", utiltrace.Field{"len", len(data)}, utiltrace.Field{"err", err})
trace.Step("decode finished", utiltrace.Field{Key: "len", Value: len(data)}, utiltrace.Field{Key: "err", Value: err})
return err
}
return nil
@ -332,10 +332,10 @@ func (s *store) GuaranteedUpdate(
ctx context.Context, key string, destination runtime.Object, ignoreNotFound bool,
preconditions *storage.Preconditions, tryUpdate storage.UpdateFunc, cachedExistingObject runtime.Object) error {
trace := utiltrace.New("GuaranteedUpdate etcd3",
utiltrace.Field{"audit-id", endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{"key", key},
utiltrace.Field{"type", getTypeName(destination)},
utiltrace.Field{"resource", s.groupResourceString})
utiltrace.Field{Key: "audit-id", Value: endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{Key: "key", Value: key},
utiltrace.Field{Key: "type", Value: getTypeName(destination)},
utiltrace.Field{Key: "resource", Value: s.groupResourceString})
defer trace.LogIfLong(500 * time.Millisecond)
v, err := conversion.EnforcePtr(destination)
@ -416,7 +416,7 @@ func (s *store) GuaranteedUpdate(
trace.Step("About to Encode")
data, err := runtime.Encode(s.codec, ret)
trace.Step("Encode finished", utiltrace.Field{"len", len(data)}, utiltrace.Field{"err", err})
trace.Step("Encode finished", utiltrace.Field{Key: "len", Value: len(data)}, utiltrace.Field{Key: "err", Value: err})
if err != nil {
return err
}
@ -442,7 +442,7 @@ func (s *store) GuaranteedUpdate(
}
newData, err := s.transformer.TransformToStorage(ctx, data, transformContext)
trace.Step("TransformToStorage finished", utiltrace.Field{"err", err})
trace.Step("TransformToStorage finished", utiltrace.Field{Key: "err", Value: err})
if err != nil {
return storage.NewInternalError(err.Error())
}
@ -462,7 +462,7 @@ func (s *store) GuaranteedUpdate(
clientv3.OpGet(key),
).Commit()
metrics.RecordEtcdRequestLatency("update", s.groupResourceString, startTime)
trace.Step("Txn call finished", utiltrace.Field{"err", err})
trace.Step("Txn call finished", utiltrace.Field{Key: "err", Value: err})
if err != nil {
return err
}
@ -481,7 +481,7 @@ func (s *store) GuaranteedUpdate(
putResp := txnResp.Responses[0].GetResponsePut()
err = decode(s.codec, s.versioner, data, destination, putResp.Header.Revision)
trace.Step("decode finished", utiltrace.Field{"len", len(data)}, utiltrace.Field{"err", err})
trace.Step("decode finished", utiltrace.Field{Key: "len", Value: len(data)}, utiltrace.Field{Key: "err", Value: err})
return err
}
}
@ -529,12 +529,12 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
match := opts.ResourceVersionMatch
pred := opts.Predicate
trace := utiltrace.New(fmt.Sprintf("List(recursive=%v) etcd3", recursive),
utiltrace.Field{"audit-id", endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{"key", key},
utiltrace.Field{"resourceVersion", resourceVersion},
utiltrace.Field{"resourceVersionMatch", match},
utiltrace.Field{"limit", pred.Limit},
utiltrace.Field{"continue", pred.Continue})
utiltrace.Field{Key: "audit-id", Value: endpointsrequest.GetAuditIDTruncated(ctx)},
utiltrace.Field{Key: "key", Value: key},
utiltrace.Field{Key: "resourceVersion", Value: resourceVersion},
utiltrace.Field{Key: "resourceVersionMatch", Value: match},
utiltrace.Field{Key: "limit", Value: pred.Limit},
utiltrace.Field{Key: "continue", Value: pred.Continue})
defer trace.LogIfLong(500 * time.Millisecond)
listPtr, err := meta.GetItemsPtr(listObj)
if err != nil {