github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93529 from latteczy/master

Browse Source 
reduce the number of type conversions and correct variable name
This commit is contained in:
Kubernetes Prow Robot 2020-08-28 06:37:31 -07:00 committed by GitHub
commit 01ca6fb5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go
View File

@ -52,13 +52,14 @@ func (cml *ConfigMapLock) Get(ctx context.Context) (*LeaderElectionRecord, []byt
if cml.cm.Annotations == nil { if cml.cm.Annotations == nil {
cml.cm.Annotations = make(map[string]string) 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 found {
if err := json.Unmarshal([]byte(recordBytes), &record); err != nil { if err := json.Unmarshal(recordBytes, &record); err != nil {
return nil, nil, err return nil, nil, err
} }
} }
return &record, []byte(recordBytes), nil return &record, recordBytes, nil
} }
// Create attempts to create a LeaderElectionRecord annotation // Create attempts to create a LeaderElectionRecord annotation

7
staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/endpointslock.go
View File

@ -47,13 +47,14 @@ func (el *EndpointsLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte
if el.e.Annotations == nil { if el.e.Annotations == nil {
el.e.Annotations = make(map[string]string) 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 found {
if err := json.Unmarshal([]byte(recordBytes), &record); err != nil { if err := json.Unmarshal(recordBytes, &record); err != nil {
return nil, nil, err return nil, nil, err
} }
} }
return &record, []byte(recordBytes), nil return &record, recordBytes, nil
} }
// Create attempts to create a LeaderElectionRecord annotation // Create attempts to create a LeaderElectionRecord annotation