Merge pull request #37 from microsoft/eedorenko/merge-config-objects

Merge config objects

Author: eedorenko

controllers/assignment_controller.go

@@ -393,8 +393,30 @@ func (r *AssignmentReconciler) mergeObjects(existingObject interface{}, newObjec
 	if existingArray, ok := existingObject.([]interface{}); ok {
 		newArray, ok := newObject.([]interface{})
 		if ok {
-			// append the new array to the existing array
-			return append(existingArray, newArray...)
+			// iterate over the new array and merge the values
+			for i := 0; i < len(newArray); i++ {
+				value := newArray[i]
+				matched := false
+				// check if the value is a map
+				if valueMap, ok := value.(map[interface{}]interface{}); ok {
+					// check if the map with same "name" key exists in the existing array
+					for j := 0; j < len(existingArray); j++ {
+						existingValue := existingArray[j]
+						if existingValueMap, ok := existingValue.(map[interface{}]interface{}); ok {
+							if existingValueMap["name"] == valueMap["name"] {
+								// merge the maps
+								existingArray[j] = r.mergeObjects(existingValue, value)
+								matched = true
+							}
+						}
+					}
+				}
+				if !matched {
+					existingArray = append(existingArray, value)
+				}
+			}
+
+			return existingArray
 
 		}
 	}

go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/oauth2 v0.13.0
 	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.28.3
 	k8s.io/apimachinery v0.28.3
 	k8s.io/client-go v0.28.3
@@ -81,7 +82,6 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.28.3 // indirect
 	k8s.io/component-base v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect

scheduler/templater.go

@@ -27,7 +27,7 @@ import (
 	"github.com/Masterminds/sprig"
 	kalypsov1alpha1 "github.com/microsoft/kalypso-scheduler/api/v1alpha1"
 	"github.com/mitchellh/hashstructure"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )