Skip to content

Commit 2b368d2

Browse files
shivamerlashivamerla
committed
Make service config as optional as well
Signed-off-by: Shiva Krishna, Merla <[email protected]>
1 parent f6ae87c commit 2b368d2

28 files changed

+7
-92
lines changed

‎api/apps/v1alpha1/common_types.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const (
3434

3535
// Expose defines attributes to expose the service
3636
type Expose struct {
37-
Service Service `json:"service"`
37+
Service Service `json:"service,omitempty"`
3838
Ingress Ingress `json:"ingress,omitempty"`
3939
}
4040

@@ -46,7 +46,6 @@ type Service struct {
4646
// Port is the main api serving port (default: 8000)
4747
// +kubebuilder:validation:Minimum=1
4848
// +kubebuilder:validation:Maximum=65535
49-
// +kubebuilder:default:=8000
5049
Port *int32 `json:"port,omitempty"`
5150
Annotations map[string]string `json:"annotations,omitempty"`
5251
}

‎api/apps/v1alpha1/nemo_customizer_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ type NemoCustomizerSpec struct {
7373
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
7474
PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty"`
7575
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
76-
Expose Expose `json:"expose"`
76+
Expose Expose `json:"expose,omitempty"`
7777
LivenessProbe Probe `json:"livenessProbe,omitempty"`
7878
ReadinessProbe Probe `json:"readinessProbe,omitempty"`
7979
StartupProbe Probe `json:"startupProbe,omitempty"`

‎api/apps/v1alpha1/nemo_datastore_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ type NemoDatastoreSpec struct {
6767
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
6868
PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty"`
6969
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
70-
Expose Expose `json:"expose"`
70+
Expose Expose `json:"expose,omitempty"`
7171
LivenessProbe Probe `json:"livenessProbe,omitempty"`
7272
ReadinessProbe Probe `json:"readinessProbe,omitempty"`
7373
StartupProbe Probe `json:"startupProbe,omitempty"`

‎api/apps/v1alpha1/nemo_entitystore_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ type NemoEntitystoreSpec struct {
6767
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
6868
PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty"`
6969
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
70-
Expose Expose `json:"expose"`
70+
Expose Expose `json:"expose,omitempty"`
7171
LivenessProbe Probe `json:"livenessProbe,omitempty"`
7272
ReadinessProbe Probe `json:"readinessProbe,omitempty"`
7373
StartupProbe Probe `json:"startupProbe,omitempty"`

‎api/apps/v1alpha1/nemo_evaluator_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ type NemoEvaluatorSpec struct {
6666
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
6767
PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty"`
6868
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
69-
Expose Expose `json:"expose"`
69+
Expose Expose `json:"expose,omitempty"`
7070
LivenessProbe Probe `json:"livenessProbe,omitempty"`
7171
ReadinessProbe Probe `json:"readinessProbe,omitempty"`
7272
StartupProbe Probe `json:"startupProbe,omitempty"`

‎api/apps/v1alpha1/nemo_guardrails_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type NemoGuardrailSpec struct {
6969
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
7070
PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty"`
7171
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
72-
Expose Expose `json:"expose"`
72+
Expose Expose `json:"expose,omitempty"`
7373
LivenessProbe Probe `json:"livenessProbe,omitempty"`
7474
ReadinessProbe Probe `json:"readinessProbe,omitempty"`
7575
StartupProbe Probe `json:"startupProbe,omitempty"`

‎api/apps/v1alpha1/nimservice_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type NIMServiceSpec struct {
6969
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
7070
PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty"`
7171
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
72-
Expose Expose `json:"expose"`
72+
Expose Expose `json:"expose,omitempty"`
7373
LivenessProbe Probe `json:"livenessProbe,omitempty"`
7474
ReadinessProbe Probe `json:"readinessProbe,omitempty"`
7575
StartupProbe Probe `json:"startupProbe,omitempty"`

‎bundle/manifests/apps.nvidia.com_nemocustomizers.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ spec:
535535
description: override the default service name
536536
type: string
537537
port:
538-
default: 8000
539538
description: 'Port is the main api serving port (default:
540539
8000)'
541540
format: int32
@@ -547,8 +546,6 @@ spec:
547546
for a service
548547
type: string
549548
type: object
550-
required:
551-
- service
552549
type: object
553550
groupID:
554551
format: int64
@@ -2265,7 +2262,6 @@ spec:
22652262
required:
22662263
- customizerConfig
22672264
- databaseConfig
2268-
- expose
22692265
- image
22702266
- otel
22712267
- wandbSecret

‎bundle/manifests/apps.nvidia.com_nemodatastores.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@ spec:
530530
description: override the default service name
531531
type: string
532532
port:
533-
default: 8000
534533
description: 'Port is the main api serving port (default:
535534
8000)'
536535
format: int32
@@ -542,8 +541,6 @@ spec:
542541
for a service
543542
type: string
544543
type: object
545-
required:
546-
- service
547544
type: object
548545
groupID:
549546
format: int64
@@ -2251,7 +2248,6 @@ spec:
22512248
type: integer
22522249
required:
22532250
- databaseConfig
2254-
- expose
22552251
- image
22562252
- objectStoreConfig
22572253
- secrets

‎bundle/manifests/apps.nvidia.com_nemoentitystores.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@ spec:
532532
description: override the default service name
533533
type: string
534534
port:
535-
default: 8000
536535
description: 'Port is the main api serving port (default:
537536
8000)'
538537
format: int32
@@ -544,8 +543,6 @@ spec:
544543
for a service
545544
type: string
546545
type: object
547-
required:
548-
- service
549546
type: object
550547
groupID:
551548
format: int64
@@ -2161,7 +2158,6 @@ spec:
21612158
type: integer
21622159
required:
21632160
- databaseConfig
2164-
- expose
21652161
- image
21662162
type: object
21672163
status:

‎bundle/manifests/apps.nvidia.com_nemoevaluators.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ spec:
572572
description: override the default service name
573573
type: string
574574
port:
575-
default: 8000
576575
description: 'Port is the main api serving port (default:
577576
8000)'
578577
format: int32
@@ -584,8 +583,6 @@ spec:
584583
for a service
585584
type: string
586585
type: object
587-
required:
588-
- service
589586
type: object
590587
groupID:
591588
format: int64
@@ -2283,7 +2280,6 @@ spec:
22832280
- argoWorkflows
22842281
- databaseConfig
22852282
- datastore
2286-
- expose
22872283
- image
22882284
- vectorDB
22892285
type: object

‎bundle/manifests/apps.nvidia.com_nemoguardrails.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ spec:
517517
description: override the default service name
518518
type: string
519519
port:
520-
default: 8000
521520
description: 'Port is the main api serving port (default:
522521
8000)'
523522
format: int32
@@ -529,8 +528,6 @@ spec:
529528
for a service
530529
type: string
531530
type: object
532-
required:
533-
- service
534531
type: object
535532
groupID:
536533
format: int64
@@ -2146,7 +2143,6 @@ spec:
21462143
type: integer
21472144
required:
21482145
- authSecret
2149-
- expose
21502146
- image
21512147
type: object
21522148
status:

‎bundle/manifests/apps.nvidia.com_nimpipelines.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ spec:
526526
description: override the default service name
527527
type: string
528528
port:
529-
default: 8000
530529
description: 'Port is the main api serving port
531530
(default: 8000)'
532531
format: int32
@@ -538,8 +537,6 @@ spec:
538537
methods for a service
539538
type: string
540539
type: object
541-
required:
542-
- service
543540
type: object
544541
groupID:
545542
format: int64
@@ -2234,7 +2231,6 @@ spec:
22342231
type: integer
22352232
required:
22362233
- authSecret
2237-
- expose
22382234
- image
22392235
type: object
22402236
type: object

‎bundle/manifests/apps.nvidia.com_nimservices.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,6 @@ spec:
476476
description: override the default service name
477477
type: string
478478
port:
479-
default: 8000
480479
description: 'Port is the main api serving port (default:
481480
8000)'
482481
format: int32
@@ -488,8 +487,6 @@ spec:
488487
for a service
489488
type: string
490489
type: object
491-
required:
492-
- service
493490
type: object
494491
groupID:
495492
format: int64
@@ -2151,7 +2148,6 @@ spec:
21512148
type: integer
21522149
required:
21532150
- authSecret
2154-
- expose
21552151
- image
21562152
type: object
21572153
status:

‎config/crd/bases/apps.nvidia.com_nemocustomizers.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ spec:
535535
description: override the default service name
536536
type: string
537537
port:
538-
default: 8000
539538
description: 'Port is the main api serving port (default:
540539
8000)'
541540
format: int32
@@ -547,8 +546,6 @@ spec:
547546
for a service
548547
type: string
549548
type: object
550-
required:
551-
- service
552549
type: object
553550
groupID:
554551
format: int64
@@ -2265,7 +2262,6 @@ spec:
22652262
required:
22662263
- customizerConfig
22672264
- databaseConfig
2268-
- expose
22692265
- image
22702266
- otel
22712267
- wandbSecret

‎config/crd/bases/apps.nvidia.com_nemodatastores.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@ spec:
530530
description: override the default service name
531531
type: string
532532
port:
533-
default: 8000
534533
description: 'Port is the main api serving port (default:
535534
8000)'
536535
format: int32
@@ -542,8 +541,6 @@ spec:
542541
for a service
543542
type: string
544543
type: object
545-
required:
546-
- service
547544
type: object
548545
groupID:
549546
format: int64
@@ -2251,7 +2248,6 @@ spec:
22512248
type: integer
22522249
required:
22532250
- databaseConfig
2254-
- expose
22552251
- image
22562252
- objectStoreConfig
22572253
- secrets

‎config/crd/bases/apps.nvidia.com_nemoentitystores.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@ spec:
532532
description: override the default service name
533533
type: string
534534
port:
535-
default: 8000
536535
description: 'Port is the main api serving port (default:
537536
8000)'
538537
format: int32
@@ -544,8 +543,6 @@ spec:
544543
for a service
545544
type: string
546545
type: object
547-
required:
548-
- service
549546
type: object
550547
groupID:
551548
format: int64
@@ -2161,7 +2158,6 @@ spec:
21612158
type: integer
21622159
required:
21632160
- databaseConfig
2164-
- expose
21652161
- image
21662162
type: object
21672163
status:

‎config/crd/bases/apps.nvidia.com_nemoevaluators.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ spec:
572572
description: override the default service name
573573
type: string
574574
port:
575-
default: 8000
576575
description: 'Port is the main api serving port (default:
577576
8000)'
578577
format: int32
@@ -584,8 +583,6 @@ spec:
584583
for a service
585584
type: string
586585
type: object
587-
required:
588-
- service
589586
type: object
590587
groupID:
591588
format: int64
@@ -2283,7 +2280,6 @@ spec:
22832280
- argoWorkflows
22842281
- databaseConfig
22852282
- datastore
2286-
- expose
22872283
- image
22882284
- vectorDB
22892285
type: object

‎config/crd/bases/apps.nvidia.com_nemoguardrails.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ spec:
517517
description: override the default service name
518518
type: string
519519
port:
520-
default: 8000
521520
description: 'Port is the main api serving port (default:
522521
8000)'
523522
format: int32
@@ -529,8 +528,6 @@ spec:
529528
for a service
530529
type: string
531530
type: object
532-
required:
533-
- service
534531
type: object
535532
groupID:
536533
format: int64
@@ -2146,7 +2143,6 @@ spec:
21462143
type: integer
21472144
required:
21482145
- authSecret
2149-
- expose
21502146
- image
21512147
type: object
21522148
status:

‎config/crd/bases/apps.nvidia.com_nimpipelines.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ spec:
526526
description: override the default service name
527527
type: string
528528
port:
529-
default: 8000
530529
description: 'Port is the main api serving port
531530
(default: 8000)'
532531
format: int32
@@ -538,8 +537,6 @@ spec:
538537
methods for a service
539538
type: string
540539
type: object
541-
required:
542-
- service
543540
type: object
544541
groupID:
545542
format: int64
@@ -2234,7 +2231,6 @@ spec:
22342231
type: integer
22352232
required:
22362233
- authSecret
2237-
- expose
22382234
- image
22392235
type: object
22402236
type: object

0 commit comments

Comments
 (0)