Fix cleaning up helm values before install / upgrade (#1834)

* Fix cleaning up helm values before install / upgrade

* feedback

Author: sgalsaleh

pkg/addons/adminconsole/static/values.tpl.yaml

@@ -7,7 +7,6 @@ images:
 {{- end }}
 isHA: false
 isHelmManaged: false
-isEC2Install: true
 kurlProxy:
     enabled: true
     nodePort: 30000

pkg/helm/client.go

@@ -545,6 +545,10 @@ func cleanUpMapValue(v interface{}) interface{} {
 	switch v := v.(type) {
 	case []interface{}:
 		return cleanUpInterfaceArray(v)
+	case []map[string]interface{}:
+		return cleanUpGenericMapArray(v)
+	case []map[interface{}]interface{}:
+		return cleanUpInterfaceMapArray(v)
 	case map[string]interface{}:
 		return cleanUpGenericMap(v)
 	case map[interface{}]interface{}:
@@ -571,6 +575,24 @@ func cleanUpInterfaceArray(in []interface{}) []interface{} {
 	return result
 }
 
+// Cleans up a slice of map to interface into slice of actual values
+func cleanUpGenericMapArray(in []map[string]interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(in))
+	for i, v := range in {
+		result[i] = cleanUpGenericMap(v)
+	}
+	return result
+}
+
+// Cleans up a slice of map to interface into slice of actual values
+func cleanUpInterfaceMapArray(in []map[interface{}]interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(in))
+	for i, v := range in {
+		result[i] = cleanUpInterfaceMap(v)
+	}
+	return result
+}
+
 // Cleans up the map keys to be strings
 func cleanUpInterfaceMap(in map[interface{}]interface{}) map[string]interface{} {
 	result := make(map[string]interface{})

pkg/helm/client_test.go

@@ -1,8 +1,9 @@
 package helm
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func Test_cleanUpGenericMap(t *testing.T) {
@@ -82,6 +83,68 @@ func Test_cleanUpGenericMap(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "nested map, generic map array keys",
+			in: map[string]interface{}{
+				"nest": map[interface{}]interface{}{
+					"abc":    "xyz",
+					"number": 5,
+					"float":  1.5,
+					"bool":   true,
+					"array": []map[string]interface{}{
+						{
+							"name":  "example",
+							"value": "true",
+						},
+					},
+				},
+			},
+			want: map[string]interface{}{
+				"nest": map[string]interface{}{
+					"abc":    "xyz",
+					"number": 5,
+					"float":  1.5,
+					"bool":   true,
+					"array": []map[string]interface{}{
+						{
+							"name":  "example",
+							"value": "true",
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "nested map, interface map array keys",
+			in: map[string]interface{}{
+				"nest": map[interface{}]interface{}{
+					"abc":    "xyz",
+					"number": 5,
+					"float":  1.5,
+					"bool":   true,
+					"array": []map[interface{}]interface{}{
+						{
+							"name":  "example",
+							"value": "true",
+						},
+					},
+				},
+			},
+			want: map[string]interface{}{
+				"nest": map[string]interface{}{
+					"abc":    "xyz",
+					"number": 5,
+					"float":  1.5,
+					"bool":   true,
+					"array": []map[string]interface{}{
+						{
+							"name":  "example",
+							"value": "true",
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {