优化env和volumemout的merge

Author: LittleBoy18

pkg/util/merge/merge.go

@@ -284,31 +284,31 @@ func mergeVolumeDevice(original, override corev1.VolumeDevice) corev1.VolumeDevi
 // identifier.
 func Envs(original, override []corev1.EnvVar) []corev1.EnvVar {
 
-	mergedEnvsMap := map[string]corev1.EnvVar{}
-
 	originalMap := createEnvMap(original)
 	overrideMap := createEnvMap(override)
+	var mergedEnvs []corev1.EnvVar
 
-	for k, v := range originalMap {
-		mergedEnvsMap[k] = v
+	for _, orig := range original {
+		if v, ok := overrideMap[orig.Name]; ok {
+			if v.Value != "" {
+				orig.Value = v.Value
+			}
+			if v.ValueFrom != nil {
+				orig.ValueFrom = v.ValueFrom
+			}
+		}
+		mergedEnvs = append(mergedEnvs, orig)
 	}
-
-	for k, v := range overrideMap {
-		if orig, ok := originalMap[k]; ok {
-			mergedEnvsMap[k] = mergeSingleEnv(orig, v)
-		} else {
-			mergedEnvsMap[k] = v
+	var newEnvNames []string
+	for k, _ := range overrideMap {
+		if _, ok := originalMap[k]; !ok {
+			newEnvNames = append(newEnvNames, k)
 		}
 	}
-
-	var mergedEnvs []corev1.EnvVar
-	for _, v := range mergedEnvsMap {
-		mergedEnvs = append(mergedEnvs, v)
+	sort.Strings(newEnvNames)
+	for _, envName := range newEnvNames {
+		mergedEnvs = append(mergedEnvs, overrideMap[envName])
 	}
-
-	sort.SliceStable(mergedEnvs, func(i, j int) bool {
-		return mergedEnvs[i].Name < mergedEnvs[j].Name
-	})
 	return mergedEnvs
 }
 
@@ -411,7 +411,7 @@ func createContainerPortMap(containerPorts []corev1.ContainerPort) map[string]co
 func VolumeMounts(original, override []corev1.VolumeMount) []corev1.VolumeMount {
 
 	overrideMap := createVolumeMountMap(override)
-
+	originalMap := createVolumeMountMap(original)
 	var mergedMounts []corev1.VolumeMount
 
 	for _, orig := range original {
@@ -426,6 +426,17 @@ func VolumeMounts(original, override []corev1.VolumeMount) []corev1.VolumeMount
 		mergedMounts = append(mergedMounts, orig)
 	}
 
+	var newVolumeMounts []string
+	for k, _ := range overrideMap {
+		if _, ok := originalMap[k]; !ok {
+			newVolumeMounts = append(newVolumeMounts, k)
+		}
+	}
+	sort.Strings(newVolumeMounts)
+	for _, volumeMount := range newVolumeMounts {
+		mergedMounts = append(mergedMounts, overrideMap[volumeMount])
+	}
+
 	return mergedMounts
 }