From 255b635a9b14efeff4ee9de27bf783a50dc33948 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 16 Aug 2019 20:39:51 -0700 Subject: [PATCH] disable one more union bit --- merge/update.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/merge/update.go b/merge/update.go index a279db58..96c9751a 100644 --- a/merge/update.go +++ b/merge/update.go @@ -166,9 +166,11 @@ func (s *Updater) Apply(liveObject, configObject *typed.TypedValue, version fiel if err != nil { return nil, fieldpath.ManagedFields{}, fmt.Errorf("failed to merge config: %v", err) } - newObject, err = configObject.NormalizeUnionsApply(newObject) - if err != nil { - return nil, fieldpath.ManagedFields{}, err + if s.enableUnions { + newObject, err = configObject.NormalizeUnionsApply(newObject) + if err != nil { + return nil, fieldpath.ManagedFields{}, err + } } lastSet := managers[manager] set, err := configObject.ToFieldSet()