fix

Signed-off-by: yaroslavborbat <[email protected]>
deckhouse · Dec 3, 2024 · c498cee · c498cee
1 parent c1d79d5
commit c498cee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/api/core/v1alpha2/virtual_image.go b/api/core/v1alpha2/virtual_image.go
@@ -66,11 +66,14 @@ type VirtualImageList struct {
 	Items []VirtualImage `json:"items"`
 }
 
+// +kubebuilder:validation:XValidation:rule="self.storage == 'ContainerRegistry' ? !has(self.persistentVolumeClaim) && has(self.dataSource): true",message="The storage type ContainerRegistry should contain only the dataSource."
+// +kubebuilder:validation:XValidation:rule="self.storage == 'PersistentVolumeClaim' ? !has(self.dataSource) && has(self.persistentVolumeClaim): true",message="The storage type PersistentVolumeClaim should contain only the persistentVolumeClaim."
+// +kubebuilder:validation:XValidation:rule="self.storage == 'Kubernetes' ? !has(self.dataSource) && has(self.persistentVolumeClaim): true",message="The storage type Kubernetes should contain only the persistentVolumeClaim."
 type VirtualImageSpec struct {
 	// +kubebuilder:default:=ContainerRegistry
 	Storage               StorageType                       `json:"storage"`
 	PersistentVolumeClaim VirtualImagePersistentVolumeClaim `json:"persistentVolumeClaim,omitempty"`
-	DataSource            VirtualImageDataSource            `json:"dataSource"`
+	DataSource            VirtualImageDataSource            `json:"dataSource,omitempty"`
 }
 
 type VirtualImageStatus struct {

diff --git a/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go b/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
diff --git a/crds/virtualimages.yaml b/crds/virtualimages.yaml
@@ -240,9 +240,25 @@ spec:
                     - PersistentVolumeClaim
                   type: string
               required:
-                - dataSource
                 - storage
               type: object
+              x-kubernetes-validations:
+                - message:
+                    The storage type ContainerRegistry should contain only the
+                    dataSource.
+                  rule:
+                    "self.storage == 'ContainerRegistry' ? !has(self.persistentVolumeClaim)
+                    && has(self.dataSource): true"
+                - message:
+                    The storage type PersistentVolumeClaim should contain only
+                    the persistentVolumeClaim.
+                  rule:
+                    "self.storage == 'PersistentVolumeClaim' ? !has(self.dataSource)
+                    && has(self.persistentVolumeClaim): true"
+                - message: The storage type Kubernetes should contain only the persistentVolumeClaim.
+                  rule:
+                    "self.storage == 'Kubernetes' ? !has(self.dataSource) && has(self.persistentVolumeClaim):
+                    true"
             status:
               properties:
                 cdrom: