Add validation markers for required params with PVC creation

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

Author: shivamerla

Makefile

@@ -131,11 +131,11 @@ test-e2e:
 .PHONY: lint
 lint: golangci-lint
 	$(GOLANGCI_LINT) config path
-	$(GOLANGCI_LINT) run -v
+	$(GOLANGCI_LINT) run -v --timeout=5m
 
 .PHONY: lint-fix
 lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
-	$(GOLANGCI_LINT) run --fix
+	$(GOLANGCI_LINT) run --fix --timeout=5m
 
 ##@ Build
 

api/apps/v1alpha1/common_types.go

@@ -227,9 +227,13 @@ type PersistentVolumeClaim struct {
 	// StorageClass to be used for PVC creation. Leave it as empty if the PVC is already created or
 	// a default storage class is set in the cluster.
 	StorageClass string `json:"storageClass,omitempty"`
-	// Size of the NIM cache in Gi, used during PVC creation
+	// Size of the NIM cache in Gi. Required if Create is true.
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Rule="!(self.create == true) || self.size != null && self.size != ''"
 	Size string `json:"size,omitempty"`
-	// VolumeAccessMode is the volume access mode of the PVC
+	// VolumeAccessMode is the access mode of the PVC. Required if Create is true.
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Rule="!(self.create == true) || self.volumeAccessMode != null && self.volumeAccessMode != ''"
 	VolumeAccessMode corev1.PersistentVolumeAccessMode `json:"volumeAccessMode,omitempty"`
 	// SubPath is the path inside the PVC that should be mounted
 	SubPath string `json:"subPath,omitempty"`

api/apps/v1alpha1/nemo_customizer_types.go

@@ -1089,10 +1089,10 @@ func (n *NemoCustomizer) GetPVCParams() *rendertypes.PVCParams {
 	return params
 }
 
-// GetPVCAnnotations return custom PVC annotations setup by the user
+// GetPVCAnnotations return custom PVC annotations setup by the user.
 func (n *NemoCustomizer) GetPVCAnnotations() map[string]string {
 	// Get global customizer annotations
-	pvcAnnotations := n.GetAnnotations()
+	pvcAnnotations := n.GetNemoCustomizerAnnotations()
 
 	if n.Spec.Training.ModelPVC.Annotations != nil {
 		return utils.MergeMaps(pvcAnnotations, n.Spec.Training.ModelPVC.Annotations)

api/apps/v1alpha1/nemo_datastore_types.go

@@ -1089,7 +1089,7 @@ func (n *NemoDatastore) GetPVCParams() *rendertypes.PVCParams {
 
 func (n *NemoDatastore) GetPVCAnnotations() map[string]string {
 	// Get global service annotations
-	pvcAnnotations := n.GetServiceAnnotations()
+	pvcAnnotations := n.GetNemoDatastoreAnnotations()
 
 	if n.Spec.PVC.Annotations != nil {
 		return utils.MergeMaps(pvcAnnotations, n.Spec.PVC.Annotations)

api/apps/v1alpha1/nemo_guardrails_types.go

@@ -788,7 +788,7 @@ func (n *NemoGuardrail) GetPVCParams() *rendertypes.PVCParams {
 
 func (n *NemoGuardrail) GetPVCAnnotations() map[string]string {
 	// Get global service annotations
-	pvcAnnotations := n.GetServiceAnnotations()
+	pvcAnnotations := n.GetNemoGuardrailAnnotations()
 
 	if n.Spec.ConfigStore.PVC.Annotations != nil {
 		return utils.MergeMaps(pvcAnnotations, n.Spec.ConfigStore.PVC.Annotations)

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

@@ -1986,8 +1986,8 @@ spec:
                         description: Name is the name of the PVC
                         type: string
                       size:
-                        description: Size of the NIM cache in Gi, used during PVC
-                          creation
+                        description: Size of the NIM cache in Gi. Required if Create
+                          is true.
                         type: string
                       storageClass:
                         description: |-
@@ -1999,8 +1999,8 @@ spec:
                           be mounted
                         type: string
                       volumeAccessMode:
-                        description: VolumeAccessMode is the volume access mode of
-                          the PVC
+                        description: VolumeAccessMode is the access mode of the PVC.
+                          Required if Create is true.
                         type: string
                     type: object
                   networkConfig:

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

@@ -800,7 +800,8 @@ spec:
                     description: Name is the name of the PVC
                     type: string
                   size:
-                    description: Size of the NIM cache in Gi, used during PVC creation
+                    description: Size of the NIM cache in Gi. Required if Create is
+                      true.
                     type: string
                   storageClass:
                     description: |-
@@ -812,8 +813,8 @@ spec:
                       mounted
                     type: string
                   volumeAccessMode:
-                    description: VolumeAccessMode is the volume access mode of the
-                      PVC
+                    description: VolumeAccessMode is the access mode of the PVC. Required
+                      if Create is true.
                     type: string
                 type: object
               replicas:

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

@@ -87,8 +87,8 @@ spec:
                         description: Name is the name of the PVC
                         type: string
                       size:
-                        description: Size of the NIM cache in Gi, used during PVC
-                          creation
+                        description: Size of the NIM cache in Gi. Required if Create
+                          is true.
                         type: string
                       storageClass:
                         description: |-
@@ -100,8 +100,8 @@ spec:
                           be mounted
                         type: string
                       volumeAccessMode:
-                        description: VolumeAccessMode is the volume access mode of
-                          the PVC
+                        description: VolumeAccessMode is the access mode of the PVC.
+                          Required if Create is true.
                         type: string
                     type: object
                 type: object

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

@@ -369,8 +369,8 @@ spec:
                         description: Name is the name of the PVC
                         type: string
                       size:
-                        description: Size of the NIM cache in Gi, used during PVC
-                          creation
+                        description: Size of the NIM cache in Gi. Required if Create
+                          is true.
                         type: string
                       storageClass:
                         description: |-
@@ -382,8 +382,8 @@ spec:
                           be mounted
                         type: string
                       volumeAccessMode:
-                        description: VolumeAccessMode is the volume access mode of
-                          the PVC
+                        description: VolumeAccessMode is the access mode of the PVC.
+                          Required if Create is true.
                         type: string
                     type: object
                 type: object

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

@@ -2206,8 +2206,8 @@ spec:
                                   description: Name is the name of the PVC
                                   type: string
                                 size:
-                                  description: Size of the NIM cache in Gi, used during
-                                    PVC creation
+                                  description: Size of the NIM cache in Gi. Required
+                                    if Create is true.
                                   type: string
                                 storageClass:
                                   description: |-
@@ -2219,8 +2219,8 @@ spec:
                                     that should be mounted
                                   type: string
                                 volumeAccessMode:
-                                  description: VolumeAccessMode is the volume access
-                                    mode of the PVC
+                                  description: VolumeAccessMode is the access mode
+                                    of the PVC. Required if Create is true.
                                   type: string
                               type: object
                             readOnly: