Fix tests and add default port value in the CRD

shivamerla · shivamerla · commit 19ffd4ae501a · 2025-03-13T17:16:14.000-07:00
Signed-off-by: Shiva Krishna, Merla &lt;smerla@nvidia.com&gt;
diff --git a/api/apps/v1alpha1/common_types.go b/api/apps/v1alpha1/common_types.go
@@ -46,6 +46,7 @@ type Service struct {
 	// Port is the main api serving port (default: 8000)
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=65535
+	// +kubebuilder:default:=8000
 	Port        *int32            `json:"port,omitempty"`
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
diff --git a/bundle/manifests/apps.nvidia.com_nemocustomizers.yaml b/bundle/manifests/apps.nvidia.com_nemocustomizers.yaml
@@ -535,6 +535,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/bundle/manifests/apps.nvidia.com_nemodatastores.yaml b/bundle/manifests/apps.nvidia.com_nemodatastores.yaml
@@ -530,6 +530,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/bundle/manifests/apps.nvidia.com_nemoentitystores.yaml b/bundle/manifests/apps.nvidia.com_nemoentitystores.yaml
@@ -532,6 +532,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/bundle/manifests/apps.nvidia.com_nemoevaluators.yaml b/bundle/manifests/apps.nvidia.com_nemoevaluators.yaml
@@ -572,6 +572,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/bundle/manifests/apps.nvidia.com_nemoguardrails.yaml b/bundle/manifests/apps.nvidia.com_nemoguardrails.yaml
@@ -517,6 +517,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/bundle/manifests/apps.nvidia.com_nimpipelines.yaml b/bundle/manifests/apps.nvidia.com_nimpipelines.yaml
@@ -526,6 +526,7 @@ spec:
                                   description: override the default service name
                                   type: string
                                 port:
+                                  default: 8000
                                   description: 'Port is the main api serving port
                                     (default: 8000)'
                                   format: int32
diff --git a/bundle/manifests/apps.nvidia.com_nimservices.yaml b/bundle/manifests/apps.nvidia.com_nimservices.yaml
@@ -476,6 +476,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nemocustomizers.yaml b/config/crd/bases/apps.nvidia.com_nemocustomizers.yaml
@@ -535,6 +535,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nemodatastores.yaml b/config/crd/bases/apps.nvidia.com_nemodatastores.yaml
@@ -530,6 +530,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nemoentitystores.yaml b/config/crd/bases/apps.nvidia.com_nemoentitystores.yaml
@@ -532,6 +532,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nemoevaluators.yaml b/config/crd/bases/apps.nvidia.com_nemoevaluators.yaml
@@ -572,6 +572,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nemoguardrails.yaml b/config/crd/bases/apps.nvidia.com_nemoguardrails.yaml
@@ -517,6 +517,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nimpipelines.yaml b/config/crd/bases/apps.nvidia.com_nimpipelines.yaml
@@ -526,6 +526,7 @@ spec:
                                   description: override the default service name
                                   type: string
                                 port:
+                                  default: 8000
                                   description: 'Port is the main api serving port
                                     (default: 8000)'
                                   format: int32
diff --git a/config/crd/bases/apps.nvidia.com_nimservices.yaml b/config/crd/bases/apps.nvidia.com_nimservices.yaml
@@ -476,6 +476,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemocustomizers.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemocustomizers.yaml
@@ -535,6 +535,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemodatastores.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemodatastores.yaml
@@ -530,6 +530,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemoentitystores.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemoentitystores.yaml
@@ -532,6 +532,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemoevaluators.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemoevaluators.yaml
@@ -572,6 +572,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemoguardrails.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nemoguardrails.yaml
@@ -517,6 +517,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimpipelines.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimpipelines.yaml
@@ -526,6 +526,7 @@ spec:
                                   description: override the default service name
                                   type: string
                                 port:
+                                  default: 8000
                                   description: 'Port is the main api serving port
                                     (default: 8000)'
                                   format: int32
diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimservices.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimservices.yaml
@@ -476,6 +476,7 @@ spec:
                         description: override the default service name
                         type: string
                       port:
+                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
diff --git a/internal/controller/nemo_entitystore_controller_test.go b/internal/controller/nemo_entitystore_controller_test.go
@@ -171,7 +171,7 @@ var _ = Describe("NemoEntitystore Controller", func() {
 				Expose: appsv1alpha1.Expose{
 					Service: appsv1alpha1.Service{
 						Type: corev1.ServiceTypeClusterIP,
-						Port: 8000,
+						Port: ptr.To[int32](8000),
 						Annotations: map[string]string{
 							"annotation-key-specific": "service",
 						},
@@ -329,7 +329,7 @@ var _ = Describe("NemoEntitystore Controller", func() {
 			Expect(ingress.Namespace).To(Equal(nemoEntitystore.GetNamespace()))
 			Expect(ingress.Annotations["annotation-key"]).To(Equal("annotation-value"))
 			Expect(ingress.Annotations["annotation-key-specific"]).To(Equal("ingress"))
-			Expect(service.Spec.Ports[0].Name).To(Equal("service-port"))
+			Expect(service.Spec.Ports[0].Name).To(Equal("api"))
 			Expect(service.Spec.Ports[0].Port).To(Equal(int32(8000)))
 			// HPA should be deployed
 			hpa := &autoscalingv2.HorizontalPodAutoscaler{}
@@ -349,7 +349,7 @@ var _ = Describe("NemoEntitystore Controller", func() {
 			Expect(sm.Namespace).To(Equal(nemoEntitystore.GetNamespace()))
 			Expect(sm.Annotations["annotation-key"]).To(Equal("annotation-value"))
 			Expect(sm.Annotations["annotation-key-specific"]).To(Equal("service-monitor"))
-			Expect(sm.Spec.Endpoints[0].Port).To(Equal("service-port"))
+			Expect(sm.Spec.Endpoints[0].Port).To(Equal("api"))
 			Expect(sm.Spec.Endpoints[0].ScrapeTimeout).To(Equal(monitoringv1.Duration("30s")))
 			Expect(sm.Spec.Endpoints[0].Interval).To(Equal(monitoringv1.Duration("1m")))
 			// Deployment should be created

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ type Service struct {`
`46`	`46`	`// Port is the main api serving port (default: 8000)`
`47`	`47`	`// +kubebuilder:validation:Minimum=1`
`48`	`48`	`// +kubebuilder:validation:Maximum=65535`
	`49`	`+ // +kubebuilder:default:=8000`
`49`	`50`	Port *int32 `json:"port,omitempty"`
`50`	`51`	Annotations map[string]string `json:"annotations,omitempty"`
`51`	`52`	`}`