Addressing review comments

Signed-off-by: Vishesh Tanksale <[email protected]>

Author: visheshtanksale

api/apps/v1alpha1/common_types.go

@@ -36,6 +36,10 @@ const (
 	DefaultNamedPortGRPC = "grpc"
 	// DefaultNamedPortMetrics is the default name for metrics port.
 	DefaultNamedPortMetrics = "metrics"
+	// NGCAPIKey is the environment variable name for NGC API key.
+	NGCAPIKey = "NGC_API_KEY"
+	// HFToken is the environment variable name for Hugging Face token.
+	HFToken = "HF_TOKEN"
 )
 
 // Expose defines attributes to expose the service.

api/apps/v1alpha1/nimcache_types.go

@@ -332,7 +332,7 @@ func (n *NIMCache) IsUniversalNIM() bool {
 }
 
 // IsHFMultiLLM returns true if the NIMCache is for a Hugging Face Multi-LLM NIM.
-func (n *NIMCache) IsHFMultiLLM() bool {
+func (n *NIMCache) IsHFModel() bool {
 	return n.Spec.Source.HF != nil
 }
 

api/apps/v1alpha1/nimservice_types.go

@@ -284,13 +284,13 @@ func (n *NIMService) GetStandardEnv() []corev1.EnvVar {
 			Value: utils.DefaultModelStorePath,
 		},
 		{
-			Name: "NGC_API_KEY",
+			Name: NGCAPIKey,
 			ValueFrom: &corev1.EnvVarSource{
 				SecretKeyRef: &corev1.SecretKeySelector{
 					LocalObjectReference: corev1.LocalObjectReference{
 						Name: n.Spec.AuthSecret,
 					},
-					Key: "NGC_API_KEY",
+					Key: NGCAPIKey,
 				},
 			},
 		},
@@ -984,7 +984,7 @@ func (n *NIMService) IsHTTPRouteEnabled() bool {
 	return n.Spec.Router.Gateway != nil && n.Spec.Router.Gateway.HTTPRoutesEnabled
 }
 
-func (n *NIMService) IsHFMultiLLM() bool {
+func (n *NIMService) IsHFModel() bool {
 	env := utils.FindEnvByValue(n.GetEnv(), "NIM_MODEL_NAME")
 	if env != nil {
 		if strings.HasPrefix(env.Value, "hf://") {

internal/controller/nimbuild_controller.go

@@ -642,13 +642,13 @@ func (r *NIMBuildReconciler) constructEngineBuildPod(nimBuild *appsv1alpha1.NIMB
 					Value: inputNimProfile.Name,
 				},
 				{
-					Name: "NGC_API_KEY",
+					Name: appsv1alpha1.NGCAPIKey,
 					ValueFrom: &corev1.EnvVarSource{
 						SecretKeyRef: &corev1.SecretKeySelector{
 							LocalObjectReference: corev1.LocalObjectReference{
 								Name: nimCache.Spec.Source.NGC.AuthSecret,
 							},
-							Key: "NGC_API_KEY",
+							Key: appsv1alpha1.NGCAPIKey,
 						},
 					},
 				},

internal/controller/platform/kserve/nimservice.go

@@ -478,17 +478,17 @@ func (r *NIMServiceReconciler) renderAndSyncInferenceService(ctx context.Context
 		}, isvcParams.Env)
 	}
 	// If NIMCache or NIMService is a Hugging Face Multi-LLM NIM, add the HF_TOKEN to the environment variables
-	if nimCache.IsHFMultiLLM() || nimService.IsHFMultiLLM() {
-		isvcParams.Env = utils.RemoveEnvVar(isvcParams.Env, "NGC_API_KEY")
+	if nimCache.IsHFModel() || nimService.IsHFModel() {
+		isvcParams.Env = utils.RemoveEnvVar(isvcParams.Env, appsv1alpha1.NGCAPIKey)
 		isvcParams.Env = utils.MergeEnvVars(isvcParams.Env, []corev1.EnvVar{
 			{
-				Name: "HF_TOKEN",
+				Name: appsv1alpha1.HFToken,
 				ValueFrom: &corev1.EnvVarSource{
 					SecretKeyRef: &corev1.SecretKeySelector{
 						LocalObjectReference: corev1.LocalObjectReference{
 							Name: nimService.Spec.AuthSecret,
 						},
-						Key: "HF_TOKEN",
+						Key: appsv1alpha1.HFToken,
 					},
 				},
 			},