set ingress endpoints in status when available

Signed-off-by: Varun Ramachandra Sekar <vsekar@nvidia.com>

Author: varunrsekar

api/apps/v1alpha1/nimservice_types.go

@@ -87,12 +87,6 @@ type NIMCacheVolSpec struct {
 	Profile string `json:"profile,omitempty"`
 }
 
-type ModelEngine string
-
-const (
-	ModelEngineNIM ModelEngine = "nim"
-)
-
 // NIMServiceStatus defines the observed state of NIMService
 type NIMServiceStatus struct {
 	Conditions        []metav1.Condition `json:"conditions,omitempty"`
@@ -103,10 +97,9 @@ type NIMServiceStatus struct {
 
 // ModelStatus defines the configuration of the NIMService model.
 type ModelStatus struct {
-	Name             string      `json:"name"`
-	ClusterEndpoint  string      `json:"clusterEndpoint"`
-	ExternalEndpoint string      `json:"externalEndpoint"`
-	Engine           ModelEngine `json:"engine"`
+	Name             string `json:"name"`
+	ClusterEndpoint  string `json:"clusterEndpoint"`
+	ExternalEndpoint string `json:"externalEndpoint"`
 }
 
 // +genclient

bundle/manifests/apps.nvidia.com_nimservices.yaml

@@ -2290,15 +2290,12 @@ spec:
                 properties:
                   clusterEndpoint:
                     type: string
-                  engine:
-                    type: string
                   externalEndpoint:
                     type: string
                   name:
                     type: string
                 required:
                 - clusterEndpoint
-                - engine
                 - externalEndpoint
                 - name
                 type: object

config/crd/bases/apps.nvidia.com_nimservices.yaml

@@ -2290,15 +2290,12 @@ spec:
                 properties:
                   clusterEndpoint:
                     type: string
-                  engine:
-                    type: string
                   externalEndpoint:
                     type: string
                   name:
                     type: string
                 required:
                 - clusterEndpoint
-                - engine
                 - externalEndpoint
                 - name
                 type: object

deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimservices.yaml

@@ -2290,15 +2290,12 @@ spec:
                 properties:
                   clusterEndpoint:
                     type: string
-                  engine:
-                    type: string
                   externalEndpoint:
                     type: string
                   name:
                     type: string
                 required:
                 - clusterEndpoint
-                - engine
                 - externalEndpoint
                 - name
                 type: object

internal/controller/platform/standalone/nimservice.go

@@ -296,7 +296,6 @@ func (r *NIMServiceReconciler) updateModelStatus(ctx context.Context, nimService
 		Name:             modelName,
 		ClusterEndpoint:  clusterEndpoint,
 		ExternalEndpoint: externalEndpoint,
-		Engine:           v1alpha1.ModelEngineNIM,
 	}
 
 	return nil
@@ -333,12 +332,36 @@ func (r *NIMServiceReconciler) getNIMModelEndpoints(ctx context.Context, nimServ
 		return "", "", err
 	}
 
-	var externalIP string
-	if svc.Spec.Type == corev1.ServiceTypeLoadBalancer {
-		externalIP = svc.Spec.LoadBalancerIP
-	}
+	var externalEndpoint string
 	port := nimService.GetServicePort()
-	return utils.FormatEndpoint(svc.Spec.ClusterIP, port), utils.FormatEndpoint(externalIP, port), nil
+	if nimService.IsIngressEnabled() {
+		ingress := &networkingv1.Ingress{}
+		if err := r.Get(ctx, types.NamespacedName{Name: nimService.GetName(), Namespace: nimService.GetNamespace()}, ingress); err != nil {
+			logger.Error(err, "unable to fetch ingress", "nimservice", nimService.GetName())
+			return "", "", err
+		}
+
+		var found bool
+		for _, rule := range ingress.Spec.Rules {
+			if rule.HTTP == nil {
+				continue
+			}
+			for _, path := range rule.HTTP.Paths {
+				if path.Backend.Service != nil && path.Backend.Service.Name == nimService.GetName() {
+					externalEndpoint = rule.Host
+					found = true
+					break
+				}
+			}
+			if found {
+				break
+			}
+		}
+	} else if svc.Spec.Type == corev1.ServiceTypeLoadBalancer {
+		externalEndpoint = utils.FormatEndpoint(svc.Spec.LoadBalancerIP, port)
+	}
+
+	return utils.FormatEndpoint(svc.Spec.ClusterIP, port), externalEndpoint, nil
 }
 
 func (r *NIMServiceReconciler) renderAndSyncResource(ctx context.Context, nimService *appsv1alpha1.NIMService, renderer *render.Renderer, obj client.Object, renderFunc func() (client.Object, error), conditionType string, reason string) error {

internal/controller/platform/standalone/nimservice_test.go

@@ -707,6 +707,16 @@ var _ = Describe("NIMServiceReconciler for a standalone platform", func() {
 	})
 
 	Describe("update model status on NIMService", func() {
+		BeforeEach(func() {
+			ingress := &networkingv1.Ingress{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-nimservice",
+					Namespace: "default",
+				},
+				Spec: nimService.GetIngressSpec(),
+			}
+			_ = client.Create(context.TODO(), ingress)
+		})
 		AfterEach(func() {
 			// Clean up the Service instance
 			svc := &corev1.Service{
@@ -822,8 +832,8 @@ var _ = Describe("NIMServiceReconciler for a standalone platform", func() {
 			modelStatus := nimService.Status.Model
 			Expect(modelStatus).ToNot(BeNil())
 			Expect(modelStatus.ClusterEndpoint).To(Equal("127.0.0.1:8123"))
+			Expect(modelStatus.ExternalEndpoint).To(Equal("test-nimservice.default.example.com"))
 			Expect(modelStatus.Name).To(Equal("dummy-model"))
-			Expect(modelStatus.Engine).To(Equal(appsv1alpha1.ModelEngineNIM))
 		})
 
 		It("should succeed when nimservice has lora adapter models attached", func() {
@@ -855,8 +865,8 @@ var _ = Describe("NIMServiceReconciler for a standalone platform", func() {
 			modelStatus := nimService.Status.Model
 			Expect(modelStatus).ToNot(BeNil())
 			Expect(modelStatus.ClusterEndpoint).To(Equal("127.0.0.1:8123"))
+			Expect(modelStatus.ExternalEndpoint).To(Equal("test-nimservice.default.example.com"))
 			Expect(modelStatus.Name).To(Equal("dummy-model"))
-			Expect(modelStatus.Engine).To(Equal(appsv1alpha1.ModelEngineNIM))
 		})
 
 	})