Skip to content

Commit 8a5cf7b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#129488 from Madhu-1/vs-v1
Update snapshot CRDs to v1 in cluster addons
2 parents 728a4d2 + 8d79998 commit 8a5cf7b

File tree

4 files changed

+883
-775
lines changed

4 files changed

+883
-775
lines changed

‎cluster/addons/volumesnapshots/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml‎

Lines changed: 119 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ metadata:
55
labels:
66
addonmanager.kubernetes.io/mode: Reconcile
77
annotations:
8-
controller-gen.kubebuilder.io/version: v0.8.0
9-
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/665"
10-
creationTimestamp: null
8+
api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/814"
9+
controller-gen.kubebuilder.io/version: v0.15.0
1110
name: volumesnapshotclasses.snapshot.storage.k8s.io
1211
spec:
1312
group: snapshot.storage.k8s.io
@@ -16,118 +15,128 @@ spec:
1615
listKind: VolumeSnapshotClassList
1716
plural: volumesnapshotclasses
1817
shortNames:
19-
- vsclass
20-
- vsclasses
18+
- vsclass
19+
- vsclasses
2120
singular: volumesnapshotclass
2221
scope: Cluster
2322
versions:
24-
- additionalPrinterColumns:
25-
- jsonPath: .driver
26-
name: Driver
27-
type: string
28-
- description: Determines whether a VolumeSnapshotContent created through the
29-
VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted.
30-
jsonPath: .deletionPolicy
31-
name: DeletionPolicy
32-
type: string
33-
- jsonPath: .metadata.creationTimestamp
34-
name: Age
35-
type: date
36-
name: v1
37-
schema:
38-
openAPIV3Schema:
39-
description: VolumeSnapshotClass specifies parameters that a underlying storage
40-
system uses when creating a volume snapshot. A specific VolumeSnapshotClass
41-
is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses
42-
are non-namespaced
43-
properties:
44-
apiVersion:
45-
description: 'APIVersion defines the versioned schema of this representation
46-
of an object. Servers should convert recognized schemas to the latest
47-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
- additionalPrinterColumns:
24+
- jsonPath: .driver
25+
name: Driver
26+
type: string
27+
- description: Determines whether a VolumeSnapshotContent created through the
28+
VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted.
29+
jsonPath: .deletionPolicy
30+
name: DeletionPolicy
31+
type: string
32+
- jsonPath: .metadata.creationTimestamp
33+
name: Age
34+
type: date
35+
name: v1
36+
schema:
37+
openAPIV3Schema:
38+
description: |-
39+
VolumeSnapshotClass specifies parameters that a underlying storage system uses when
40+
creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its
41+
name in a VolumeSnapshot object.
42+
VolumeSnapshotClasses are non-namespaced
43+
properties:
44+
apiVersion:
45+
description: |-
46+
APIVersion defines the versioned schema of this representation of an object.
47+
Servers should convert recognized schemas to the latest internal value, and
48+
may reject unrecognized values.
49+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
50+
type: string
51+
deletionPolicy:
52+
description: |-
53+
deletionPolicy determines whether a VolumeSnapshotContent created through
54+
the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted.
55+
Supported values are "Retain" and "Delete".
56+
"Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept.
57+
"Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted.
58+
Required.
59+
enum:
60+
- Delete
61+
- Retain
62+
type: string
63+
driver:
64+
description: |-
65+
driver is the name of the storage driver that handles this VolumeSnapshotClass.
66+
Required.
67+
type: string
68+
kind:
69+
description: |-
70+
Kind is a string value representing the REST resource this object represents.
71+
Servers may infer this from the endpoint the client submits requests to.
72+
Cannot be updated.
73+
In CamelCase.
74+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
75+
type: string
76+
metadata:
77+
type: object
78+
parameters:
79+
additionalProperties:
4880
type: string
49-
deletionPolicy:
50-
description: deletionPolicy determines whether a VolumeSnapshotContent
51-
created through the VolumeSnapshotClass should be deleted when its bound
52-
VolumeSnapshot is deleted. Supported values are "Retain" and "Delete".
53-
"Retain" means that the VolumeSnapshotContent and its physical snapshot
54-
on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent
55-
and its physical snapshot on underlying storage system are deleted.
56-
Required.
57-
enum:
58-
- Delete
59-
- Retain
81+
description: |-
82+
parameters is a key-value map with storage driver specific parameters for creating snapshots.
83+
These values are opaque to Kubernetes.
84+
type: object
85+
required:
86+
- deletionPolicy
87+
- driver
88+
type: object
89+
served: true
90+
storage: true
91+
subresources: {}
92+
- additionalPrinterColumns:
93+
- jsonPath: .driver
94+
name: Driver
95+
type: string
96+
- description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted.
97+
jsonPath: .deletionPolicy
98+
name: DeletionPolicy
99+
type: string
100+
- jsonPath: .metadata.creationTimestamp
101+
name: Age
102+
type: date
103+
name: v1beta1
104+
# This indicates the v1beta1 version of the custom resource is deprecated.
105+
# API requests to this version receive a warning in the server response.
106+
deprecated: true
107+
# This overrides the default warning returned to clients making v1beta1 API requests.
108+
deprecationWarning: "snapshot.storage.k8s.io/v1beta1 VolumeSnapshotClass is deprecated; use snapshot.storage.k8s.io/v1 VolumeSnapshotClass"
109+
schema:
110+
openAPIV3Schema:
111+
description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced
112+
properties:
113+
apiVersion:
114+
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'
115+
type: string
116+
deletionPolicy:
117+
description: deletionPolicy determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. Required.
118+
enum:
119+
- Delete
120+
- Retain
121+
type: string
122+
driver:
123+
description: driver is the name of the storage driver that handles this VolumeSnapshotClass. Required.
124+
type: string
125+
kind:
126+
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'
127+
type: string
128+
parameters:
129+
additionalProperties:
60130
type: string
61-
driver:
62-
description: driver is the name of the storage driver that handles this
63-
VolumeSnapshotClass. Required.
64-
type: string
65-
kind:
66-
description: 'Kind is a string value representing the REST resource this
67-
object represents. Servers may infer this from the endpoint the client
68-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
69-
type: string
70-
parameters:
71-
additionalProperties:
72-
type: string
73-
description: parameters is a key-value map with storage driver specific
74-
parameters for creating snapshots. These values are opaque to Kubernetes.
75-
type: object
76-
required:
77-
- deletionPolicy
78-
- driver
79-
type: object
80-
served: true
81-
storage: true
82-
subresources: {}
83-
- additionalPrinterColumns:
84-
- jsonPath: .driver
85-
name: Driver
86-
type: string
87-
- description: Determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted.
88-
jsonPath: .deletionPolicy
89-
name: DeletionPolicy
90-
type: string
91-
- jsonPath: .metadata.creationTimestamp
92-
name: Age
93-
type: date
94-
name: v1beta1
95-
# This indicates the v1beta1 version of the custom resource is deprecated.
96-
# API requests to this version receive a warning in the server response.
97-
deprecated: true
98-
# This overrides the default warning returned to clients making v1beta1 API requests.
99-
deprecationWarning: "snapshot.storage.k8s.io/v1beta1 VolumeSnapshotClass is deprecated; use snapshot.storage.k8s.io/v1 VolumeSnapshotClass"
100-
schema:
101-
openAPIV3Schema:
102-
description: VolumeSnapshotClass specifies parameters that a underlying storage system uses when creating a volume snapshot. A specific VolumeSnapshotClass is used by specifying its name in a VolumeSnapshot object. VolumeSnapshotClasses are non-namespaced
103-
properties:
104-
apiVersion:
105-
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'
106-
type: string
107-
deletionPolicy:
108-
description: deletionPolicy determines whether a VolumeSnapshotContent created through the VolumeSnapshotClass should be deleted when its bound VolumeSnapshot is deleted. Supported values are "Retain" and "Delete". "Retain" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are kept. "Delete" means that the VolumeSnapshotContent and its physical snapshot on underlying storage system are deleted. Required.
109-
enum:
110-
- Delete
111-
- Retain
112-
type: string
113-
driver:
114-
description: driver is the name of the storage driver that handles this VolumeSnapshotClass. Required.
115-
type: string
116-
kind:
117-
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'
118-
type: string
119-
parameters:
120-
additionalProperties:
121-
type: string
122-
description: parameters is a key-value map with storage driver specific parameters for creating snapshots. These values are opaque to Kubernetes.
123-
type: object
124-
required:
125-
- deletionPolicy
126-
- driver
127-
type: object
128-
served: false
129-
storage: false
130-
subresources: {}
131+
description: parameters is a key-value map with storage driver specific parameters for creating snapshots. These values are opaque to Kubernetes.
132+
type: object
133+
required:
134+
- deletionPolicy
135+
- driver
136+
type: object
137+
served: false
138+
storage: false
139+
subresources: {}
131140
status:
132141
acceptedNames:
133142
kind: ""

0 commit comments

Comments
 (0)