Cleanup service params

Signed-off-by: Shiva Krishna, Merla <smerla@nvidia.com>

Author: shivamerla

api/apps/v1alpha1/common_types.go

@@ -28,8 +28,6 @@ const (
 	DefaultAPIPort = 8000
 	// DefaultNamedPortAPI is the default name for api port
 	DefaultNamedPortAPI = "api"
-	// DefaultNamedPortMetrics is the default name for metrics port
-	DefaultNamedPortMetrics = "metrics"
 )
 
 // Expose defines attributes to expose the service

api/apps/v1alpha1/nemo_entitystore_types.go

@@ -38,7 +38,7 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 const (
-	// EntitystoreAPIPort is the default port that the entittystore serves on
+	// EntitystoreAPIPort is the default port that the entitystore serves on
 	EntitystoreAPIPort = 8000
 	// NemoEntitystoreConditionReady indicates that the NEMO EntitystoreService is ready.
 	NemoEntitystoreConditionReady = "Ready"

api/apps/v1alpha1/nemo_evaluator_types.go

@@ -709,7 +709,7 @@ func (n *NemoEvaluator) GetServiceParams() *rendertypes.ServiceParams {
 	params.SelectorLabels = n.GetSelectorLabels()
 
 	// Set service type
-	params.Type = "ClusterIP"
+	params.Type = n.GetServiceType()
 
 	// Set service ports
 	params.Ports = []corev1.ServicePort{

api/apps/v1alpha1/nimservice_types.go

@@ -783,6 +783,7 @@ func (n *NIMService) GetServiceMonitorParams() *rendertypes.ServiceMonitorParams
 		Selector:          metav1.LabelSelector{MatchLabels: n.GetServiceLabels()},
 		Endpoints: []monitoringv1.Endpoint{
 			{
+				Path:          "/v1/metrics",
 				Port:          DefaultNamedPortAPI,
 				ScrapeTimeout: serviceMonitor.ScrapeTimeout,
 				Interval:      serviceMonitor.Interval,

internal/render/render_test.go

@@ -28,6 +28,7 @@ import (
 	v1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"github.com/NVIDIA/k8s-nim-operator/internal/render"
 	"github.com/NVIDIA/k8s-nim-operator/internal/render/types"
@@ -250,11 +251,13 @@ var _ = Describe("K8s Resources Rendering", func() {
 
 		It("should render Service template correctly", func() {
 			params := types.ServiceParams{
-				Name:       "test-service",
-				Namespace:  "default",
-				Port:       80,
-				TargetPort: 8080,
-				Type:       "ClusterIP",
+				Name:      "test-service",
+				Namespace: "default",
+				Ports: []corev1.ServicePort{{
+					Port:       80,
+					TargetPort: intstr.FromInt(8080),
+				}},
+				Type: "ClusterIP",
 			}
 			r := render.NewRenderer(templatesDir)
 			service, err := r.Service(&params)

internal/render/types/types.go

@@ -119,12 +119,8 @@ type StatefulSetParams struct {
 
 // ServiceParams holds the parameters for rendering a Service template
 type ServiceParams struct {
-	Name       string
-	Namespace  string
-	Port       int32
-	TargetPort int32
-	PortName   string
-	Protocol   string
+	Name      string
+	Namespace string
 	// Defines multiple ports for the service
 	Ports          []corev1.ServicePort
 	Type           string

manifests/service.yaml

@@ -18,21 +18,10 @@ spec:
     {{- .SelectorLabels | yaml | nindent 4 }}
   {{- end }}
   ports:
-    {{- if .Ports }}
-      {{- range .Ports }}
+    {{- range .Ports }}
     - port: {{ .Port }}
       targetPort: {{ .TargetPort }}
       protocol: {{ .Protocol | default "TCP" }}
       name: {{ .Name }}
-      {{- end }}
-    {{- else if .Port }}
-    - port: {{ .Port }}
-      {{- if .TargetPort }}
-      targetPort: {{ .TargetPort }}
-      {{- end }}
-      protocol: {{ .Protocol | default "TCP" }}
-      {{- if .Name }}
-      name: {{ .Name }}
-      {{- end }}
     {{- end }}