Merge pull request #683 from RaunakShah/update_api_type
Change SourceVolumeMode type to v1.PersistentVolumeMode
This commit is contained in:
@@ -335,7 +335,7 @@ type VolumeSnapshotContentSpec struct {
|
|||||||
// This field is immutable.
|
// This field is immutable.
|
||||||
// This field is an alpha field.
|
// This field is an alpha field.
|
||||||
// +optional
|
// +optional
|
||||||
SourceVolumeMode *SourceVolumeMode `json:"sourceVolumeMode" protobuf:"bytes,6,opt,name=sourceVolumeMode"`
|
SourceVolumeMode *core_v1.PersistentVolumeMode `json:"sourceVolumeMode" protobuf:"bytes,6,opt,name=sourceVolumeMode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// VolumeSnapshotContentSource represents the CSI source of a snapshot.
|
// VolumeSnapshotContentSource represents the CSI source of a snapshot.
|
||||||
@@ -446,14 +446,3 @@ type VolumeSnapshotError struct {
|
|||||||
// +optional
|
// +optional
|
||||||
Message *string `json:"message,omitempty" protobuf:"bytes,2,opt,name=message"`
|
Message *string `json:"message,omitempty" protobuf:"bytes,2,opt,name=message"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SourceVolumeMode describes the volume mode of the source volume from which a snapshot was created.
|
|
||||||
// +enum
|
|
||||||
type SourceVolumeMode string
|
|
||||||
|
|
||||||
const (
|
|
||||||
// SourceVolumeModeBlock describes a snapshot that is created from a raw block volume.
|
|
||||||
SourceVolumeModeBlock SourceVolumeMode = "Block"
|
|
||||||
// SourceVolumeModeFilesystem describes a snapshot that is created from a filesystem volume.
|
|
||||||
SourceVolumeModeFilesystem SourceVolumeMode = "Filesystem"
|
|
||||||
)
|
|
||||||
|
@@ -22,6 +22,7 @@ limitations under the License.
|
|||||||
package v1
|
package v1
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
corev1 "k8s.io/api/core/v1"
|
||||||
runtime "k8s.io/apimachinery/pkg/runtime"
|
runtime "k8s.io/apimachinery/pkg/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -226,7 +227,7 @@ func (in *VolumeSnapshotContentSpec) DeepCopyInto(out *VolumeSnapshotContentSpec
|
|||||||
in.Source.DeepCopyInto(&out.Source)
|
in.Source.DeepCopyInto(&out.Source)
|
||||||
if in.SourceVolumeMode != nil {
|
if in.SourceVolumeMode != nil {
|
||||||
in, out := &in.SourceVolumeMode, &out.SourceVolumeMode
|
in, out := &in.SourceVolumeMode, &out.SourceVolumeMode
|
||||||
*out = new(SourceVolumeMode)
|
*out = new(corev1.PersistentVolumeMode)
|
||||||
**out = **in
|
**out = **in
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
@@ -335,7 +335,7 @@ type VolumeSnapshotContentSpec struct {
|
|||||||
// This field is immutable.
|
// This field is immutable.
|
||||||
// This field is an alpha field.
|
// This field is an alpha field.
|
||||||
// +optional
|
// +optional
|
||||||
SourceVolumeMode *SourceVolumeMode `json:"sourceVolumeMode" protobuf:"bytes,6,opt,name=sourceVolumeMode"`
|
SourceVolumeMode *core_v1.PersistentVolumeMode `json:"sourceVolumeMode" protobuf:"bytes,6,opt,name=sourceVolumeMode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// VolumeSnapshotContentSource represents the CSI source of a snapshot.
|
// VolumeSnapshotContentSource represents the CSI source of a snapshot.
|
||||||
@@ -446,14 +446,3 @@ type VolumeSnapshotError struct {
|
|||||||
// +optional
|
// +optional
|
||||||
Message *string `json:"message,omitempty" protobuf:"bytes,2,opt,name=message"`
|
Message *string `json:"message,omitempty" protobuf:"bytes,2,opt,name=message"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SourceVolumeMode describes the volume mode of the source volume from which a snapshot was created.
|
|
||||||
// +enum
|
|
||||||
type SourceVolumeMode string
|
|
||||||
|
|
||||||
const (
|
|
||||||
// SourceVolumeModeBlock describes a snapshot that is created from a raw block volume.
|
|
||||||
SourceVolumeModeBlock SourceVolumeMode = "Block"
|
|
||||||
// SourceVolumeModeFilesystem describes a snapshot that is created from a filesystem volume.
|
|
||||||
SourceVolumeModeFilesystem SourceVolumeMode = "Filesystem"
|
|
||||||
)
|
|
||||||
|
@@ -22,6 +22,7 @@ limitations under the License.
|
|||||||
package v1
|
package v1
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
corev1 "k8s.io/api/core/v1"
|
||||||
runtime "k8s.io/apimachinery/pkg/runtime"
|
runtime "k8s.io/apimachinery/pkg/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -226,7 +227,7 @@ func (in *VolumeSnapshotContentSpec) DeepCopyInto(out *VolumeSnapshotContentSpec
|
|||||||
in.Source.DeepCopyInto(&out.Source)
|
in.Source.DeepCopyInto(&out.Source)
|
||||||
if in.SourceVolumeMode != nil {
|
if in.SourceVolumeMode != nil {
|
||||||
in, out := &in.SourceVolumeMode, &out.SourceVolumeMode
|
in, out := &in.SourceVolumeMode, &out.SourceVolumeMode
|
||||||
*out = new(SourceVolumeMode)
|
*out = new(corev1.PersistentVolumeMode)
|
||||||
**out = **in
|
**out = **in
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
Reference in New Issue
Block a user