From fa1e013ed08e08e23889b84ecae1b9eb520d8d7f Mon Sep 17 00:00:00 2001 From: caozhiyuan Date: Wed, 29 Jul 2020 19:18:05 +0800 Subject: [PATCH] reduce type conversion and correct variable name Kubernetes-commit: 13468442bfbdf69a6e6690497fce427317cff790 --- tools/leaderelection/resourcelock/configmaplock.go | 7 ++++--- tools/leaderelection/resourcelock/endpointslock.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/leaderelection/resourcelock/configmaplock.go b/tools/leaderelection/resourcelock/configmaplock.go index 6390b4ef..13e45877 100644 --- a/tools/leaderelection/resourcelock/configmaplock.go +++ b/tools/leaderelection/resourcelock/configmaplock.go @@ -52,13 +52,14 @@ func (cml *ConfigMapLock) Get(ctx context.Context) (*LeaderElectionRecord, []byt if cml.cm.Annotations == nil { cml.cm.Annotations = make(map[string]string) } - recordBytes, found := cml.cm.Annotations[LeaderElectionRecordAnnotationKey] + recordStr, found := cml.cm.Annotations[LeaderElectionRecordAnnotationKey] + recordBytes := []byte(recordStr) if found { - if err := json.Unmarshal([]byte(recordBytes), &record); err != nil { + if err := json.Unmarshal(recordBytes, &record); err != nil { return nil, nil, err } } - return &record, []byte(recordBytes), nil + return &record, recordBytes, nil } // Create attempts to create a LeaderElectionRecord annotation diff --git a/tools/leaderelection/resourcelock/endpointslock.go b/tools/leaderelection/resourcelock/endpointslock.go index 132c5a54..55a2ac47 100644 --- a/tools/leaderelection/resourcelock/endpointslock.go +++ b/tools/leaderelection/resourcelock/endpointslock.go @@ -47,13 +47,14 @@ func (el *EndpointsLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte if el.e.Annotations == nil { el.e.Annotations = make(map[string]string) } - recordBytes, found := el.e.Annotations[LeaderElectionRecordAnnotationKey] + recordStr, found := el.e.Annotations[LeaderElectionRecordAnnotationKey] + recordBytes := []byte(recordStr) if found { - if err := json.Unmarshal([]byte(recordBytes), &record); err != nil { + if err := json.Unmarshal(recordBytes, &record); err != nil { return nil, nil, err } } - return &record, []byte(recordBytes), nil + return &record, recordBytes, nil } // Create attempts to create a LeaderElectionRecord annotation