From 08a86da47d28b270dfa1bddf1f73a8944eef883e Mon Sep 17 00:00:00 2001 From: Victor Agababov Date: Thu, 28 May 2020 12:03:00 -0700 Subject: [PATCH] User variadic version and remove nil (#1361) * User variadic version and remove nil Update duck/status to use new version of UnionMaps * comment --- apis/duck/v1/status_types.go | 2 +- apis/duck/v1beta1/status_types.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apis/duck/v1/status_types.go b/apis/duck/v1/status_types.go index 53006708f..aab246b1f 100644 --- a/apis/duck/v1/status_types.go +++ b/apis/duck/v1/status_types.go @@ -96,7 +96,7 @@ func (source *Status) ConvertTo(ctx context.Context, sink *Status, predicates .. sink.ObservedGeneration = source.ObservedGeneration if source.Annotations != nil { // This will deep copy the map. - sink.Annotations = kmeta.UnionMaps(source.Annotations, nil) + sink.Annotations = kmeta.UnionMaps(source.Annotations) } conditions := make(apis.Conditions, 0, len(source.Conditions)) diff --git a/apis/duck/v1beta1/status_types.go b/apis/duck/v1beta1/status_types.go index d90e7dc69..107592e85 100644 --- a/apis/duck/v1beta1/status_types.go +++ b/apis/duck/v1beta1/status_types.go @@ -109,7 +109,8 @@ func (s *Status) GetCondition(t apis.ConditionType) *apis.Condition { func (source *Status) ConvertTo(ctx context.Context, sink *Status) { sink.ObservedGeneration = source.ObservedGeneration if source.Annotations != nil { - sink.Annotations = kmeta.UnionMaps(source.Annotations, nil) + // This will deep copy the map. + sink.Annotations = kmeta.UnionMaps(source.Annotations) } for _, c := range source.Conditions { switch c.Type {