mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-05-28 04:04:39 -04:00
Merge pull request #135069 from jsafrane/snapshot-v1beta2
test: update volume group snapshots to v1beta2
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
34bb3477a2
7 changed files with 665 additions and 19 deletions
|
|
@ -185,17 +185,18 @@ func (s *VolumeGroupSnapshottableTestSuite) DefineTests(driver storageframework.
|
|||
volumeListMap := snapshot.VGSContent.Object["status"].(map[string]interface{})
|
||||
err = framework.Gomega().Expect(volumeListMap).NotTo(gomega.BeNil())
|
||||
framework.ExpectNoError(err, "failed to get volume snapshot list")
|
||||
volumeSnapshotHandlePairList := volumeListMap["volumeSnapshotHandlePairList"].([]interface{})
|
||||
err = framework.Gomega().Expect(volumeSnapshotHandlePairList).NotTo(gomega.BeNil())
|
||||
volumeSnapshotInfoList := volumeListMap["volumeSnapshotInfoList"].([]interface{})
|
||||
err = framework.Gomega().Expect(volumeSnapshotInfoList).NotTo(gomega.BeNil())
|
||||
framework.ExpectNoError(err, "failed to get volume snapshot list")
|
||||
err = framework.Gomega().Expect(len(volumeSnapshotHandlePairList)).To(gomega.Equal(groupTest.numVolumes))
|
||||
err = framework.Gomega().Expect(len(volumeSnapshotInfoList)).To(gomega.Equal(groupTest.numVolumes))
|
||||
framework.ExpectNoError(err, "failed to get volume snapshot list")
|
||||
claimSize := groupTest.volumeGroup[0][0].Pvc.Spec.Resources.Requests.Storage().String()
|
||||
for _, volume := range volumeSnapshotHandlePairList {
|
||||
for _, info := range volumeSnapshotInfoList {
|
||||
// Create a PVC from the snapshot
|
||||
volumeHandle := volume.(map[string]interface{})["volumeHandle"].(string)
|
||||
volumeHandle := info.(map[string]interface{})["volumeHandle"].(string)
|
||||
err = framework.Gomega().Expect(volumeHandle).NotTo(gomega.BeNil())
|
||||
framework.ExpectNoError(err, "failed to get volume handle from volume")
|
||||
|
||||
uid := snapshot.VGS.Object["metadata"].(map[string]interface{})["uid"].(string)
|
||||
err = framework.Gomega().Expect(uid).NotTo(gomega.BeNil())
|
||||
framework.ExpectNoError(err, "failed to get uuid from content")
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@ const (
|
|||
// VolumeGroupSnapshot is the group snapshot api
|
||||
VolumeGroupSnapshotAPIGroup = "groupsnapshot.storage.k8s.io"
|
||||
// VolumeGroupSnapshotAPIVersion is the group snapshot api version
|
||||
VolumeGroupSnapshotAPIVersion = "groupsnapshot.storage.k8s.io/v1beta1"
|
||||
VolumeGroupSnapshotAPIVersion = "groupsnapshot.storage.k8s.io/v1beta2"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
// VolumeGroupSnapshotGVR is GroupVersionResource for volumegroupsnapshots
|
||||
VolumeGroupSnapshotGVR = schema.GroupVersionResource{Group: VolumeGroupSnapshotAPIGroup, Version: "v1beta1", Resource: "volumegroupsnapshots"}
|
||||
VolumeGroupSnapshotGVR = schema.GroupVersionResource{Group: VolumeGroupSnapshotAPIGroup, Version: "v1beta2", Resource: "volumegroupsnapshots"}
|
||||
// VolumeGroupSnapshotClassGVR is GroupVersionResource for volumegroupsnapshotsclasses
|
||||
VolumeGroupSnapshotClassGVR = schema.GroupVersionResource{Group: VolumeGroupSnapshotAPIGroup, Version: "v1beta1", Resource: "volumegroupsnapshotclasses"}
|
||||
VolumeGroupSnapshotContentGVR = schema.GroupVersionResource{Group: VolumeGroupSnapshotAPIGroup, Version: "v1beta1", Resource: "volumegroupsnapshotcontents"}
|
||||
VolumeGroupSnapshotClassGVR = schema.GroupVersionResource{Group: VolumeGroupSnapshotAPIGroup, Version: "v1beta2", Resource: "volumegroupsnapshotclasses"}
|
||||
VolumeGroupSnapshotContentGVR = schema.GroupVersionResource{Group: VolumeGroupSnapshotAPIGroup, Version: "v1beta2", Resource: "volumegroupsnapshotcontents"}
|
||||
)
|
||||
|
||||
// WaitForVolumeGroupSnapshotReady waits for a VolumeGroupSnapshot to be ready to use or until timeout occurs, whichever comes first.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
|||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1150"
|
||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1337"
|
||||
controller-gen.kubebuilder.io/version: v0.15.0
|
||||
name: volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io
|
||||
spec:
|
||||
|
|
@ -31,6 +31,7 @@ spec:
|
|||
- jsonPath: .metadata.creationTimestamp
|
||||
name: Age
|
||||
type: date
|
||||
deprecated: true
|
||||
name: v1beta1
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
|
|
@ -90,5 +91,88 @@ spec:
|
|||
- driver
|
||||
type: object
|
||||
served: true
|
||||
storage: false
|
||||
subresources: {}
|
||||
- additionalPrinterColumns:
|
||||
- jsonPath: .driver
|
||||
name: Driver
|
||||
type: string
|
||||
- description: Determines whether a VolumeGroupSnapshotContent created through
|
||||
the VolumeGroupSnapshotClass should be deleted when its bound VolumeGroupSnapshot
|
||||
is deleted.
|
||||
jsonPath: .deletionPolicy
|
||||
name: DeletionPolicy
|
||||
type: string
|
||||
- jsonPath: .metadata.creationTimestamp
|
||||
name: Age
|
||||
type: date
|
||||
name: v1beta2
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
description: |-
|
||||
VolumeGroupSnapshotClass specifies parameters that a underlying storage system
|
||||
uses when creating a volume group snapshot. A specific VolumeGroupSnapshotClass
|
||||
is used by specifying its name in a VolumeGroupSnapshot object.
|
||||
VolumeGroupSnapshotClasses are non-namespaced.
|
||||
properties:
|
||||
apiVersion:
|
||||
description: |-
|
||||
APIVersion defines the versioned schema of this representation of an object.
|
||||
Servers should convert recognized schemas to the latest internal value, and
|
||||
may reject unrecognized values.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
|
||||
type: string
|
||||
deletionPolicy:
|
||||
description: |-
|
||||
DeletionPolicy determines whether a VolumeGroupSnapshotContent created
|
||||
through the VolumeGroupSnapshotClass should be deleted when its bound
|
||||
VolumeGroupSnapshot is deleted.
|
||||
Supported values are "Retain" and "Delete".
|
||||
"Retain" means that the VolumeGroupSnapshotContent and its physical group
|
||||
snapshot on underlying storage system are kept.
|
||||
"Delete" means that the VolumeGroupSnapshotContent and its physical group
|
||||
snapshot on underlying storage system are deleted.
|
||||
Required.
|
||||
enum:
|
||||
- Delete
|
||||
- Retain
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: deletionPolicy is immutable once set
|
||||
rule: self == oldSelf
|
||||
driver:
|
||||
description: |-
|
||||
Driver is the name of the storage driver expected to handle this VolumeGroupSnapshotClass.
|
||||
Required.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: driver is immutable once set
|
||||
rule: self == oldSelf
|
||||
kind:
|
||||
description: |-
|
||||
Kind is a string value representing the REST resource this object represents.
|
||||
Servers may infer this from the endpoint the client submits requests to.
|
||||
Cannot be updated.
|
||||
In CamelCase.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
||||
type: string
|
||||
metadata:
|
||||
type: object
|
||||
parameters:
|
||||
additionalProperties:
|
||||
type: string
|
||||
description: |-
|
||||
Parameters is a key-value map with storage driver specific parameters for
|
||||
creating group snapshots.
|
||||
These values are opaque to Kubernetes and are passed directly to the driver.
|
||||
type: object
|
||||
x-kubernetes-validations:
|
||||
- message: parameters are immutable once set
|
||||
rule: self == oldSelf
|
||||
required:
|
||||
- deletionPolicy
|
||||
- driver
|
||||
type: object
|
||||
served: true
|
||||
storage: true
|
||||
subresources: {}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
|||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1150"
|
||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1337"
|
||||
controller-gen.kubebuilder.io/version: v0.15.0
|
||||
name: volumegroupsnapshotcontents.groupsnapshot.storage.k8s.io
|
||||
spec:
|
||||
|
|
@ -17,6 +17,15 @@ spec:
|
|||
- vgscs
|
||||
singular: volumegroupsnapshotcontent
|
||||
scope: Cluster
|
||||
conversion:
|
||||
strategy: Webhook
|
||||
webhook:
|
||||
conversionReviewVersions: ["v1"]
|
||||
clientConfig:
|
||||
service:
|
||||
namespace: default
|
||||
name: snapshot-conversion-webhook-service
|
||||
path: /convert
|
||||
versions:
|
||||
- additionalPrinterColumns:
|
||||
- description: Indicates if all the individual snapshots in the group are ready
|
||||
|
|
@ -53,6 +62,7 @@ spec:
|
|||
- jsonPath: .metadata.creationTimestamp
|
||||
name: Age
|
||||
type: date
|
||||
deprecated: true
|
||||
name: v1beta1
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
|
|
@ -319,6 +329,333 @@ spec:
|
|||
- spec
|
||||
type: object
|
||||
served: true
|
||||
storage: false
|
||||
subresources:
|
||||
status: {}
|
||||
- additionalPrinterColumns:
|
||||
- description: Indicates if all the individual snapshots in the group are ready
|
||||
to be used to restore a group of volumes.
|
||||
jsonPath: .status.readyToUse
|
||||
name: ReadyToUse
|
||||
type: boolean
|
||||
- description: Determines whether this VolumeGroupSnapshotContent and its physical
|
||||
group snapshot on the underlying storage system should be deleted when its
|
||||
bound VolumeGroupSnapshot is deleted.
|
||||
jsonPath: .spec.deletionPolicy
|
||||
name: DeletionPolicy
|
||||
type: string
|
||||
- description: Name of the CSI driver used to create the physical group snapshot
|
||||
on the underlying storage system.
|
||||
jsonPath: .spec.driver
|
||||
name: Driver
|
||||
type: string
|
||||
- description: Name of the VolumeGroupSnapshotClass from which this group snapshot
|
||||
was (or will be) created.
|
||||
jsonPath: .spec.volumeGroupSnapshotClassName
|
||||
name: VolumeGroupSnapshotClass
|
||||
type: string
|
||||
- description: Namespace of the VolumeGroupSnapshot object to which this VolumeGroupSnapshotContent
|
||||
object is bound.
|
||||
jsonPath: .spec.volumeGroupSnapshotRef.namespace
|
||||
name: VolumeGroupSnapshotNamespace
|
||||
type: string
|
||||
- description: Name of the VolumeGroupSnapshot object to which this VolumeGroupSnapshotContent
|
||||
object is bound.
|
||||
jsonPath: .spec.volumeGroupSnapshotRef.name
|
||||
name: VolumeGroupSnapshot
|
||||
type: string
|
||||
- jsonPath: .metadata.creationTimestamp
|
||||
name: Age
|
||||
type: date
|
||||
name: v1beta2
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
description: |-
|
||||
VolumeGroupSnapshotContent represents the actual "on-disk" group snapshot object
|
||||
in the underlying storage system
|
||||
properties:
|
||||
apiVersion:
|
||||
description: |-
|
||||
APIVersion defines the versioned schema of this representation of an object.
|
||||
Servers should convert recognized schemas to the latest internal value, and
|
||||
may reject unrecognized values.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
|
||||
type: string
|
||||
kind:
|
||||
description: |-
|
||||
Kind is a string value representing the REST resource this object represents.
|
||||
Servers may infer this from the endpoint the client submits requests to.
|
||||
Cannot be updated.
|
||||
In CamelCase.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
||||
type: string
|
||||
metadata:
|
||||
type: object
|
||||
spec:
|
||||
description: |-
|
||||
Spec defines properties of a VolumeGroupSnapshotContent created by the underlying storage system.
|
||||
Required.
|
||||
properties:
|
||||
deletionPolicy:
|
||||
description: |-
|
||||
DeletionPolicy determines whether this VolumeGroupSnapshotContent and the
|
||||
physical group snapshot on the underlying storage system should be deleted
|
||||
when the bound VolumeGroupSnapshot is deleted.
|
||||
Supported values are "Retain" and "Delete".
|
||||
"Retain" means that the VolumeGroupSnapshotContent and its physical group
|
||||
snapshot on underlying storage system are kept.
|
||||
"Delete" means that the VolumeGroupSnapshotContent and its physical group
|
||||
snapshot on underlying storage system are deleted.
|
||||
For dynamically provisioned group snapshots, this field will automatically
|
||||
be filled in by the CSI snapshotter sidecar with the "DeletionPolicy" field
|
||||
defined in the corresponding VolumeGroupSnapshotClass.
|
||||
For pre-existing snapshots, users MUST specify this field when creating the
|
||||
VolumeGroupSnapshotContent object.
|
||||
Required.
|
||||
enum:
|
||||
- Delete
|
||||
- Retain
|
||||
type: string
|
||||
driver:
|
||||
description: |-
|
||||
Driver is the name of the CSI driver used to create the physical group snapshot on
|
||||
the underlying storage system.
|
||||
This MUST be the same as the name returned by the CSI GetPluginName() call for
|
||||
that driver.
|
||||
Required.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: driver is immutable once set
|
||||
rule: self == oldSelf
|
||||
source:
|
||||
description: |-
|
||||
Source specifies whether the snapshot is (or should be) dynamically provisioned
|
||||
or already exists, and just requires a Kubernetes object representation.
|
||||
This field is immutable after creation.
|
||||
Required.
|
||||
properties:
|
||||
groupSnapshotHandles:
|
||||
description: |-
|
||||
GroupSnapshotHandles specifies the CSI "group_snapshot_id" of a pre-existing
|
||||
group snapshot and a list of CSI "snapshot_id" of pre-existing snapshots
|
||||
on the underlying storage system for which a Kubernetes object
|
||||
representation was (or should be) created.
|
||||
This field is immutable.
|
||||
properties:
|
||||
volumeGroupSnapshotHandle:
|
||||
description: |-
|
||||
VolumeGroupSnapshotHandle specifies the CSI "group_snapshot_id" of a pre-existing
|
||||
group snapshot on the underlying storage system for which a Kubernetes object
|
||||
representation was (or should be) created.
|
||||
This field is immutable.
|
||||
Required.
|
||||
type: string
|
||||
volumeSnapshotHandles:
|
||||
description: |-
|
||||
VolumeSnapshotHandles is a list of CSI "snapshot_id" of pre-existing
|
||||
snapshots on the underlying storage system for which Kubernetes objects
|
||||
representation were (or should be) created.
|
||||
This field is immutable.
|
||||
Required.
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
required:
|
||||
- volumeGroupSnapshotHandle
|
||||
- volumeSnapshotHandles
|
||||
type: object
|
||||
x-kubernetes-validations:
|
||||
- message: groupSnapshotHandles is immutable
|
||||
rule: self == oldSelf
|
||||
volumeHandles:
|
||||
description: |-
|
||||
VolumeHandles is a list of volume handles on the backend to be snapshotted
|
||||
together. It is specified for dynamic provisioning of the VolumeGroupSnapshot.
|
||||
This field is immutable.
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
x-kubernetes-validations:
|
||||
- message: volumeHandles is immutable
|
||||
rule: self == oldSelf
|
||||
type: object
|
||||
x-kubernetes-validations:
|
||||
- message: volumeHandles is required once set
|
||||
rule: '!has(oldSelf.volumeHandles) || has(self.volumeHandles)'
|
||||
- message: groupSnapshotHandles is required once set
|
||||
rule: '!has(oldSelf.groupSnapshotHandles) || has(self.groupSnapshotHandles)'
|
||||
- message: exactly one of volumeHandles and groupSnapshotHandles must
|
||||
be set
|
||||
rule: (has(self.volumeHandles) && !has(self.groupSnapshotHandles))
|
||||
|| (!has(self.volumeHandles) && has(self.groupSnapshotHandles))
|
||||
volumeGroupSnapshotClassName:
|
||||
description: |-
|
||||
VolumeGroupSnapshotClassName is the name of the VolumeGroupSnapshotClass from
|
||||
which this group snapshot was (or will be) created.
|
||||
Note that after provisioning, the VolumeGroupSnapshotClass may be deleted or
|
||||
recreated with different set of values, and as such, should not be referenced
|
||||
post-snapshot creation.
|
||||
For dynamic provisioning, this field must be set.
|
||||
This field may be unset for pre-provisioned snapshots.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: volumeGroupSnapshotClassName is immutable once set
|
||||
rule: self == oldSelf
|
||||
volumeGroupSnapshotRef:
|
||||
description: |-
|
||||
VolumeGroupSnapshotRef specifies the VolumeGroupSnapshot object to which this
|
||||
VolumeGroupSnapshotContent object is bound.
|
||||
VolumeGroupSnapshot.Spec.VolumeGroupSnapshotContentName field must reference to
|
||||
this VolumeGroupSnapshotContent's name for the bidirectional binding to be valid.
|
||||
For a pre-existing VolumeGroupSnapshotContent object, name and namespace of the
|
||||
VolumeGroupSnapshot object MUST be provided for binding to happen.
|
||||
This field is immutable after creation.
|
||||
Required.
|
||||
properties:
|
||||
apiVersion:
|
||||
description: API version of the referent.
|
||||
type: string
|
||||
fieldPath:
|
||||
description: |-
|
||||
If referring to a piece of an object instead of an entire object, this string
|
||||
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
|
||||
For example, if the object reference is to a container within a pod, this would take on a value like:
|
||||
"spec.containers{name}" (where "name" refers to the name of the container that triggered
|
||||
the event) or if no container name is specified "spec.containers[2]" (container with
|
||||
index 2 in this pod). This syntax is chosen only to have some well-defined way of
|
||||
referencing a part of an object.
|
||||
TODO: this design is not final and this field is subject to change in the future.
|
||||
type: string
|
||||
kind:
|
||||
description: |-
|
||||
Kind of the referent.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
||||
type: string
|
||||
name:
|
||||
description: |-
|
||||
Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
type: string
|
||||
namespace:
|
||||
description: |-
|
||||
Namespace of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
|
||||
type: string
|
||||
resourceVersion:
|
||||
description: |-
|
||||
Specific resourceVersion to which this reference is made, if any.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
|
||||
type: string
|
||||
uid:
|
||||
description: |-
|
||||
UID of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
|
||||
type: string
|
||||
type: object
|
||||
x-kubernetes-map-type: atomic
|
||||
x-kubernetes-validations:
|
||||
- message: both volumeGroupSnapshotRef.name and volumeGroupSnapshotRef.namespace
|
||||
must be set
|
||||
rule: has(self.name) && has(self.__namespace__)
|
||||
- message: volumeGroupSnapshotRef.name and volumeGroupSnapshotRef.namespace
|
||||
are immutable
|
||||
rule: self.name == oldSelf.name && self.__namespace__ == oldSelf.__namespace__
|
||||
- message: volumeGroupSnapshotRef.uid is immutable once set
|
||||
rule: '!has(oldSelf.uid) || (has(self.uid) && self.uid == oldSelf.uid)'
|
||||
required:
|
||||
- deletionPolicy
|
||||
- driver
|
||||
- source
|
||||
- volumeGroupSnapshotRef
|
||||
type: object
|
||||
status:
|
||||
description: status represents the current information of a group snapshot.
|
||||
properties:
|
||||
creationTime:
|
||||
description: |-
|
||||
CreationTime is the timestamp when the point-in-time group snapshot is taken
|
||||
by the underlying storage system.
|
||||
If not specified, it indicates the creation time is unknown.
|
||||
If not specified, it means the readiness of a group snapshot is unknown.
|
||||
This field is the source for the CreationTime field in VolumeGroupSnapshotStatus
|
||||
format: date-time
|
||||
type: string
|
||||
error:
|
||||
description: |-
|
||||
Error is the last observed error during group snapshot creation, if any.
|
||||
Upon success after retry, this error field will be cleared.
|
||||
properties:
|
||||
message:
|
||||
description: |-
|
||||
message is a string detailing the encountered error during snapshot
|
||||
creation if specified.
|
||||
NOTE: message may be logged, and it should not contain sensitive
|
||||
information.
|
||||
type: string
|
||||
time:
|
||||
description: time is the timestamp when the error was encountered.
|
||||
format: date-time
|
||||
type: string
|
||||
type: object
|
||||
readyToUse:
|
||||
description: |-
|
||||
ReadyToUse indicates if all the individual snapshots in the group are ready to be
|
||||
used to restore a group of volumes.
|
||||
ReadyToUse becomes true when ReadyToUse of all individual snapshots become true.
|
||||
type: boolean
|
||||
volumeGroupSnapshotHandle:
|
||||
description: |-
|
||||
VolumeGroupSnapshotHandle is a unique id returned by the CSI driver
|
||||
to identify the VolumeGroupSnapshot on the storage system.
|
||||
If a storage system does not provide such an id, the
|
||||
CSI driver can choose to return the VolumeGroupSnapshot name.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: volumeGroupSnapshotHandle is immutable once set
|
||||
rule: self == oldSelf
|
||||
volumeSnapshotInfoList:
|
||||
description: |-
|
||||
This field is introduced in v1beta2
|
||||
It is replacing VolumeSnapshotHandlePairList
|
||||
VolumeSnapshotInfoList is a list of snapshot information returned by
|
||||
by the CSI driver to identify snapshots on the storage system.
|
||||
items:
|
||||
description: |-
|
||||
The VolumeSnapshotInfo struct is added in v1beta2
|
||||
VolumeSnapshotInfo contains information for a snapshot
|
||||
properties:
|
||||
creationTime:
|
||||
description: |-
|
||||
creationTime is the timestamp when the point-in-time snapshot is taken
|
||||
by the underlying storage system.
|
||||
format: int64
|
||||
type: integer
|
||||
readyToUse:
|
||||
description: ReadyToUse indicates if the snapshot is ready to
|
||||
be used to restore a volume.
|
||||
type: boolean
|
||||
restoreSize:
|
||||
description: |-
|
||||
RestoreSize represents the minimum size of volume required to create a volume
|
||||
from this snapshot.
|
||||
format: int64
|
||||
type: integer
|
||||
snapshotHandle:
|
||||
description: SnapshotHandle is the CSI "snapshot_id" of this
|
||||
snapshot on the underlying storage system.
|
||||
type: string
|
||||
volumeHandle:
|
||||
description: |-
|
||||
VolumeHandle specifies the CSI "volume_id" of the volume from which this snapshot
|
||||
was taken from.
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
required:
|
||||
- spec
|
||||
type: object
|
||||
served: true
|
||||
storage: true
|
||||
subresources:
|
||||
status: {}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
|||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1150"
|
||||
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/1337"
|
||||
controller-gen.kubebuilder.io/version: v0.15.0
|
||||
name: volumegroupsnapshots.groupsnapshot.storage.k8s.io
|
||||
spec:
|
||||
|
|
@ -43,6 +43,7 @@ spec:
|
|||
- jsonPath: .metadata.creationTimestamp
|
||||
name: Age
|
||||
type: date
|
||||
deprecated: true
|
||||
name: v1beta1
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
|
|
@ -234,6 +235,226 @@ spec:
|
|||
- spec
|
||||
type: object
|
||||
served: true
|
||||
storage: false
|
||||
subresources:
|
||||
status: {}
|
||||
- additionalPrinterColumns:
|
||||
- description: Indicates if all the individual snapshots in the group are ready
|
||||
to be used to restore a group of volumes.
|
||||
jsonPath: .status.readyToUse
|
||||
name: ReadyToUse
|
||||
type: boolean
|
||||
- description: The name of the VolumeGroupSnapshotClass requested by the VolumeGroupSnapshot.
|
||||
jsonPath: .spec.volumeGroupSnapshotClassName
|
||||
name: VolumeGroupSnapshotClass
|
||||
type: string
|
||||
- description: Name of the VolumeGroupSnapshotContent object to which the VolumeGroupSnapshot
|
||||
object intends to bind to. Please note that verification of binding actually
|
||||
requires checking both VolumeGroupSnapshot and VolumeGroupSnapshotContent
|
||||
to ensure both are pointing at each other. Binding MUST be verified prior
|
||||
to usage of this object.
|
||||
jsonPath: .status.boundVolumeGroupSnapshotContentName
|
||||
name: VolumeGroupSnapshotContent
|
||||
type: string
|
||||
- description: Timestamp when the point-in-time group snapshot was taken by the
|
||||
underlying storage system.
|
||||
jsonPath: .status.creationTime
|
||||
name: CreationTime
|
||||
type: date
|
||||
- jsonPath: .metadata.creationTimestamp
|
||||
name: Age
|
||||
type: date
|
||||
name: v1beta2
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
description: |-
|
||||
VolumeGroupSnapshot is a user's request for creating either a point-in-time
|
||||
group snapshot or binding to a pre-existing group snapshot.
|
||||
properties:
|
||||
apiVersion:
|
||||
description: |-
|
||||
APIVersion defines the versioned schema of this representation of an object.
|
||||
Servers should convert recognized schemas to the latest internal value, and
|
||||
may reject unrecognized values.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
|
||||
type: string
|
||||
kind:
|
||||
description: |-
|
||||
Kind is a string value representing the REST resource this object represents.
|
||||
Servers may infer this from the endpoint the client submits requests to.
|
||||
Cannot be updated.
|
||||
In CamelCase.
|
||||
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
|
||||
type: string
|
||||
metadata:
|
||||
type: object
|
||||
spec:
|
||||
description: |-
|
||||
Spec defines the desired characteristics of a group snapshot requested by a user.
|
||||
Required.
|
||||
properties:
|
||||
source:
|
||||
description: |-
|
||||
Source specifies where a group snapshot will be created from.
|
||||
This field is immutable after creation.
|
||||
Required.
|
||||
properties:
|
||||
selector:
|
||||
description: |-
|
||||
Selector is a label query over persistent volume claims that are to be
|
||||
grouped together for snapshotting.
|
||||
This labelSelector will be used to match the label added to a PVC.
|
||||
If the label is added or removed to a volume after a group snapshot
|
||||
is created, the existing group snapshots won't be modified.
|
||||
Once a VolumeGroupSnapshotContent is created and the sidecar starts to process
|
||||
it, the volume list will not change with retries.
|
||||
properties:
|
||||
matchExpressions:
|
||||
description: matchExpressions is a list of label selector
|
||||
requirements. The requirements are ANDed.
|
||||
items:
|
||||
description: |-
|
||||
A label selector requirement is a selector that contains values, a key, and an operator that
|
||||
relates the key and values.
|
||||
properties:
|
||||
key:
|
||||
description: key is the label key that the selector
|
||||
applies to.
|
||||
type: string
|
||||
operator:
|
||||
description: |-
|
||||
operator represents a key's relationship to a set of values.
|
||||
Valid operators are In, NotIn, Exists and DoesNotExist.
|
||||
type: string
|
||||
values:
|
||||
description: |-
|
||||
values is an array of string values. If the operator is In or NotIn,
|
||||
the values array must be non-empty. If the operator is Exists or DoesNotExist,
|
||||
the values array must be empty. This array is replaced during a strategic
|
||||
merge patch.
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
x-kubernetes-list-type: atomic
|
||||
required:
|
||||
- key
|
||||
- operator
|
||||
type: object
|
||||
type: array
|
||||
x-kubernetes-list-type: atomic
|
||||
matchLabels:
|
||||
additionalProperties:
|
||||
type: string
|
||||
description: |-
|
||||
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
|
||||
map is equivalent to an element of matchExpressions, whose key field is "key", the
|
||||
operator is "In", and the values array contains only "value". The requirements are ANDed.
|
||||
type: object
|
||||
type: object
|
||||
x-kubernetes-map-type: atomic
|
||||
x-kubernetes-validations:
|
||||
- message: selector is immutable
|
||||
rule: self == oldSelf
|
||||
volumeGroupSnapshotContentName:
|
||||
description: |-
|
||||
VolumeGroupSnapshotContentName specifies the name of a pre-existing VolumeGroupSnapshotContent
|
||||
object representing an existing volume group snapshot.
|
||||
This field should be set if the volume group snapshot already exists and
|
||||
only needs a representation in Kubernetes.
|
||||
This field is immutable.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: volumeGroupSnapshotContentName is immutable
|
||||
rule: self == oldSelf
|
||||
type: object
|
||||
x-kubernetes-validations:
|
||||
- message: selector is required once set
|
||||
rule: '!has(oldSelf.selector) || has(self.selector)'
|
||||
- message: volumeGroupSnapshotContentName is required once set
|
||||
rule: '!has(oldSelf.volumeGroupSnapshotContentName) || has(self.volumeGroupSnapshotContentName)'
|
||||
- message: exactly one of selector and volumeGroupSnapshotContentName
|
||||
must be set
|
||||
rule: (has(self.selector) && !has(self.volumeGroupSnapshotContentName))
|
||||
|| (!has(self.selector) && has(self.volumeGroupSnapshotContentName))
|
||||
volumeGroupSnapshotClassName:
|
||||
description: |-
|
||||
VolumeGroupSnapshotClassName is the name of the VolumeGroupSnapshotClass
|
||||
requested by the VolumeGroupSnapshot.
|
||||
VolumeGroupSnapshotClassName may be left nil to indicate that the default
|
||||
class will be used.
|
||||
Empty string is not allowed for this field.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: volumeGroupSnapshotClassName must not be the empty string
|
||||
when set
|
||||
rule: size(self) > 0
|
||||
required:
|
||||
- source
|
||||
type: object
|
||||
status:
|
||||
description: |-
|
||||
Status represents the current information of a group snapshot.
|
||||
Consumers must verify binding between VolumeGroupSnapshot and
|
||||
VolumeGroupSnapshotContent objects is successful (by validating that both
|
||||
VolumeGroupSnapshot and VolumeGroupSnapshotContent point to each other) before
|
||||
using this object.
|
||||
properties:
|
||||
boundVolumeGroupSnapshotContentName:
|
||||
description: |-
|
||||
BoundVolumeGroupSnapshotContentName is the name of the VolumeGroupSnapshotContent
|
||||
object to which this VolumeGroupSnapshot object intends to bind to.
|
||||
If not specified, it indicates that the VolumeGroupSnapshot object has not
|
||||
been successfully bound to a VolumeGroupSnapshotContent object yet.
|
||||
NOTE: To avoid possible security issues, consumers must verify binding between
|
||||
VolumeGroupSnapshot and VolumeGroupSnapshotContent objects is successful
|
||||
(by validating that both VolumeGroupSnapshot and VolumeGroupSnapshotContent
|
||||
point at each other) before using this object.
|
||||
type: string
|
||||
x-kubernetes-validations:
|
||||
- message: boundVolumeGroupSnapshotContentName is immutable once set
|
||||
rule: self == oldSelf
|
||||
creationTime:
|
||||
description: |-
|
||||
CreationTime is the timestamp when the point-in-time group snapshot is taken
|
||||
by the underlying storage system.
|
||||
If not specified, it may indicate that the creation time of the group snapshot
|
||||
is unknown.
|
||||
This field is updated based on the CreationTime field in VolumeGroupSnapshotContentStatus
|
||||
format: date-time
|
||||
type: string
|
||||
error:
|
||||
description: |-
|
||||
Error is the last observed error during group snapshot creation, if any.
|
||||
This field could be helpful to upper level controllers (i.e., application
|
||||
controller) to decide whether they should continue on waiting for the group
|
||||
snapshot to be created based on the type of error reported.
|
||||
The snapshot controller will keep retrying when an error occurs during the
|
||||
group snapshot creation. Upon success, this error field will be cleared.
|
||||
properties:
|
||||
message:
|
||||
description: |-
|
||||
message is a string detailing the encountered error during snapshot
|
||||
creation if specified.
|
||||
NOTE: message may be logged, and it should not contain sensitive
|
||||
information.
|
||||
type: string
|
||||
time:
|
||||
description: time is the timestamp when the error was encountered.
|
||||
format: date-time
|
||||
type: string
|
||||
type: object
|
||||
readyToUse:
|
||||
description: |-
|
||||
ReadyToUse indicates if all the individual snapshots in the group are ready
|
||||
to be used to restore a group of volumes.
|
||||
ReadyToUse becomes true when ReadyToUse of all individual snapshots become true.
|
||||
If not specified, it means the readiness of a group snapshot is unknown.
|
||||
type: boolean
|
||||
type: object
|
||||
required:
|
||||
- spec
|
||||
type: object
|
||||
served: true
|
||||
storage: true
|
||||
subresources:
|
||||
status: {}
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ spec:
|
|||
name: socket-dir
|
||||
|
||||
- name: csi-snapshotter
|
||||
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.3.0
|
||||
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0
|
||||
args:
|
||||
- -v=5
|
||||
- --csi-address=/csi/csi.sock
|
||||
|
|
|
|||
|
|
@ -240,13 +240,12 @@ run_tests() {
|
|||
export KUBE_CONTAINER_RUNTIME=remote
|
||||
export KUBE_CONTAINER_RUNTIME_ENDPOINT=unix:///run/containerd/containerd.sock
|
||||
export KUBE_CONTAINER_RUNTIME_NAME=containerd
|
||||
export SNAPSHOTTER_VERSION="${SNAPSHOTTER_VERSION:-v8.3.0}"
|
||||
export SNAPSHOTTER_VERSION="${SNAPSHOTTER_VERSION:-v8.4.0}"
|
||||
echo "SNAPSHOTTER_VERSION is $SNAPSHOTTER_VERSION"
|
||||
# ginkgo can take forever to exit, so we run it in the background and save the
|
||||
# PID, bash will not run traps while waiting on a process, but it will while
|
||||
# running a builtin like `wait`, saving the PID also allows us to forward the
|
||||
# interrupt
|
||||
|
||||
|
||||
# Enable VolumeGroupSnapshot tests in csi-driver-hostpath
|
||||
export CSI_PROW_ENABLE_GROUP_SNAPSHOT=true
|
||||
|
||||
kubectl apply -f ./cluster/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml || exit 1
|
||||
kubectl apply -f ./cluster/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml || exit 1
|
||||
kubectl apply -f ./cluster/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshots.yaml || exit 1
|
||||
|
|
@ -261,6 +260,10 @@ sed "s|image: registry.k8s.io/sig-storage/snapshot-controller:.*|image: registry
|
|||
kubectl apply -f - || exit 1
|
||||
|
||||
|
||||
# ginkgo can take forever to exit, so we run it in the background and save the
|
||||
# PID, bash will not run traps while waiting on a process, but it will while
|
||||
# running a builtin like `wait`, saving the PID also allows us to forward the
|
||||
# interrupt
|
||||
./hack/ginkgo-e2e.sh \
|
||||
'--provider=skeleton' "--num-nodes=${NUM_NODES}" \
|
||||
"--ginkgo.focus=${FOCUS}" "--ginkgo.skip=${SKIP}" "--ginkgo.label-filter=${LABEL_FILTER}" \
|
||||
|
|
|
|||
Loading…
Reference in a new issue