Making CA cert configmap non mandatory for proxy on NIMCache and NIMService

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

Author: visheshtanksale

api/apps/v1alpha1/nimcache_types.go

@@ -358,6 +358,14 @@ func (n *NIMCache) GetProxySpec() *ProxySpec {
 	return n.Spec.Proxy
 }
 
+// GetProxyCertConfigMap returns the cert config map for the NIMCache.
+func (n *NIMCache) GetProxyCertConfigMap() string {
+	if n.GetProxySpec() != nil && n.GetProxySpec().CertConfigMap != "" {
+		return n.GetProxySpec().CertConfigMap
+	}
+	return ""
+}
+
 func (n *NIMCache) GetEnvWithProxy() []corev1.EnvVar {
 	envVars := []corev1.EnvVar{
 		{

api/apps/v1alpha1/nimservice_types.go

@@ -497,7 +497,7 @@ func (n *NIMService) GetStandardAnnotations() map[string]string {
 		"openshift.io/required-scc":             "nonroot",
 		utils.NvidiaAnnotationParentSpecHashKey: utils.DeepHashObject(n.Spec),
 	}
-	if n.GetProxySpec() != nil {
+	if n.GetProxyCertConfigMap() != "" {
 		standardAnnotations["openshift.io/required-scc"] = "anyuid"
 	}
 	return standardAnnotations
@@ -730,8 +730,8 @@ func (n *NIMService) GetVolumes(modelPVC *PersistentVolumeClaim) []corev1.Volume
 		})
 	}
 
-	if n.GetProxySpec() != nil {
-		volumes = append(volumes, k8sutil.GetVolumesForUpdatingCaCert(n.Spec.Proxy.CertConfigMap)...)
+	if n.GetProxyCertConfigMap() != "" {
+		volumes = append(volumes, k8sutil.GetVolumesForUpdatingCaCert(n.GetProxySpec().CertConfigMap)...)
 	}
 	return volumes
 }
@@ -838,7 +838,7 @@ func (n *NIMService) GetVolumeMounts(modelPVC *PersistentVolumeClaim) []corev1.V
 		},
 	}
 
-	if n.GetProxySpec() != nil {
+	if n.GetProxyCertConfigMap() != "" {
 		volumeMounts = append(volumeMounts, k8sutil.GetVolumesMountsForUpdatingCaCert()...)
 	}
 	return volumeMounts
@@ -945,7 +945,7 @@ func (n *NIMService) GetDeploymentKind() string {
 
 // GetInitContainers returns the init containers for the NIMService deployment.
 func (n *NIMService) GetInitContainers() []corev1.Container {
-	if n.Spec.Proxy != nil {
+	if n.GetProxyCertConfigMap() != "" {
 		return []corev1.Container{
 			{
 				Name:            "update-ca-certificates",
@@ -1583,6 +1583,14 @@ func (n *NIMService) GetProxySpec() *ProxySpec {
 	return n.Spec.Proxy
 }
 
+// GetProxyCertConfigMap returns the cert config map for the NIMService deployment.
+func (n *NIMService) GetProxyCertConfigMap() string {
+	if n.GetProxySpec() != nil && n.GetProxySpec().CertConfigMap != "" {
+		return n.GetProxySpec().CertConfigMap
+	}
+	return ""
+}
+
 // GetInferenceServiceParams returns params to render InferenceService from templates.
 func (n *NIMService) GetInferenceServiceParams(
 	deploymentMode kserveconstants.DeploymentModeType) *rendertypes.InferenceServiceParams {