Update volumesource to be json inline

Author: dprince

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 VolumeSource `json:",inline" protobuf:"bytes,2,opt,name=volumeSource"`
 }
 
 // VolMounts is the data structure used to expose Volumes and Mounts that can
@@ -167,13 +165,16 @@ func (s *VolumeSource) ToCoreVolumeSource() (*corev1.VolumeSource, error) {
 
 // ToCoreVolume - convert Volume to corev1.Volume
 func (s *Volume) ToCoreVolume() (*corev1.Volume, error) {
-	volSource, err := s.VolumeSource.ToCoreVolumeSource()
+	coreVolume := &corev1.Volume{}
+
+	coreVolumeBytes, err := json.Marshal(s)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error marshalling Volume: %w", err)
 	}
-	coreVolume := &corev1.Volume{
-		Name:         s.Name,
-		VolumeSource: *volSource,
+	err = json.Unmarshal(coreVolumeBytes, coreVolume)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshalling Volume: %w", err)
 	}
+
 	return coreVolume, nil
 }