abstract out guardrails configmap into separate object

Signed-off-by: Varun Ramachandra Sekar <vsekar@nvidia.com>

Author: varunrsekar

api/apps/v1alpha1/nemo_guardrails_types.go

@@ -83,11 +83,19 @@ type NemoGuardrailSpec struct {
 	RuntimeClass string `json:"runtimeClass,omitempty"`
 }
 
+// GuardrailConfig defines the source where the service config is made available.
+//
+// +kubebuilder:validation:XValidation:rule="!(has(self.configMap) && has(self.pvc))", message="Cannot set both ConfigMap and PVC in ConfigStore"
 type GuardrailConfig struct {
-	ConfigMap string                 `json:"configMap,omitempty"`
+	ConfigMap *ConfigMap             `json:"configMap,omitempty"`
 	PVC       *PersistentVolumeClaim `json:"pvc,omitempty"`
 }
 
+type ConfigMap struct {
+	// +kubebuilder:validation:MinLength=1
+	Name string `json:"name"`
+}
+
 // NemoGuardrailStatus defines the observed state of NemoGuardrail
 type NemoGuardrailStatus struct {
 	Conditions        []metav1.Condition `json:"conditions,omitempty"`
@@ -368,13 +376,13 @@ func (n *NemoGuardrail) GetDefaultStartupProbe() *corev1.Probe {
 // GetVolumes returns volumes for the NemoGuardrail container
 func (n *NemoGuardrail) GetVolumes() []corev1.Volume {
 	volumes := []corev1.Volume{}
-	if n.Spec.ConfigStore.ConfigMap != "" {
+	if n.Spec.ConfigStore.ConfigMap != nil {
 		volumes = append(volumes, corev1.Volume{
 			Name: "config-store",
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: n.Spec.ConfigStore.ConfigMap,
+						Name: n.Spec.ConfigStore.ConfigMap.Name,
 					},
 				},
 			},

api/apps/v1alpha1/zz_generated.deepcopy.go

@@ -67,7 +67,13 @@ spec:
                 description: ConfigStore stores the config of the guardrail service
                 properties:
                   configMap:
-                    type: string
+                    properties:
+                      name:
+                        minLength: 1
+                        type: string
+                    required:
+                    - name
+                    type: object
                   pvc:
                     description: PersistentVolumeClaim defines the attributes of PVC
                       used as a source for caching NIM model
@@ -94,6 +100,9 @@ spec:
                         type: string
                     type: object
                 type: object
+                x-kubernetes-validations:
+                - message: Cannot set both ConfigMap and PVC in ConfigStore
+                  rule: '!(has(self.configMap) && has(self.pvc))'
               env:
                 items:
                   description: EnvVar represents an environment variable present in

bundle/manifests/apps.nvidia.com_nemoguardrails.yaml

@@ -67,7 +67,13 @@ spec:
                 description: ConfigStore stores the config of the guardrail service
                 properties:
                   configMap:
-                    type: string
+                    properties:
+                      name:
+                        minLength: 1
+                        type: string
+                    required:
+                    - name
+                    type: object
                   pvc:
                     description: PersistentVolumeClaim defines the attributes of PVC
                       used as a source for caching NIM model
@@ -94,6 +100,9 @@ spec:
                         type: string
                     type: object
                 type: object
+                x-kubernetes-validations:
+                - message: Cannot set both ConfigMap and PVC in ConfigStore
+                  rule: '!(has(self.configMap) && has(self.pvc))'
               env:
                 items:
                   description: EnvVar represents an environment variable present in

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

@@ -8,7 +8,8 @@ metadata:
 spec:
   authSecret: ngc-api-secret
   configStore:
-    configMap: gr-config
+    configMap:
+      name: gr-config
   env:
     - name: NIM_ENDPOINT_URL
       value: http://<NIM_SERVICE_ENDPOINT>:<NIM_SERVICE_PORT>/v1

config/samples/apps_v1alpha1_nemoguardrails.yaml

@@ -67,7 +67,13 @@ spec:
                 description: ConfigStore stores the config of the guardrail service
                 properties:
                   configMap:
-                    type: string
+                    properties:
+                      name:
+                        minLength: 1
+                        type: string
+                    required:
+                    - name
+                    type: object
                   pvc:
                     description: PersistentVolumeClaim defines the attributes of PVC
                       used as a source for caching NIM model
@@ -94,6 +100,9 @@ spec:
                         type: string
                     type: object
                 type: object
+                x-kubernetes-validations:
+                - message: Cannot set both ConfigMap and PVC in ConfigStore
+                  rule: '!(has(self.configMap) && has(self.pvc))'
               env:
                 items:
                   description: EnvVar represents an environment variable present in