From 086d6ae9bbbe95e0740e7dd44fa08c31409f8bec Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Fri, 3 Apr 2020 16:47:19 -0700 Subject: [PATCH] Check Annotations map against nil for ConfigMapLock#Update() Signed-off-by: Ted Yu --- .../tools/leaderelection/resourcelock/configmaplock.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go b/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go index 785356894f1..79c7df922e8 100644 --- a/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go +++ b/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go @@ -86,6 +86,9 @@ func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error { if err != nil { return err } + if cml.cm.Annotations == nil { + cml.cm.Annotations = make(map[string]string) + } cml.cm.Annotations[LeaderElectionRecordAnnotationKey] = string(recordBytes) cml.cm, err = cml.Client.ConfigMaps(cml.ConfigMapMeta.Namespace).Update(cml.cm) return err