Merge pull request #98 from lavalamp/mempool

disable one more union bit
kubernetes-sigs · Aug 17, 2019 · 6149e45 · 6149e45
2 parents 78536ba + 255b635
commit 6149e45
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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()