From 3c09ceb7f17dfe26289e4f2f197eb3ede51b1cf3 Mon Sep 17 00:00:00 2001 From: Raunak Pradip Shah Date: Tue, 5 Apr 2022 10:05:57 +0530 Subject: [PATCH] Change SourceVolumeMode type to v1.PersistentVolumeMode. --- client/apis/volumesnapshot/v1/types.go | 13 +------------ .../apis/volumesnapshot/v1/zz_generated.deepcopy.go | 3 ++- .../client/v6/apis/volumesnapshot/v1/types.go | 13 +------------ .../apis/volumesnapshot/v1/zz_generated.deepcopy.go | 3 ++- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/client/apis/volumesnapshot/v1/types.go b/client/apis/volumesnapshot/v1/types.go index 747c2426..0e61168b 100644 --- a/client/apis/volumesnapshot/v1/types.go +++ b/client/apis/volumesnapshot/v1/types.go @@ -335,7 +335,7 @@ type VolumeSnapshotContentSpec struct { // This field is immutable. // This field is an alpha field. // +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. @@ -446,14 +446,3 @@ type VolumeSnapshotError struct { // +optional 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" -) diff --git a/client/apis/volumesnapshot/v1/zz_generated.deepcopy.go b/client/apis/volumesnapshot/v1/zz_generated.deepcopy.go index 1d80dfea..901b2b08 100644 --- a/client/apis/volumesnapshot/v1/zz_generated.deepcopy.go +++ b/client/apis/volumesnapshot/v1/zz_generated.deepcopy.go @@ -22,6 +22,7 @@ limitations under the License. package v1 import ( + corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -226,7 +227,7 @@ func (in *VolumeSnapshotContentSpec) DeepCopyInto(out *VolumeSnapshotContentSpec in.Source.DeepCopyInto(&out.Source) if in.SourceVolumeMode != nil { in, out := &in.SourceVolumeMode, &out.SourceVolumeMode - *out = new(SourceVolumeMode) + *out = new(corev1.PersistentVolumeMode) **out = **in } return diff --git a/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/types.go b/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/types.go index 747c2426..0e61168b 100644 --- a/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/types.go +++ b/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/types.go @@ -335,7 +335,7 @@ type VolumeSnapshotContentSpec struct { // This field is immutable. // This field is an alpha field. // +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. @@ -446,14 +446,3 @@ type VolumeSnapshotError struct { // +optional 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" -) diff --git a/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/zz_generated.deepcopy.go b/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/zz_generated.deepcopy.go index 1d80dfea..901b2b08 100644 --- a/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/zz_generated.deepcopy.go @@ -22,6 +22,7 @@ limitations under the License. package v1 import ( + corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -226,7 +227,7 @@ func (in *VolumeSnapshotContentSpec) DeepCopyInto(out *VolumeSnapshotContentSpec in.Source.DeepCopyInto(&out.Source) if in.SourceVolumeMode != nil { in, out := &in.SourceVolumeMode, &out.SourceVolumeMode - *out = new(SourceVolumeMode) + *out = new(corev1.PersistentVolumeMode) **out = **in } return