Merge pull request #62523 from wackxu/ldoc

Automatic merge from submit-queue (batch tested with PRs 59592, 62308, 62523, 62635, 62243). 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>.

 update comments for local volume

**What this PR does / why we need it**:

**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 # https://github.com/kubernetes/kubernetes/issues/62278

**Special notes for your reviewer**:
/assign @jsafrane @msau42 

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-19 14:50:21 -07:00 committed by GitHub
commit a95d9f0e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 20 deletions

View File

@ -77022,13 +77022,13 @@
} }
}, },
"io.k8s.api.core.v1.LocalVolumeSource": { "io.k8s.api.core.v1.LocalVolumeSource": {
"description": "Local represents directly-attached storage with node affinity", "description": "Local represents directly-attached storage with node affinity (Beta feature)",
"required": [ "required": [
"path" "path"
], ],
"properties": { "properties": {
"path": { "path": {
"description": "The full path to the volume on the node For alpha, this path must be a directory Once block as a source is supported, then this path can point to a block device", "description": "The full path to the volume on the node. It can be either a directory or block device (disk, partition, ...). Directories can be represented only by PersistentVolume with VolumeMode=Filesystem. Block devices can be represented only by VolumeMode=Block, which also requires the BlockVolume alpha feature gate to be enabled.",
"type": "string" "type": "string"
} }
} }

View File

@ -19949,14 +19949,14 @@
}, },
"v1.LocalVolumeSource": { "v1.LocalVolumeSource": {
"id": "v1.LocalVolumeSource", "id": "v1.LocalVolumeSource",
"description": "Local represents directly-attached storage with node affinity", "description": "Local represents directly-attached storage with node affinity (Beta feature)",
"required": [ "required": [
"path" "path"
], ],
"properties": { "properties": {
"path": { "path": {
"type": "string", "type": "string",
"description": "The full path to the volume on the node For alpha, this path must be a directory Once block as a source is supported, then this path can point to a block device" "description": "The full path to the volume on the node. It can be either a directory or block device (disk, partition, ...). Directories can be represented only by PersistentVolume with VolumeMode=Filesystem. Block devices can be represented only by VolumeMode=Block, which also requires the BlockVolume alpha feature gate to be enabled."
} }
} }
}, },

View File

@ -6491,7 +6491,7 @@ Examples:<br>
<div class="sect2"> <div class="sect2">
<h3 id="_v1_localvolumesource">v1.LocalVolumeSource</h3> <h3 id="_v1_localvolumesource">v1.LocalVolumeSource</h3>
<div class="paragraph"> <div class="paragraph">
<p>Local represents directly-attached storage with node affinity</p> <p>Local represents directly-attached storage with node affinity (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>
@ -6513,7 +6513,7 @@ Examples:<br>
<tbody> <tbody>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">path</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">path</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The full path to the volume on the node For alpha, this path must be a directory Once block as a source is supported, then this path can point to a block device</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">The full path to the volume on the node. It can be either a directory or block device (disk, partition, &#8230;). Directories can be represented only by PersistentVolume with VolumeMode=Filesystem. Block devices can be represented only by VolumeMode=Block, which also requires the BlockVolume alpha feature gate to be enabled.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>

View File

@ -1434,11 +1434,13 @@ type KeyToPath struct {
Mode *int32 Mode *int32
} }
// Local represents directly-attached storage with node affinity // Local represents directly-attached storage with node affinity (Beta feature)
type LocalVolumeSource struct { type LocalVolumeSource struct {
// The full path to the volume on the node // The full path to the volume on the node.
// For alpha, this path must be a directory // It can be either a directory or block device (disk, partition, ...).
// Once block as a source is supported, then this path can point to a block device // Directories can be represented only by PersistentVolume with VolumeMode=Filesystem.
// Block devices can be represented only by VolumeMode=Block, which also requires the
// BlockVolume alpha feature gate to be enabled.
Path string Path string
} }

View File

@ -1659,11 +1659,13 @@ message LocalObjectReference {
optional string name = 1; optional string name = 1;
} }
// Local represents directly-attached storage with node affinity // Local represents directly-attached storage with node affinity (Beta feature)
message LocalVolumeSource { message LocalVolumeSource {
// The full path to the volume on the node // The full path to the volume on the node.
// For alpha, this path must be a directory // It can be either a directory or block device (disk, partition, ...).
// Once block as a source is supported, then this path can point to a block device // Directories can be represented only by PersistentVolume with VolumeMode=Filesystem.
// Block devices can be represented only by VolumeMode=Block, which also requires the
// BlockVolume alpha feature gate to be enabled.
optional string path = 1; optional string path = 1;
} }

View File

@ -1513,11 +1513,13 @@ type KeyToPath struct {
Mode *int32 `json:"mode,omitempty" protobuf:"varint,3,opt,name=mode"` Mode *int32 `json:"mode,omitempty" protobuf:"varint,3,opt,name=mode"`
} }
// Local represents directly-attached storage with node affinity // Local represents directly-attached storage with node affinity (Beta feature)
type LocalVolumeSource struct { type LocalVolumeSource struct {
// The full path to the volume on the node // The full path to the volume on the node.
// For alpha, this path must be a directory // It can be either a directory or block device (disk, partition, ...).
// Once block as a source is supported, then this path can point to a block device // Directories can be represented only by PersistentVolume with VolumeMode=Filesystem.
// Block devices can be represented only by VolumeMode=Block, which also requires the
// BlockVolume alpha feature gate to be enabled.
Path string `json:"path" protobuf:"bytes,1,opt,name=path"` Path string `json:"path" protobuf:"bytes,1,opt,name=path"`
} }

View File

@ -865,8 +865,8 @@ func (LocalObjectReference) SwaggerDoc() map[string]string {
} }
var map_LocalVolumeSource = map[string]string{ var map_LocalVolumeSource = map[string]string{
"": "Local represents directly-attached storage with node affinity", "": "Local represents directly-attached storage with node affinity (Beta feature)",
"path": "The full path to the volume on the node For alpha, this path must be a directory Once block as a source is supported, then this path can point to a block device", "path": "The full path to the volume on the node. It can be either a directory or block device (disk, partition, ...). Directories can be represented only by PersistentVolume with VolumeMode=Filesystem. Block devices can be represented only by VolumeMode=Block, which also requires the BlockVolume alpha feature gate to be enabled.",
} }
func (LocalVolumeSource) SwaggerDoc() map[string]string { func (LocalVolumeSource) SwaggerDoc() map[string]string {