Merge pull request #577 from dprince/volume_inline_fix

Update volumesource to be json inline
openstack-k8s-operators · Nov 4, 2024 · 71a0e9d · 71a0e9d
2 parents 4878b3f + d5acfee
commit 71a0e9d
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/modules/storage/storage.go b/modules/storage/storage.go
@@ -97,12 +97,10 @@ type VolumeSource struct {
 
 // Volume our slimmed down version of Volume
 type Volume struct {
-	// +kubebuilder:validation:Required
 	// Name of the volume
-	Name string `json:"name"`
-	// +kubebuilder:validation:Required
+	Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
 	// VolumeSource defines the source of a volume to be mounted
-	VolumeSource VolumeSource `json:"volumeSource"`
+	VolumeSource `json:",inline" protobuf:"bytes,2,opt,name=volumeSource"`
 }
 
 // VolMounts is the data structure used to expose Volumes and Mounts that can