Use pointer types to avoid mising hfSecret fields to be deserialized as empty strings

Signed-off-by: Shiva Krishna, Merla <[email protected]>

Author: shivamerla

api/apps/v1alpha1/nemo_customizer_types.go

@@ -192,10 +192,10 @@ type ModelDownloadJobsConfig struct {
 	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
 
 	// NGCSecret is the secret containing the NGC API key
-	NGCSecret NGCSecret `json:"ngcAPISecret,omitempty"`
+	NGCSecret *NGCSecret `json:"ngcAPISecret,omitempty"`
 
 	// HFSecret is the secret containing the HF_TOKEN key
-	HFSecret HFSecret `json:"hfSecret,omitempty"`
+	HFSecret *HFSecret `json:"hfSecret,omitempty"`
 
 	// Optional security context for the job pods
 	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`

internal/controller/nemocustomizer_controller.go

@@ -561,27 +561,31 @@ func (r *NemoCustomizerReconciler) addModelDownloadJobsConfig(ctx context.Contex
 		pullSecrets = append(pullSecrets, map[string]string{"name": secret})
 	}
 
-	cfg["model_download_jobs"] = map[string]interface{}{
+	modelDownloadJobsCfg := map[string]interface{}{
 		"image":                   n.Spec.ModelDownloadJobs.Image,
 		"imagePullPolicy":         n.Spec.Image.PullPolicy,
 		"imagePullSecrets":        pullSecrets,
-		"ngcAPISecret":            n.Spec.ModelDownloadJobs.NGCSecret.Name,
-		"ngcAPISecretKey":         n.Spec.ModelDownloadJobs.NGCSecret.Key,
-		"ngcSecretName":           n.Spec.ModelDownloadJobs.NGCSecret.Name,
-		"ngcSecretKey":            n.Spec.ModelDownloadJobs.NGCSecret.Key,
 		"securityContext":         n.Spec.ModelDownloadJobs.SecurityContext,
 		"ttlSecondsAfterFinished": n.Spec.ModelDownloadJobs.TTLSecondsAfterFinished,
 		"pollIntervalSeconds":     n.Spec.ModelDownloadJobs.PollIntervalSeconds,
 	}
 
-	// add HF secret only if present
-	if n.Spec.ModelDownloadJobs.HFSecret.Name != "" {
-		if modelDownloadJobs, ok := cfg["model_download_jobs"].(map[string]interface{}); ok {
-			modelDownloadJobs["hfSecretName"] = n.Spec.ModelDownloadJobs.HFSecret.Name
-			modelDownloadJobs["hfSecretKey"] = n.Spec.ModelDownloadJobs.HFSecret.Key
-		}
+	// add NGC secret if present
+	if n.Spec.ModelDownloadJobs.NGCSecret != nil {
+		modelDownloadJobsCfg["ngcAPISecret"] = n.Spec.ModelDownloadJobs.NGCSecret.Name
+		modelDownloadJobsCfg["ngcAPISecretKey"] = n.Spec.ModelDownloadJobs.NGCSecret.Key
+		modelDownloadJobsCfg["ngcSecretName"] = n.Spec.ModelDownloadJobs.NGCSecret.Name
+		modelDownloadJobsCfg["ngcSecretKey"] = n.Spec.ModelDownloadJobs.NGCSecret.Key
+	}
+
+	// add HF secret if present
+	if n.Spec.ModelDownloadJobs.HFSecret != nil && n.Spec.ModelDownloadJobs.HFSecret.Name != "" {
+		modelDownloadJobsCfg["hfSecretName"] = n.Spec.ModelDownloadJobs.HFSecret.Name
+		modelDownloadJobsCfg["hfSecretKey"] = n.Spec.ModelDownloadJobs.HFSecret.Key
 	}
 
+	cfg["model_download_jobs"] = modelDownloadJobsCfg
+
 	return nil
 }
 

internal/controller/nemocustomizer_controller_test.go

@@ -140,7 +140,7 @@ var _ = Describe("NemoCustomizer Controller", func() {
 				ModelDownloadJobs: &appsv1alpha1.ModelDownloadJobsConfig{
 					Image:           "nvcr.io/nvidia/nemo-microservices/customizer-api:25.04",
 					ImagePullPolicy: "IfNotPresent",
-					NGCSecret:       appsv1alpha1.NGCSecret{Name: "ngc-api-secret"},
+					NGCSecret:       &appsv1alpha1.NGCSecret{Name: "ngc-api-secret"},
 					SecurityContext: &corev1.PodSecurityContext{
 						FSGroup:      ptr.To[int64](1000),
 						RunAsNonRoot: ptr.To[bool](true),