Add collector image and extra values overrides to test framework

ChartInstallOrUpgrade now reads OTELCOL_IMAGE_REPO, OTELCOL_IMAGE_TAG,
and HELM_EXTRA_SET env vars and merges them into the helm values before
install/upgrade, so any test suite can be run against an arbitrary
collector image without modifying values files.

The dev-image-test workflow uses these vars to inject the dev image
instead of patching values.yaml with yq.

Author: akhileshsingh85

.github/workflows/dev-image-test.yaml

@@ -24,32 +24,8 @@ permissions:
 env:
   GO_VERSION: 1.26.2
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
-  COLLECTOR_IMAGE: ${{ github.event.inputs.collector_image || 'quay.io/signalfx/splunk-otel-collector-dev:latest' }}
 
 jobs:
-  # ── Step 1: patch values.yaml with the dev image ───────────────────────────
-  set-image:
-    runs-on: ubuntu-latest
-    outputs:
-      image_repository: ${{ steps.parse.outputs.image_repository }}
-      image_tag: ${{ steps.parse.outputs.image_tag }}
-    steps:
-      - name: Parse image into repository and tag
-        id: parse
-        run: |
-          IMAGE="${COLLECTOR_IMAGE}"
-          # Split on the last colon to separate repo from tag
-          IMAGE_REPOSITORY="${IMAGE%:*}"
-          IMAGE_TAG="${IMAGE##*:}"
-          # If no colon was found (no tag), treat the whole string as repo with latest tag
-          if [[ "$IMAGE_REPOSITORY" == "$IMAGE_TAG" ]]; then
-            IMAGE_TAG="latest"
-          fi
-          echo "image_repository=${IMAGE_REPOSITORY}" >> "$GITHUB_OUTPUT"
-          echo "image_tag=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
-          echo "Using repository=${IMAGE_REPOSITORY} tag=${IMAGE_TAG}"
-
-  # ── Step 2: functional tests (kind) ────────────────────────────────────────
   get-test-matrix:
     runs-on: ubuntu-latest
     steps:
@@ -65,7 +41,7 @@ jobs:
   functional-test:
     name: K8s ${{ matrix.k8s-kind-version }} / ${{ matrix.test-job }}
     runs-on: ubuntu-latest
-    needs: [set-image, get-test-matrix]
+    needs: get-test-matrix
     env:
       KUBECONFIG: /tmp/kube-config-splunk-otel-collector-chart-functional-testing
       KUBE_TEST_ENV: kind
@@ -80,10 +56,11 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: '**/go.sum'
 
-      - name: Update chart image to dev image
+      - name: Set collector image overrides
         run: |
-          yq e '.image.otelcol.repository = "${{ needs.set-image.outputs.image_repository }}"' -i helm-charts/splunk-otel-collector/values.yaml
-          yq e '.image.otelcol.tag = "${{ needs.set-image.outputs.image_tag }}"' -i helm-charts/splunk-otel-collector/values.yaml
+          IMAGE="${{ github.event.inputs.collector_image || 'quay.io/signalfx/splunk-otel-collector-dev:latest' }}"
+          echo "OTELCOL_IMAGE_REPO=${IMAGE%:*}" >> "$GITHUB_ENV"
+          echo "OTELCOL_IMAGE_TAG=${IMAGE##*:}" >> "$GITHUB_ENV"
 
       - name: Create kind cluster
         uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0

functional_tests/internal/chart.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"testing"
 	"text/template"
 	"time"
@@ -21,6 +22,7 @@ import (
 	"helm.sh/helm/v4/pkg/chart/loader"
 	"helm.sh/helm/v4/pkg/kube"
 	releasev1 "helm.sh/helm/v4/pkg/release/v1"
+	"helm.sh/helm/v4/pkg/strvals"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -69,6 +71,7 @@ func ChartInstallOrUpgrade(t *testing.T, testKubeConfig string, valuesFile strin
 	var values map[string]any
 	err = yaml.Unmarshal(buf.Bytes(), &values)
 	require.NoError(t, err)
+	applyEnvOverrides(t, values)
 
 	actionConfig := InitHelmActionConfig(t, testKubeConfig)
 	install := action.NewInstall(actionConfig)
@@ -128,6 +131,34 @@ func ChartInstallOrUpgrade(t *testing.T, testKubeConfig string, valuesFile strin
 	CheckPodsReady(t, clientset, options.ChartNamespace, labelSelector, options.ChartTimeout, minReadyTime)
 }
 
+// applyEnvOverrides merges environment-driven value overrides into the helm values map.
+//
+// Supported env vars:
+//
+//	OTELCOL_IMAGE_REPO  - overrides image.otelcol.repository
+//	OTELCOL_IMAGE_TAG   - overrides image.otelcol.tag
+//	HELM_EXTRA_SET      - comma-separated key=value pairs, applied last (same syntax as helm --set)
+func applyEnvOverrides(t *testing.T, values map[string]any) {
+	if repo := os.Getenv("OTELCOL_IMAGE_REPO"); repo != "" {
+		t.Logf("OTELCOL_IMAGE_REPO override: image.otelcol.repository=%s", repo)
+		require.NoError(t, strvals.ParseInto("image.otelcol.repository="+repo, values))
+	}
+	if tag := os.Getenv("OTELCOL_IMAGE_TAG"); tag != "" {
+		t.Logf("OTELCOL_IMAGE_TAG override: image.otelcol.tag=%s", tag)
+		require.NoError(t, strvals.ParseInto("image.otelcol.tag="+tag, values))
+	}
+	if extra := os.Getenv("HELM_EXTRA_SET"); extra != "" {
+		for pair := range strings.SplitSeq(extra, ",") {
+			pair = strings.TrimSpace(pair)
+			if pair == "" {
+				continue
+			}
+			t.Logf("HELM_EXTRA_SET override: %s", pair)
+			require.NoError(t, strvals.ParseInto(pair, values))
+		}
+	}
+}
+
 func getKubeClient(kubeConfig string) (*kubernetes.Clientset, error) {
 	config, err := clientcmd.BuildConfigFromFlags("", kubeConfig)
 	if err != nil {