alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change VolumeGroupSnapshotContentName to VolumeGroupSnapshotHandle in snapshot content status

Browse Source
This commit is contained in:
Raunak Pradip Shah
2023-11-08 11:51:59 +05:30
parent 1bf2305d28
commit 42151b59aa
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/apis/volumesnapshot/v1/types.go
View File

@@ -421,10 +421,10 @@ type VolumeSnapshotContentStatus struct {
// +optional // +optional
Error *VolumeSnapshotError `json:"error,omitempty" protobuf:"bytes,5,opt,name=error,casttype=VolumeSnapshotError"` Error *VolumeSnapshotError `json:"error,omitempty" protobuf:"bytes,5,opt,name=error,casttype=VolumeSnapshotError"`
// VolumeGroupSnapshotContentName is the name of the VolumeGroupSnapshotContent of // VolumeGroupSnapshotHandle is the CSI "group_snapshot_id" of a group snapshot
// which this VolumeSnapshotContent is a part of. // on the underlying storage system.
// +optional // +optional
VolumeGroupSnapshotContentName *string `json:"volumeGroupSnapshotContentName,omitempty" protobuf:"bytes,6,opt,name=volumeGroupSnapshotContentName"` VolumeGroupSnapshotHandle *string `json:"volumeGroupSnapshotHandle,omitempty" protobuf:"bytes,6,opt,name=volumeGroupSnapshotHandle"`
} }
// DeletionPolicy describes a policy for end-of-life maintenance of volume snapshot contents // DeletionPolicy describes a policy for end-of-life maintenance of volume snapshot contents

4
client/apis/volumesnapshot/v1/zz_generated.deepcopy.go
View File

@@ -271,8 +271,8 @@ func (in *VolumeSnapshotContentStatus) DeepCopyInto(out *VolumeSnapshotContentSt
*out = new(VolumeSnapshotError) *out = new(VolumeSnapshotError)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.VolumeGroupSnapshotContentName != nil { if in.VolumeGroupSnapshotHandle != nil {
in, out := &in.VolumeGroupSnapshotContentName, &out.VolumeGroupSnapshotContentName in, out := &in.VolumeGroupSnapshotHandle, &out.VolumeGroupSnapshotHandle
*out = new(string) *out = new(string)
**out = **in **out = **in
} }

8
client/config/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml
View File

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/814" api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/955"
controller-gen.kubebuilder.io/version: v0.12.0 controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null creationTimestamp: null
name: volumesnapshotcontents.snapshot.storage.k8s.io name: volumesnapshotcontents.snapshot.storage.k8s.io
@@ -242,9 +242,9 @@ spec:
that dynamic snapshot creation has either failed or it is still that dynamic snapshot creation has either failed or it is still
in progress. in progress.
type: string type: string
volumeGroupSnapshotContentName: volumeGroupSnapshotHandle:
description: VolumeGroupSnapshotContentName is the name of the VolumeGroupSnapshotContent description: VolumeGroupSnapshotHandle is the CSI "group_snapshot_id"
of which this VolumeSnapshotContent is a part of. of a group snapshot on the underlying storage system.
type: string type: string
type: object type: object
required: required:

2
pkg/sidecar-controller/groupsnapshot_helper.go
View File

@@ -453,7 +453,7 @@ func (ctrl *csiSnapshotSideCarController) createGroupSnapshotWrapper(groupSnapsh
SourceVolumeMode: nil, SourceVolumeMode: nil,
}, },
Status: &crdv1.VolumeSnapshotContentStatus{ Status: &crdv1.VolumeSnapshotContentStatus{
VolumeGroupSnapshotContentName: &groupSnapshotContent.Name, VolumeGroupSnapshotHandle: &groupSnapshotContent.Name,
}, },
} }

6
vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/types.go generated vendored
View File

@@ -421,10 +421,10 @@ type VolumeSnapshotContentStatus struct {
// +optional // +optional
Error *VolumeSnapshotError `json:"error,omitempty" protobuf:"bytes,5,opt,name=error,casttype=VolumeSnapshotError"` Error *VolumeSnapshotError `json:"error,omitempty" protobuf:"bytes,5,opt,name=error,casttype=VolumeSnapshotError"`
// VolumeGroupSnapshotContentName is the name of the VolumeGroupSnapshotContent of // VolumeGroupSnapshotHandle is the CSI "group_snapshot_id" of a group snapshot
// which this VolumeSnapshotContent is a part of. // on the underlying storage system.
// +optional // +optional
VolumeGroupSnapshotContentName *string `json:"volumeGroupSnapshotContentName,omitempty" protobuf:"bytes,6,opt,name=volumeGroupSnapshotContentName"` VolumeGroupSnapshotHandle *string `json:"volumeGroupSnapshotHandle,omitempty" protobuf:"bytes,6,opt,name=volumeGroupSnapshotHandle"`
} }
// DeletionPolicy describes a policy for end-of-life maintenance of volume snapshot contents // DeletionPolicy describes a policy for end-of-life maintenance of volume snapshot contents

4
vendor/github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1/zz_generated.deepcopy.go generated vendored
View File

@@ -271,8 +271,8 @@ func (in *VolumeSnapshotContentStatus) DeepCopyInto(out *VolumeSnapshotContentSt
*out = new(VolumeSnapshotError) *out = new(VolumeSnapshotError)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.VolumeGroupSnapshotContentName != nil { if in.VolumeGroupSnapshotHandle != nil {
in, out := &in.VolumeGroupSnapshotContentName, &out.VolumeGroupSnapshotContentName in, out := &in.VolumeGroupSnapshotHandle, &out.VolumeGroupSnapshotHandle
*out = new(string) *out = new(string)
**out = **in **out = **in
} }