From b89f5b557059360a175af9d11a6feced85675659 Mon Sep 17 00:00:00 2001
From: Anand Parthasarathi <aparthasarat@nvidia.com>
Date: Mon, 14 Sep 2026 11:55:05 +0530
Subject: [PATCH] fix(nvca-operator): guard selfManaged nil on --reuse-values
 upgrade

When upgrading with --reuse-values from an install that did not have
selfManaged keys in its stored values, .Values.selfManaged is nil.
Accessing .Values.selfManaged.imageCredHelper then panics with
'nil pointer evaluating interface{}' before the | default dict pipe
can apply.

Introduce a $selfManaged local that applies | default dict at the
map level, making the imageCredHelper and sharedStorage lookups safe
regardless of whether selfManaged was present in the old install.
---
 .../nvca-operator/templates/self-managed-nvcfbackend-cm.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/helm/nvca-operator/nvca-operator/templates/self-managed-nvcfbackend-cm.yaml b/deploy/helm/nvca-operator/nvca-operator/templates/self-managed-nvcfbackend-cm.yaml
index 368cfc1295..a9cd948442 100644
--- a/deploy/helm/nvca-operator/nvca-operator/templates/self-managed-nvcfbackend-cm.yaml
+++ b/deploy/helm/nvca-operator/nvca-operator/templates/self-managed-nvcfbackend-cm.yaml
@@ -18,8 +18,9 @@ metadata:
   name: nvcfbackend-self-managed
   namespace: {{ .Release.Namespace }}
   {{- $releaseArtifactNvcaImageRepository := .Values.nvcaImage.repositoryOverride }}
-  {{- $releaseArtifactImageCredentialHelperRepository := (.Values.selfManaged.imageCredHelper | default dict).imageRepository }}
-  {{- $releaseArtifactSambaRepository := (.Values.selfManaged.sharedStorage | default dict).imageRepository }}
+  {{- $selfManaged := .Values.selfManaged | default dict }}
+  {{- $releaseArtifactImageCredentialHelperRepository := ($selfManaged.imageCredHelper | default dict).imageRepository }}
+  {{- $releaseArtifactSambaRepository := ($selfManaged.sharedStorage | default dict).imageRepository }}
   {{- if or $releaseArtifactNvcaImageRepository $releaseArtifactImageCredentialHelperRepository $releaseArtifactSambaRepository }}
   annotations:
     {{- if $releaseArtifactNvcaImageRepository }}