Do not try to merge deprecated replication controller spec fields with new ones, mixed use-cases are now prevented

Author: pdecat

kubernetes/structures_replication_controller.go

@@ -1,7 +1,6 @@
 package kubernetes
 
 import (
-	"github.com/imdario/mergo"
 	"k8s.io/api/core/v1"
 )
 
@@ -70,24 +69,21 @@ func expandReplicationControllerTemplate(rct []interface{}, selector map[string]
 	}
 	obj.ObjectMeta = metadata
 
-	// Get pod spec from new fields
-	podSpec, err := expandPodSpec(in["spec"].([]interface{}))
-	if err != nil {
-		return obj, err
-	}
-
-	// Get pod spec from deprecated fields
-	podSpecDeprecated, err := expandPodSpec(rct)
-	if err != nil {
-		return obj, err
-	}
-
-	// Merge them overriding the new ones by the deprecated ones
-	if err := mergo.MergeWithOverwrite(&podSpec, podSpecDeprecated); err != nil {
-		return obj, err
+	if len(in["spec"].([]interface{})) > 0 {
+		// Get pod spec from new fields
+		podSpec, err := expandPodSpec(in["spec"].([]interface{}))
+		if err != nil {
+			return obj, err
+		}
+		obj.Spec = podSpec
+	} else {
+		// Get pod spec from deprecated fields
+		podSpecDeprecated, err := expandPodSpec(rct)
+		if err != nil {
+			return obj, err
+		}
+		obj.Spec = podSpecDeprecated
 	}
 
-	obj.Spec = podSpec
-
 	return obj, nil
 }