Make service config as optional as well

shivamerla · shivamerla · commit 7db4708bb71e · 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
@@ -34,7 +34,7 @@ const (
 
 // Expose defines attributes to expose the service
 type Expose struct {
-	Service Service `json:"service"`
+	Service Service `json:"service,omitempty"`
 	Ingress Ingress `json:"ingress,omitempty"`
 }
 
@@ -46,7 +46,6 @@ 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/api/apps/v1alpha1/nemo_customizer_types.go b/api/apps/v1alpha1/nemo_customizer_types.go
@@ -73,7 +73,7 @@ type NemoCustomizerSpec struct {
 	Tolerations    []corev1.Toleration          `json:"tolerations,omitempty"`
 	PodAffinity    *corev1.PodAffinity          `json:"podAffinity,omitempty"`
 	Resources      *corev1.ResourceRequirements `json:"resources,omitempty"`
-	Expose         Expose                       `json:"expose"`
+	Expose         Expose                       `json:"expose,omitempty"`
 	LivenessProbe  Probe                        `json:"livenessProbe,omitempty"`
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
diff --git a/api/apps/v1alpha1/nemo_datastore_types.go b/api/apps/v1alpha1/nemo_datastore_types.go
@@ -67,7 +67,7 @@ type NemoDatastoreSpec struct {
 	Tolerations    []corev1.Toleration          `json:"tolerations,omitempty"`
 	PodAffinity    *corev1.PodAffinity          `json:"podAffinity,omitempty"`
 	Resources      *corev1.ResourceRequirements `json:"resources,omitempty"`
-	Expose         Expose                       `json:"expose"`
+	Expose         Expose                       `json:"expose,omitempty"`
 	LivenessProbe  Probe                        `json:"livenessProbe,omitempty"`
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
diff --git a/api/apps/v1alpha1/nemo_entitystore_types.go b/api/apps/v1alpha1/nemo_entitystore_types.go
@@ -67,7 +67,7 @@ type NemoEntitystoreSpec struct {
 	Tolerations    []corev1.Toleration          `json:"tolerations,omitempty"`
 	PodAffinity    *corev1.PodAffinity          `json:"podAffinity,omitempty"`
 	Resources      *corev1.ResourceRequirements `json:"resources,omitempty"`
-	Expose         Expose                       `json:"expose"`
+	Expose         Expose                       `json:"expose,omitempty"`
 	LivenessProbe  Probe                        `json:"livenessProbe,omitempty"`
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
diff --git a/api/apps/v1alpha1/nemo_evaluator_types.go b/api/apps/v1alpha1/nemo_evaluator_types.go
@@ -66,7 +66,7 @@ type NemoEvaluatorSpec struct {
 	Tolerations    []corev1.Toleration          `json:"tolerations,omitempty"`
 	PodAffinity    *corev1.PodAffinity          `json:"podAffinity,omitempty"`
 	Resources      *corev1.ResourceRequirements `json:"resources,omitempty"`
-	Expose         Expose                       `json:"expose"`
+	Expose         Expose                       `json:"expose,omitempty"`
 	LivenessProbe  Probe                        `json:"livenessProbe,omitempty"`
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
diff --git a/api/apps/v1alpha1/nemo_guardrails_types.go b/api/apps/v1alpha1/nemo_guardrails_types.go
@@ -69,7 +69,7 @@ type NemoGuardrailSpec struct {
 	Tolerations    []corev1.Toleration          `json:"tolerations,omitempty"`
 	PodAffinity    *corev1.PodAffinity          `json:"podAffinity,omitempty"`
 	Resources      *corev1.ResourceRequirements `json:"resources,omitempty"`
-	Expose         Expose                       `json:"expose"`
+	Expose         Expose                       `json:"expose,omitempty"`
 	LivenessProbe  Probe                        `json:"livenessProbe,omitempty"`
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
diff --git a/api/apps/v1alpha1/nimservice_types.go b/api/apps/v1alpha1/nimservice_types.go
@@ -69,7 +69,7 @@ type NIMServiceSpec struct {
 	Tolerations    []corev1.Toleration          `json:"tolerations,omitempty"`
 	PodAffinity    *corev1.PodAffinity          `json:"podAffinity,omitempty"`
 	Resources      *corev1.ResourceRequirements `json:"resources,omitempty"`
-	Expose         Expose                       `json:"expose"`
+	Expose         Expose                       `json:"expose,omitempty"`
 	LivenessProbe  Probe                        `json:"livenessProbe,omitempty"`
 	ReadinessProbe Probe                        `json:"readinessProbe,omitempty"`
 	StartupProbe   Probe                        `json:"startupProbe,omitempty"`
diff --git a/bundle/manifests/apps.nvidia.com_nemocustomizers.yaml b/bundle/manifests/apps.nvidia.com_nemocustomizers.yaml
@@ -535,7 +535,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -547,8 +546,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2265,7 +2262,6 @@ spec:
             required:
             - customizerConfig
             - databaseConfig
-            - expose
             - image
             - otel
             - wandbSecret
diff --git a/bundle/manifests/apps.nvidia.com_nemodatastores.yaml b/bundle/manifests/apps.nvidia.com_nemodatastores.yaml
@@ -530,7 +530,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -542,8 +541,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2251,7 +2248,6 @@ spec:
                 type: integer
             required:
             - databaseConfig
-            - expose
             - image
             - objectStoreConfig
             - secrets
diff --git a/bundle/manifests/apps.nvidia.com_nemoentitystores.yaml b/bundle/manifests/apps.nvidia.com_nemoentitystores.yaml
@@ -532,7 +532,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -544,8 +543,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2161,7 +2158,6 @@ spec:
                 type: integer
             required:
             - databaseConfig
-            - expose
             - image
             type: object
           status:
diff --git a/bundle/manifests/apps.nvidia.com_nemoevaluators.yaml b/bundle/manifests/apps.nvidia.com_nemoevaluators.yaml
@@ -572,7 +572,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -584,8 +583,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2283,7 +2280,6 @@ spec:
             - argoWorkflows
             - databaseConfig
             - datastore
-            - expose
             - image
             - vectorDB
             type: object
diff --git a/bundle/manifests/apps.nvidia.com_nemoguardrails.yaml b/bundle/manifests/apps.nvidia.com_nemoguardrails.yaml
@@ -517,7 +517,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -529,8 +528,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2146,7 +2143,6 @@ spec:
                 type: integer
             required:
             - authSecret
-            - expose
             - image
             type: object
           status:
diff --git a/bundle/manifests/apps.nvidia.com_nimpipelines.yaml b/bundle/manifests/apps.nvidia.com_nimpipelines.yaml
@@ -526,7 +526,6 @@ spec:
                                   description: override the default service name
                                   type: string
                                 port:
-                                  default: 8000
                                   description: 'Port is the main api serving port
                                     (default: 8000)'
                                   format: int32
@@ -538,8 +537,6 @@ spec:
                                     methods for a service
                                   type: string
                               type: object
-                          required:
-                          - service
                           type: object
                         groupID:
                           format: int64
@@ -2234,7 +2231,6 @@ spec:
                           type: integer
                       required:
                       - authSecret
-                      - expose
                       - image
                       type: object
                   type: object
diff --git a/bundle/manifests/apps.nvidia.com_nimservices.yaml b/bundle/manifests/apps.nvidia.com_nimservices.yaml
@@ -476,7 +476,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -488,8 +487,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2151,7 +2148,6 @@ spec:
                 type: integer
             required:
             - authSecret
-            - expose
             - image
             type: object
           status:
diff --git a/config/crd/bases/apps.nvidia.com_nemocustomizers.yaml b/config/crd/bases/apps.nvidia.com_nemocustomizers.yaml
@@ -535,7 +535,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -547,8 +546,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2265,7 +2262,6 @@ spec:
             required:
             - customizerConfig
             - databaseConfig
-            - expose
             - image
             - otel
             - wandbSecret
diff --git a/config/crd/bases/apps.nvidia.com_nemodatastores.yaml b/config/crd/bases/apps.nvidia.com_nemodatastores.yaml
@@ -530,7 +530,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -542,8 +541,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2251,7 +2248,6 @@ spec:
                 type: integer
             required:
             - databaseConfig
-            - expose
             - image
             - objectStoreConfig
             - secrets
diff --git a/config/crd/bases/apps.nvidia.com_nemoentitystores.yaml b/config/crd/bases/apps.nvidia.com_nemoentitystores.yaml
@@ -532,7 +532,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -544,8 +543,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2161,7 +2158,6 @@ spec:
                 type: integer
             required:
             - databaseConfig
-            - expose
             - image
             type: object
           status:
diff --git a/config/crd/bases/apps.nvidia.com_nemoevaluators.yaml b/config/crd/bases/apps.nvidia.com_nemoevaluators.yaml
@@ -572,7 +572,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -584,8 +583,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2283,7 +2280,6 @@ spec:
             - argoWorkflows
             - databaseConfig
             - datastore
-            - expose
             - image
             - vectorDB
             type: object
diff --git a/config/crd/bases/apps.nvidia.com_nemoguardrails.yaml b/config/crd/bases/apps.nvidia.com_nemoguardrails.yaml
@@ -517,7 +517,6 @@ spec:
                         description: override the default service name
                         type: string
                       port:
-                        default: 8000
                         description: 'Port is the main api serving port (default:
                           8000)'
                         format: int32
@@ -529,8 +528,6 @@ spec:
                           for a service
                         type: string
                     type: object
-                required:
-                - service
                 type: object
               groupID:
                 format: int64
@@ -2146,7 +2143,6 @@ spec:
                 type: integer
             required:
             - authSecret
-            - expose
             - image
             type: object
           status:
diff --git a/config/crd/bases/apps.nvidia.com_nimpipelines.yaml b/config/crd/bases/apps.nvidia.com_nimpipelines.yaml
@@ -526,7 +526,6 @@ spec:
                                   description: override the default service name
                                   type: string
                                 port:
-                                  default: 8000
                                   description: 'Port is the main api serving port
                                     (default: 8000)'
                                   format: int32
@@ -538,8 +537,6 @@ spec:
                                     methods for a service
                                   type: string
                               type: object
-                          required:
-                          - service
                           type: object
                         groupID:
                           format: int64
@@ -2234,7 +2231,6 @@ spec:
                           type: integer
                       required:
                       - authSecret
-                      - expose
                       - image
                       type: object
                   type: object
diff --git a/config/crd/bases/apps.nvidia.com_nimservices.yaml b/config/crd/bases/apps.nvidia.com_nimservices.yaml
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
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
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
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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ const (`
`34`	`34`
`35`	`35`	`// Expose defines attributes to expose the service`
`36`	`36`	`type Expose struct {`
`37`		- Service Service `json:"service"`
	`37`	+ Service Service `json:"service,omitempty"`
`38`	`38`	Ingress Ingress `json:"ingress,omitempty"`
`39`	`39`	`}`
`40`	`40`
`@@ -46,7 +46,6 @@ 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`
`50`	`49`	Port *int32 `json:"port,omitempty"`
`51`	`50`	Annotations map[string]string `json:"annotations,omitempty"`
`52`	`51`	`}`