Fix inline volumeSource marshalling for LocalSpec (#289)

stashed · Jan 17, 2018 · 85deef4 · 85deef4
1 parent d62b7a7
commit 85deef4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apis/stash/types.go b/apis/stash/types.go
@@ -19,7 +19,7 @@ const (
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type Restic struct {
-	metav1.TypeMeta   `json:",inline,omitempty"`
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 	Spec              ResticSpec   `json:"spec,omitempty"`
 	Status            ResticStatus `json:"status,omitempty"`
@@ -77,9 +77,9 @@ type Backend struct {
 }
 
 type LocalSpec struct {
-	VolumeSource core.VolumeSource `json:",inline"`
-	MountPath    string            `json:"mountPath,omitempty"`
-	SubPath      string            `json:"subPath,omitempty"`
+	core.VolumeSource `json:",inline"`
+	MountPath         string `json:"mountPath,omitempty"`
+	SubPath           string `json:"subPath,omitempty"`
 }
 
 type S3Spec struct {

diff --git a/apis/stash/v1alpha1/types.go b/apis/stash/v1alpha1/types.go
@@ -77,9 +77,9 @@ type Backend struct {
 }
 
 type LocalSpec struct {
-	VolumeSource core.VolumeSource `json:",inline"`
-	MountPath    string            `json:"mountPath,omitempty"`
-	SubPath      string            `json:"subPath,omitempty"`
+	core.VolumeSource `json:",inline"`
+	MountPath         string `json:"mountPath,omitempty"`
+	SubPath           string `json:"subPath,omitempty"`
 }
 
 type S3Spec struct {