fix: nil map assignment in features config (#2204)

acorn-io · Oct 3, 2023 · 7a139ed · 7a139ed
1 parent 84a3c3b
commit 7a139ed
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -384,8 +384,12 @@ func merge(oldConfig, newConfig *apiv1.Config) *apiv1.Config {
 		mergedConfig.CertManagerIssuer = newConfig.CertManagerIssuer
 	}
 	if newConfig.Features != nil {
-		for k, v := range newConfig.Features {
-			mergedConfig.Features[k] = v
+		if mergedConfig.Features == nil {
+			mergedConfig.Features = newConfig.Features
+		} else {
+			for k, v := range newConfig.Features {
+				mergedConfig.Features[k] = v
+			}
 		}
 	}