Skip to content

Fix inline volumeSource marshalling for LocalSpec #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tamalsaha merged 1 commit into from
Jan 17, 2018
Merged

Fix inline volumeSource marshalling for LocalSpec #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apis/stash/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions apis/stash/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down