Skip to content

K
k3s
Unverified Commit 2815ca4e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #59157 from vladimirvivien/csi-volsource-beta

Automatic merge from submit-queue (batch tested with PRs 59052, 59157, 59428, 59949, 60151). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Marking CSIPersistentVolumeSource as Beta **What this PR does / why we need it**: This PR marks the `CSIPersistentVolumeSource` type as being `Beta` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #58718 ```release-note Move CSI PersistentVolumes to Beta ```
parents aa989176 b5deaf61
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
api/openapi-spec/swagger.json
View file @ 2815ca4e
...@@ -75223,7 +75223,7 @@ ...@@ -75223,7 +75223,7 @@
] ]
}, },
"io.k8s.api.core.v1.CSIPersistentVolumeSource": { "io.k8s.api.core.v1.CSIPersistentVolumeSource": {
"description": "Represents storage that is managed by an external CSI volume driver", "description": "Represents storage that is managed by an external CSI volume driver (Beta feature)",
"required": [ "required": [
"driver", "driver",
"volumeHandle" "volumeHandle"
...@@ -77748,7 +77748,7 @@ ...@@ -77748,7 +77748,7 @@
"$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference" "$ref": "#/definitions/io.k8s.api.core.v1.ObjectReference"
}, },
"csi": { "csi": {
"description": "CSI represents storage that handled by an external CSI driver", "description": "CSI represents storage that handled by an external CSI driver (Beta feature).",
"$ref": "#/definitions/io.k8s.api.core.v1.CSIPersistentVolumeSource" "$ref": "#/definitions/io.k8s.api.core.v1.CSIPersistentVolumeSource"
}, },
"fc": { "fc": {
api/swagger-spec/v1.json
View file @ 2815ca4e
...@@ -19299,7 +19299,7 @@ ...@@ -19299,7 +19299,7 @@
}, },
"csi": { "csi": {
"$ref": "v1.CSIPersistentVolumeSource", "$ref": "v1.CSIPersistentVolumeSource",
"description": "CSI represents storage that handled by an external CSI driver" "description": "CSI represents storage that handled by an external CSI driver (Beta feature)."
}, },
"accessModes": { "accessModes": {
"type": "array", "type": "array",
...@@ -19959,7 +19959,7 @@ ...@@ -19959,7 +19959,7 @@
}, },
"v1.CSIPersistentVolumeSource": { "v1.CSIPersistentVolumeSource": {
"id": "v1.CSIPersistentVolumeSource", "id": "v1.CSIPersistentVolumeSource",
"description": "Represents storage that is managed by an external CSI volume driver", "description": "Represents storage that is managed by an external CSI volume driver (Beta feature)",
"required": [ "required": [
"driver", "driver",
"volumeHandle" "volumeHandle"
......
docs/api-reference/v1/definitions.html
View file @ 2815ca4e
...@@ -4164,7 +4164,7 @@ Examples:<br> ...@@ -4164,7 +4164,7 @@ Examples:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">csi</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">csi</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">CSI represents storage that handled by an external CSI driver</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">CSI represents storage that handled by an external CSI driver (Beta feature).</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_csipersistentvolumesource">v1.CSIPersistentVolumeSource</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_csipersistentvolumesource">v1.CSIPersistentVolumeSource</a></p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
...@@ -7830,7 +7830,7 @@ Examples:<br> ...@@ -7830,7 +7830,7 @@ Examples:<br>
<div class="sect2"> <div class="sect2">
<h3 id="_v1_csipersistentvolumesource">v1.CSIPersistentVolumeSource</h3> <h3 id="_v1_csipersistentvolumesource">v1.CSIPersistentVolumeSource</h3>
<div class="paragraph"> <div class="paragraph">
<p>Represents storage that is managed by an external CSI volume driver</p> <p>Represents storage that is managed by an external CSI volume driver (Beta feature)</p>
</div> </div>
<table class="tableblock frame-all grid-all" style="width:100%; "> <table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup> <colgroup>
......
pkg/apis/core/types.go
View file @ 2815ca4e
...@@ -391,7 +391,7 @@ type PersistentVolumeSource struct { ...@@ -391,7 +391,7 @@ type PersistentVolumeSource struct {
// More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md // More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md
// +optional // +optional
StorageOS *StorageOSPersistentVolumeSource StorageOS *StorageOSPersistentVolumeSource
// CSI (Container Storage Interface) represents storage that handled by an external CSI driver // CSI (Container Storage Interface) represents storage that handled by an external CSI driver (Beta feature).
// +optional // +optional
CSI *CSIPersistentVolumeSource CSI *CSIPersistentVolumeSource
} }
...@@ -1613,7 +1613,7 @@ type LocalVolumeSource struct { ...@@ -1613,7 +1613,7 @@ type LocalVolumeSource struct {
Path string Path string
} }
// Represents storage that is managed by an external CSI volume driver // Represents storage that is managed by an external CSI volume driver (Beta feature)
type CSIPersistentVolumeSource struct { type CSIPersistentVolumeSource struct {
// Driver is the name of the driver to use for this volume. // Driver is the name of the driver to use for this volume.
// Required. // Required.
......
staging/src/k8s.io/api/core/v1/generated.proto
View file @ 2815ca4e
...@@ -170,7 +170,7 @@ message Binding { ...@@ -170,7 +170,7 @@ message Binding {
optional ObjectReference target = 2; optional ObjectReference target = 2;
} }
// Represents storage that is managed by an external CSI volume driver // Represents storage that is managed by an external CSI volume driver (Beta feature)
message CSIPersistentVolumeSource { message CSIPersistentVolumeSource {
// Driver is the name of the driver to use for this volume. // Driver is the name of the driver to use for this volume.
// Required. // Required.
...@@ -2528,7 +2528,7 @@ message PersistentVolumeSource { ...@@ -2528,7 +2528,7 @@ message PersistentVolumeSource {
// +optional // +optional
optional StorageOSPersistentVolumeSource storageos = 21; optional StorageOSPersistentVolumeSource storageos = 21;
// CSI represents storage that handled by an external CSI driver // CSI represents storage that handled by an external CSI driver (Beta feature).
// +optional // +optional
optional CSIPersistentVolumeSource csi = 22; optional CSIPersistentVolumeSource csi = 22;
} }
......
staging/src/k8s.io/api/core/v1/types.go
View file @ 2815ca4e
...@@ -446,7 +446,7 @@ type PersistentVolumeSource struct { ...@@ -446,7 +446,7 @@ type PersistentVolumeSource struct {
// More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md // More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md
// +optional // +optional
StorageOS *StorageOSPersistentVolumeSource `json:"storageos,omitempty" protobuf:"bytes,21,opt,name=storageos"` StorageOS *StorageOSPersistentVolumeSource `json:"storageos,omitempty" protobuf:"bytes,21,opt,name=storageos"`
// CSI represents storage that handled by an external CSI driver // CSI represents storage that handled by an external CSI driver (Beta feature).
// +optional // +optional
CSI *CSIPersistentVolumeSource `json:"csi,omitempty" protobuf:"bytes,22,opt,name=csi"` CSI *CSIPersistentVolumeSource `json:"csi,omitempty" protobuf:"bytes,22,opt,name=csi"`
} }
...@@ -1727,7 +1727,7 @@ type LocalVolumeSource struct { ...@@ -1727,7 +1727,7 @@ type LocalVolumeSource struct {
Path string `json:"path" protobuf:"bytes,1,opt,name=path"` Path string `json:"path" protobuf:"bytes,1,opt,name=path"`
} }
// Represents storage that is managed by an external CSI volume driver // Represents storage that is managed by an external CSI volume driver (Beta feature)
type CSIPersistentVolumeSource struct { type CSIPersistentVolumeSource struct {
// Driver is the name of the driver to use for this volume. // Driver is the name of the driver to use for this volume.
// Required. // Required.
......
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go
View file @ 2815ca4e
...@@ -117,7 +117,7 @@ func (Binding) SwaggerDoc() map[string]string { ...@@ -117,7 +117,7 @@ func (Binding) SwaggerDoc() map[string]string {
} }
var map_CSIPersistentVolumeSource = map[string]string{ var map_CSIPersistentVolumeSource = map[string]string{
"": "Represents storage that is managed by an external CSI volume driver", "": "Represents storage that is managed by an external CSI volume driver (Beta feature)",
"driver": "Driver is the name of the driver to use for this volume. Required.", "driver": "Driver is the name of the driver to use for this volume. Required.",
"volumeHandle": "VolumeHandle is the unique volume name returned by the CSI volume plugin’s CreateVolume to refer to the volume on all subsequent calls. Required.", "volumeHandle": "VolumeHandle is the unique volume name returned by the CSI volume plugin’s CreateVolume to refer to the volume on all subsequent calls. Required.",
"readOnly": "Optional: The value to pass to ControllerPublishVolumeRequest. Defaults to false (read/write).", "readOnly": "Optional: The value to pass to ControllerPublishVolumeRequest. Defaults to false (read/write).",
...@@ -1276,7 +1276,7 @@ var map_PersistentVolumeSource = map[string]string{ ...@@ -1276,7 +1276,7 @@ var map_PersistentVolumeSource = map[string]string{
"scaleIO": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.", "scaleIO": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.",
"local": "Local represents directly-attached storage with node affinity", "local": "Local represents directly-attached storage with node affinity",
"storageos": "StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md", "storageos": "StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md",
"csi": "CSI represents storage that handled by an external CSI driver", "csi": "CSI represents storage that handled by an external CSI driver (Beta feature).",
} }
func (PersistentVolumeSource) SwaggerDoc() map[string]string { func (PersistentVolumeSource) SwaggerDoc() map[string]string {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment