expand environmentt variables in the yaml

Signed-off-by: Shawn O'Dell <[email protected]>

pkg/test/utils/kubernetes.go

@@ -508,15 +508,16 @@ func LoadYAML(path string, r io.Reader) ([]client.Object, error) {
 			return nil, fmt.Errorf("error reading yaml %s: %w", path, err)
 		}
 
+		// replace all variables from the environment
+		data = []byte(os.ExpandEnv(string(data)))
+
 		unstructuredObj := &unstructured.Unstructured{}
 		decoder := yaml.NewYAMLOrJSONDecoder(bytes.NewBuffer(data), len(data))
 
 		if err = decoder.Decode(unstructuredObj); err != nil {
 			return nil, fmt.Errorf("error decoding yaml %s: %w", path, err)
 		}
 
-		unstructuredObj.Object = Translate(unstructuredObj.Object).(map[string]interface{})
-
 		obj, err := ConvertUnstructured(unstructuredObj)
 		if err != nil {
 			return nil, fmt.Errorf("error converting unstructured object %s (%s): %w", ResourceID(unstructuredObj), path, err)

pkg/test/utils/kubernetes_test.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"os"
+	"strconv"
 	"testing"
 	"time"
 
@@ -182,6 +183,11 @@ spec:
   containers:
   - name: nginx
     image: nginx:1.7.9
+  - name: app
+    image: app:$APP_VERSION
+    resources:
+      requests:
+        cpu: ${CPU_COUNT}
 ---
 apiVersion: v1
 kind: Pod
@@ -198,6 +204,13 @@ spec:
 		t.Fatal(err)
 	}
 
+	appVersion := "0.0.1-alpha"
+	t.Setenv("APP_VERSION", appVersion)
+	// test replacing a different type (int64 in this case)
+	// and nested values
+	cpuCount := int64(2)
+	t.Setenv("CPU_COUNT", strconv.Itoa(int(cpuCount)))
+
 	objs, err := LoadYAMLFromFile(tmpfile.Name())
 	assert.Nil(t, err)
 
@@ -216,6 +229,15 @@ spec:
 						"image": "nginx:1.7.9",
 						"name":  "nginx",
 					},
+					map[string]interface{}{
+						"name":  "app",
+						"image": "app:" + appVersion,
+						"resources": map[string]interface{}{
+							"requests": map[string]interface{}{
+								"cpu": cpuCount,
+							},
+						},
+					},
 				},
 			},
 		},