fix(compute-stack): inherit collector image repository

Author: mikeyrcamp

deploy/stacks/nvcf-compute-plane/helmfile.d/02-nvca.yaml.gotmpl

@@ -91,6 +91,8 @@ helmDefaults:
 {{- $selfManaged := dig "selfManaged" dict $nvcaOp }}
 {{- $otelCollector := dig "otelCollector" dict $selfManaged }}
 {{- $otelCollectorEnabled := dig "enabled" $computeObservabilityEnabled $otelCollector }}
+{{- $defaultOTelCollectorImageRepository := printf "%s/%s/nvcf-otel-collector" .Values.global.image.registry .Values.global.image.repository }}
+{{- $otelCollectorImageRepository := dig "imageRepository" $defaultOTelCollectorImageRepository $otelCollector }}
 
 {{- $featureGateValues := dig "featureGateValues" list $selfManaged }}
 {{- $kaiSchedulerEnabled := dig "addons" "kaiScheduler" "enabled" false .Values }}
@@ -224,9 +226,7 @@ releases:
                 "dynamoOperatorEnabled" $dynamoOperatorEnabled) | nindent 10 }}
           otelCollector:
             enabled: {{ $otelCollectorEnabled }}
-            {{- with dig "imageRepository" "" $otelCollector }}
-            imageRepository: {{ . | quote }}
-            {{- end }}
+            imageRepository: {{ $otelCollectorImageRepository | quote }}
             {{- with dig "imageTag" "" $otelCollector }}
             imageTag: {{ . | quote }}
             {{- end }}

deploy/stacks/nvcf-compute-plane/tests/observability-profile.sh

@@ -57,6 +57,14 @@ collector_image_tag() {
   ' "$1"
 }
 
+collector_image_repository() {
+  awk '
+    /^selfManaged:$/ { self_managed = 1; next }
+    self_managed && /^  otelCollector:$/ { collector = 1; next }
+    collector && /^    imageRepository:/ { gsub(/"/, "", $2); print $2; exit }
+  ' "$1"
+}
+
 operator_image_tag() {
   awk '
     /^image:$/ { image = 1; next }
@@ -93,6 +101,14 @@ test "$(operator_image_tag "$work_dir/default.yaml")" = "$expected_nvca_version"
 test "$(nvca_version "$work_dir/default.yaml")" = "$expected_nvca_version" ||
   fail "default NVCA version is not $expected_nvca_version"
 
+render_values compute "$work_dir/ncp-dev-default.yaml" \
+  --state-values-set-string global.image.registry=nvcr.io \
+  --state-values-set-string global.image.repository=0651155215864979/ncp-dev
+
+test "$(collector_image_repository "$work_dir/ncp-dev-default.yaml")" = \
+  "nvcr.io/0651155215864979/ncp-dev/nvcf-otel-collector" ||
+  fail "collector image repository did not inherit the global image repository"
+
 render_values compute "$work_dir/compute-overrides.yaml" \
   --state-values-set-string global.nvcaOperator.imageTag=operator-test-tag \
   --state-values-set-string global.nvcaOperator.selfManaged.nvcaVersion=nvca-test-tag \