avoid annotation/label panic with empty maps (#1824)

minio · Nov 14, 2023 · 1d55a1a · 1d55a1a
1 parent 53deac5
commit 1d55a1a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/apis/minio.min.io/v2/helper.go b/pkg/apis/minio.min.io/v2/helper.go
@@ -905,6 +905,12 @@ func GetClusterDomain() string {
 
 // MergeMaps merges two maps and returns the union
 func MergeMaps(a, b map[string]string) map[string]string {
+	if a == nil {
+		a = map[string]string{}
+	}
+	if b == nil {
+		b = map[string]string{}
+	}
 	for k, v := range b {
 		a[k] = v
 	}