Skip to content

K
k3s
Commit 40c97ddd authored by Jan Safranek's avatar Jan Safranek
Browse files
Options

Remove validation of *VolumeSource.FSType.

Most volume plugins use SafeFormatAndMount, which uses ext4 by default. FlexVolume plugin has FSType attribute 'omitempty', so reflect it in the description of the type.
parent 318705fe
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 173 deletions
api/swagger-spec/v1.json
View file @ 40c97ddd
...@@ -14939,8 +14939,7 @@ ...@@ -14939,8 +14939,7 @@
"id": "v1.GCEPersistentDiskVolumeSource", "id": "v1.GCEPersistentDiskVolumeSource",
"description": "Represents a Persistent Disk resource in Google Compute Engine.\n\nA GCE PD must exist and be formatted before mounting to a container. The disk must also be in the same GCE project and zone as the kubelet. A GCE PD can only be mounted as read/write once. GCE PDs support ownership management and SELinux relabeling.", "description": "Represents a Persistent Disk resource in Google Compute Engine.\n\nA GCE PD must exist and be formatted before mounting to a container. The disk must also be in the same GCE project and zone as the kubelet. A GCE PD can only be mounted as read/write once. GCE PDs support ownership management and SELinux relabeling.",
"required": [ "required": [
"pdName", "pdName"
"fsType"
], ],
"properties": { "properties": {
"pdName": { "pdName": {
...@@ -14949,7 +14948,7 @@ ...@@ -14949,7 +14948,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk"
}, },
"partition": { "partition": {
"type": "integer", "type": "integer",
...@@ -14966,8 +14965,7 @@ ...@@ -14966,8 +14965,7 @@
"id": "v1.AWSElasticBlockStoreVolumeSource", "id": "v1.AWSElasticBlockStoreVolumeSource",
"description": "Represents a Persistent Disk resource in AWS.\n\nAn AWS EBS disk must exist and be formatted before mounting to a container. The disk must also be in the same AWS zone as the kubelet. An AWS EBS disk can only be mounted as read/write once. AWS EBS volumes support ownership management and SELinux relabeling.", "description": "Represents a Persistent Disk resource in AWS.\n\nAn AWS EBS disk must exist and be formatted before mounting to a container. The disk must also be in the same AWS zone as the kubelet. An AWS EBS disk can only be mounted as read/write once. AWS EBS volumes support ownership management and SELinux relabeling.",
"required": [ "required": [
"volumeID", "volumeID"
"fsType"
], ],
"properties": { "properties": {
"volumeID": { "volumeID": {
...@@ -14976,7 +14974,7 @@ ...@@ -14976,7 +14974,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore"
}, },
"partition": { "partition": {
"type": "integer", "type": "integer",
...@@ -15071,7 +15069,7 @@ ...@@ -15071,7 +15069,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd"
}, },
"pool": { "pool": {
"type": "string", "type": "string",
...@@ -15111,8 +15109,7 @@ ...@@ -15111,8 +15109,7 @@
"required": [ "required": [
"targetPortal", "targetPortal",
"iqn", "iqn",
"lun", "lun"
"fsType"
], ],
"properties": { "properties": {
"targetPortal": { "targetPortal": {
...@@ -15134,7 +15131,7 @@ ...@@ -15134,7 +15131,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi"
}, },
"readOnly": { "readOnly": {
"type": "boolean", "type": "boolean",
...@@ -15155,7 +15152,7 @@ ...@@ -15155,7 +15152,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Only ext3 and ext4 are allowed More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md" "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md"
}, },
"readOnly": { "readOnly": {
"type": "boolean", "type": "boolean",
...@@ -15204,8 +15201,7 @@ ...@@ -15204,8 +15201,7 @@
"description": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.", "description": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.",
"required": [ "required": [
"targetWWNs", "targetWWNs",
"lun", "lun"
"fsType"
], ],
"properties": { "properties": {
"targetWWNs": { "targetWWNs": {
...@@ -15222,7 +15218,7 @@ ...@@ -15222,7 +15218,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\"" "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."
}, },
"readOnly": { "readOnly": {
"type": "boolean", "type": "boolean",
...@@ -15256,7 +15252,7 @@ ...@@ -15256,7 +15252,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\"" "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". The default filesystem depends on FlexVolume script."
}, },
"secretRef": { "secretRef": {
"$ref": "v1.LocalObjectReference", "$ref": "v1.LocalObjectReference",
......
api/swagger-spec/v1beta1.json
View file @ 40c97ddd
...@@ -4367,8 +4367,7 @@ ...@@ -4367,8 +4367,7 @@
"id": "v1.GCEPersistentDiskVolumeSource", "id": "v1.GCEPersistentDiskVolumeSource",
"description": "Represents a Persistent Disk resource in Google Compute Engine.\n\nA GCE PD must exist and be formatted before mounting to a container. The disk must also be in the same GCE project and zone as the kubelet. A GCE PD can only be mounted as read/write once. GCE PDs support ownership management and SELinux relabeling.", "description": "Represents a Persistent Disk resource in Google Compute Engine.\n\nA GCE PD must exist and be formatted before mounting to a container. The disk must also be in the same GCE project and zone as the kubelet. A GCE PD can only be mounted as read/write once. GCE PDs support ownership management and SELinux relabeling.",
"required": [ "required": [
"pdName", "pdName"
"fsType"
], ],
"properties": { "properties": {
"pdName": { "pdName": {
...@@ -4377,7 +4376,7 @@ ...@@ -4377,7 +4376,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk"
}, },
"partition": { "partition": {
"type": "integer", "type": "integer",
...@@ -4394,8 +4393,7 @@ ...@@ -4394,8 +4393,7 @@
"id": "v1.AWSElasticBlockStoreVolumeSource", "id": "v1.AWSElasticBlockStoreVolumeSource",
"description": "Represents a Persistent Disk resource in AWS.\n\nAn AWS EBS disk must exist and be formatted before mounting to a container. The disk must also be in the same AWS zone as the kubelet. An AWS EBS disk can only be mounted as read/write once. AWS EBS volumes support ownership management and SELinux relabeling.", "description": "Represents a Persistent Disk resource in AWS.\n\nAn AWS EBS disk must exist and be formatted before mounting to a container. The disk must also be in the same AWS zone as the kubelet. An AWS EBS disk can only be mounted as read/write once. AWS EBS volumes support ownership management and SELinux relabeling.",
"required": [ "required": [
"volumeID", "volumeID"
"fsType"
], ],
"properties": { "properties": {
"volumeID": { "volumeID": {
...@@ -4404,7 +4402,7 @@ ...@@ -4404,7 +4402,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore"
}, },
"partition": { "partition": {
"type": "integer", "type": "integer",
...@@ -4476,8 +4474,7 @@ ...@@ -4476,8 +4474,7 @@
"required": [ "required": [
"targetPortal", "targetPortal",
"iqn", "iqn",
"lun", "lun"
"fsType"
], ],
"properties": { "properties": {
"targetPortal": { "targetPortal": {
...@@ -4499,7 +4496,7 @@ ...@@ -4499,7 +4496,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi"
}, },
"readOnly": { "readOnly": {
"type": "boolean", "type": "boolean",
...@@ -4571,7 +4568,7 @@ ...@@ -4571,7 +4568,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd" "description": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd"
}, },
"pool": { "pool": {
"type": "string", "type": "string",
...@@ -4618,7 +4615,7 @@ ...@@ -4618,7 +4615,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\"" "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". The default filesystem depends on FlexVolume script."
}, },
"secretRef": { "secretRef": {
"$ref": "v1.LocalObjectReference", "$ref": "v1.LocalObjectReference",
...@@ -4647,7 +4644,7 @@ ...@@ -4647,7 +4644,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Only ext3 and ext4 are allowed More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md" "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md"
}, },
"readOnly": { "readOnly": {
"type": "boolean", "type": "boolean",
...@@ -4757,8 +4754,7 @@ ...@@ -4757,8 +4754,7 @@
"description": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.", "description": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.",
"required": [ "required": [
"targetWWNs", "targetWWNs",
"lun", "lun"
"fsType"
], ],
"properties": { "properties": {
"targetWWNs": { "targetWWNs": {
...@@ -4775,7 +4771,7 @@ ...@@ -4775,7 +4771,7 @@
}, },
"fsType": { "fsType": {
"type": "string", "type": "string",
"description": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\"" "description": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified."
}, },
"readOnly": { "readOnly": {
"type": "boolean", "type": "boolean",
......
docs/api-reference/extensions/v1beta1/definitions.html
View file @ 40c97ddd
...@@ -1053,8 +1053,8 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } ...@@ -1053,8 +1053,8 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs"</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.</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">false</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>
</tr> </tr>
...@@ -1224,8 +1224,8 @@ Examples:<br> ...@@ -1224,8 +1224,8 @@ Examples:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk</a></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">false</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>
</tr> </tr>
...@@ -2500,8 +2500,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i ...@@ -2500,8 +2500,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi</a></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">false</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>
</tr> </tr>
...@@ -2715,7 +2715,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i ...@@ -2715,7 +2715,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Only ext3 and ext4 are allowed More info: <a href="http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md">http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md">http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md</a></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">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>
...@@ -2862,8 +2862,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i ...@@ -2862,8 +2862,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore</a></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">false</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>
</tr> </tr>
...@@ -3338,7 +3338,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i ...@@ -3338,7 +3338,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs"</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.</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">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>
...@@ -4772,7 +4772,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i ...@@ -4772,7 +4772,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd</a></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">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>
......
docs/api-reference/v1/definitions.html
View file @ 40c97ddd
...@@ -1011,8 +1011,8 @@ Examples:<br> ...@@ -1011,8 +1011,8 @@ Examples:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk</a></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">false</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>
</tr> </tr>
...@@ -1993,8 +1993,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i ...@@ -1993,8 +1993,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi</a></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">false</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>
</tr> </tr>
...@@ -2729,7 +2729,7 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -2729,7 +2729,7 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs"</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.</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">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>
...@@ -4395,7 +4395,7 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -4395,7 +4395,7 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd</a></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">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>
...@@ -4656,8 +4656,8 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -4656,8 +4656,8 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs"</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.</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">false</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>
</tr> </tr>
...@@ -5782,7 +5782,7 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -5782,7 +5782,7 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Only ext3 and ext4 are allowed More info: <a href="http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md">http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md">http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md</a></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">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>
...@@ -5943,8 +5943,8 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -5943,8 +5943,8 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fsType</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore">http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore</a></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">false</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>
</tr> </tr>
......
pkg/api/types.generated.go
View file @ 40c97ddd
...@@ -9354,12 +9354,13 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -9354,12 +9354,13 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq610 [4]bool var yyq610 [4]bool
_, _, _ = yysep610, yyq610, yy2arr610 _, _, _ = yysep610, yyq610, yy2arr610
const yyr610 bool = false const yyr610 bool = false
yyq610[2] = x.FSType != ""
yyq610[3] = x.ReadOnly != false yyq610[3] = x.ReadOnly != false
var yynn610 int var yynn610 int
if yyr610 || yy2arr610 { if yyr610 || yy2arr610 {
r.EncodeArrayStart(4) r.EncodeArrayStart(4)
} else { } else {
yynn610 = 3 yynn610 = 2
for _, b := range yyq610 { for _, b := range yyq610 {
if b { if b {
yynn610++ yynn610++
...@@ -9426,21 +9427,27 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -9426,21 +9427,27 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr610 || yy2arr610 { if yyr610 || yy2arr610 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym620 := z.EncBinary() if yyq610[2] {
_ = yym620 yym620 := z.EncBinary()
if false { _ = yym620
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) r.EncodeString(codecSelferC_UTF81234, "")
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq610[2] {
r.EncodeString(codecSelferC_UTF81234, string("fsType")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fsType"))
yym621 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym621 yym621 := z.EncBinary()
if false { _ = yym621
} else { if false {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} }
} }
if yyr610 || yy2arr610 { if yyr610 || yy2arr610 {
pkg/api/types.go
View file @ 40c97ddd
...@@ -446,9 +446,9 @@ const ( ...@@ -446,9 +446,9 @@ const (
type GCEPersistentDiskVolumeSource struct { type GCEPersistentDiskVolumeSource struct {
// Unique name of the PD resource. Used to identify the disk in GCE // Unique name of the PD resource. Used to identify the disk in GCE
PDName string `json:"pdName"` PDName string `json:"pdName"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: Partition on the disk to mount. // Optional: Partition on the disk to mount.
...@@ -473,9 +473,9 @@ type ISCSIVolumeSource struct { ...@@ -473,9 +473,9 @@ type ISCSIVolumeSource struct {
Lun int `json:"lun,omitempty"` Lun int `json:"lun,omitempty"`
// Optional: Defaults to 'default' (tcp). iSCSI interface name that uses an iSCSI transport. // Optional: Defaults to 'default' (tcp). iSCSI interface name that uses an iSCSI transport.
ISCSIInterface string `json:"iscsiInterface,omitempty"` ISCSIInterface string `json:"iscsiInterface,omitempty"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: Defaults to false (read/write). ReadOnly here will force // Optional: Defaults to false (read/write). ReadOnly here will force
...@@ -491,11 +491,11 @@ type FCVolumeSource struct { ...@@ -491,11 +491,11 @@ type FCVolumeSource struct {
TargetWWNs []string `json:"targetWWNs"` TargetWWNs []string `json:"targetWWNs"`
// Required: FC target lun number // Required: FC target lun number
Lun *int `json:"lun"` Lun *int `json:"lun"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType"` FSType string `json:"fsType,omitempty"`
// Optional: Defaults to false (read/write). ReadOnly here will force // Optional: Defaults to false (read/write). ReadOnly here will force
// the ReadOnly setting in VolumeMounts. // the ReadOnly setting in VolumeMounts.
ReadOnly bool `json:"readOnly,omitempty"` ReadOnly bool `json:"readOnly,omitempty"`
...@@ -506,9 +506,9 @@ type FCVolumeSource struct { ...@@ -506,9 +506,9 @@ type FCVolumeSource struct {
type FlexVolumeSource struct { type FlexVolumeSource 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.
Driver string `json:"driver"` Driver string `json:"driver"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: SecretRef is reference to the authentication secret for User, default is empty. // Optional: SecretRef is reference to the authentication secret for User, default is empty.
SecretRef *LocalObjectReference `json:"secretRef,omitempty"` SecretRef *LocalObjectReference `json:"secretRef,omitempty"`
...@@ -528,9 +528,9 @@ type FlexVolumeSource struct { ...@@ -528,9 +528,9 @@ type FlexVolumeSource struct {
type AWSElasticBlockStoreVolumeSource struct { type AWSElasticBlockStoreVolumeSource struct {
// Unique id of the persistent disk resource. Used to identify the disk in AWS // Unique id of the persistent disk resource. Used to identify the disk in AWS
VolumeID string `json:"volumeID"` VolumeID string `json:"volumeID"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: Partition on the disk to mount. // Optional: Partition on the disk to mount.
...@@ -603,9 +603,9 @@ type RBDVolumeSource struct { ...@@ -603,9 +603,9 @@ type RBDVolumeSource struct {
CephMonitors []string `json:"monitors"` CephMonitors []string `json:"monitors"`
// Required: RBDImage is the rados image name // Required: RBDImage is the rados image name
RBDImage string `json:"image"` RBDImage string `json:"image"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: RadosPool is the rados pool name,default is rbd // Optional: RadosPool is the rados pool name,default is rbd
...@@ -630,6 +630,7 @@ type CinderVolumeSource struct { ...@@ -630,6 +630,7 @@ type CinderVolumeSource struct {
VolumeID string `json:"volumeID"` VolumeID string `json:"volumeID"`
// Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: Defaults to false (read/write). ReadOnly here will force // Optional: Defaults to false (read/write). ReadOnly here will force
// the ReadOnly setting in VolumeMounts. // the ReadOnly setting in VolumeMounts.
......
pkg/api/v1/types.generated.go
View file @ 40c97ddd
...@@ -10234,13 +10234,14 @@ func (x *GCEPersistentDiskVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -10234,13 +10234,14 @@ func (x *GCEPersistentDiskVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq683 [4]bool var yyq683 [4]bool
_, _, _ = yysep683, yyq683, yy2arr683 _, _, _ = yysep683, yyq683, yy2arr683
const yyr683 bool = false const yyr683 bool = false
yyq683[1] = x.FSType != ""
yyq683[2] = x.Partition != 0 yyq683[2] = x.Partition != 0
yyq683[3] = x.ReadOnly != false yyq683[3] = x.ReadOnly != false
var yynn683 int var yynn683 int
if yyr683 || yy2arr683 { if yyr683 || yy2arr683 {
r.EncodeArrayStart(4) r.EncodeArrayStart(4)
} else { } else {
yynn683 = 2 yynn683 = 1
for _, b := range yyq683 { for _, b := range yyq683 {
if b { if b {
yynn683++ yynn683++
...@@ -10270,21 +10271,27 @@ func (x *GCEPersistentDiskVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -10270,21 +10271,27 @@ func (x *GCEPersistentDiskVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr683 || yy2arr683 { if yyr683 || yy2arr683 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym688 := z.EncBinary() if yyq683[1] {
_ = yym688 yym688 := z.EncBinary()
if false { _ = yym688
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) r.EncodeString(codecSelferC_UTF81234, "")
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq683[1] {
r.EncodeString(codecSelferC_UTF81234, string("fsType")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fsType"))
yym689 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym689 yym689 := z.EncBinary()
if false { _ = yym689
} else { if false {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} }
} }
if yyr683 || yy2arr683 { if yyr683 || yy2arr683 {
...@@ -10915,13 +10922,14 @@ func (x *AWSElasticBlockStoreVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) ...@@ -10915,13 +10922,14 @@ func (x *AWSElasticBlockStoreVolumeSource) CodecEncodeSelf(e *codec1978.Encoder)
var yyq740 [4]bool var yyq740 [4]bool
_, _, _ = yysep740, yyq740, yy2arr740 _, _, _ = yysep740, yyq740, yy2arr740
const yyr740 bool = false const yyr740 bool = false
yyq740[1] = x.FSType != ""
yyq740[2] = x.Partition != 0 yyq740[2] = x.Partition != 0
yyq740[3] = x.ReadOnly != false yyq740[3] = x.ReadOnly != false
var yynn740 int var yynn740 int
if yyr740 || yy2arr740 { if yyr740 || yy2arr740 {
r.EncodeArrayStart(4) r.EncodeArrayStart(4)
} else { } else {
yynn740 = 2 yynn740 = 1
for _, b := range yyq740 { for _, b := range yyq740 {
if b { if b {
yynn740++ yynn740++
...@@ -10951,21 +10959,27 @@ func (x *AWSElasticBlockStoreVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) ...@@ -10951,21 +10959,27 @@ func (x *AWSElasticBlockStoreVolumeSource) CodecEncodeSelf(e *codec1978.Encoder)
} }
if yyr740 || yy2arr740 { if yyr740 || yy2arr740 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym745 := z.EncBinary() if yyq740[1] {
_ = yym745 yym745 := z.EncBinary()
if false { _ = yym745
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) r.EncodeString(codecSelferC_UTF81234, "")
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq740[1] {
r.EncodeString(codecSelferC_UTF81234, string("fsType")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fsType"))
yym746 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym746 yym746 := z.EncBinary()
if false { _ = yym746
} else { if false {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} }
} }
if yyr740 || yy2arr740 { if yyr740 || yy2arr740 {
...@@ -11893,12 +11907,13 @@ func (x *ISCSIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -11893,12 +11907,13 @@ func (x *ISCSIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
_, _, _ = yysep819, yyq819, yy2arr819 _, _, _ = yysep819, yyq819, yy2arr819
const yyr819 bool = false const yyr819 bool = false
yyq819[3] = x.ISCSIInterface != "" yyq819[3] = x.ISCSIInterface != ""
yyq819[4] = x.FSType != ""
yyq819[5] = x.ReadOnly != false yyq819[5] = x.ReadOnly != false
var yynn819 int var yynn819 int
if yyr819 || yy2arr819 { if yyr819 || yy2arr819 {
r.EncodeArrayStart(6) r.EncodeArrayStart(6)
} else { } else {
yynn819 = 4 yynn819 = 3
for _, b := range yyq819 { for _, b := range yyq819 {
if b { if b {
yynn819++ yynn819++
...@@ -11991,21 +12006,27 @@ func (x *ISCSIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -11991,21 +12006,27 @@ func (x *ISCSIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr819 || yy2arr819 { if yyr819 || yy2arr819 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym833 := z.EncBinary() if yyq819[4] {
_ = yym833 yym833 := z.EncBinary()
if false { _ = yym833
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) r.EncodeString(codecSelferC_UTF81234, "")
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq819[4] {
r.EncodeString(codecSelferC_UTF81234, string("fsType")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fsType"))
yym834 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym834 yym834 := z.EncBinary()
if false { _ = yym834
} else { if false {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} }
} }
if yyr819 || yy2arr819 { if yyr819 || yy2arr819 {
...@@ -12273,12 +12294,13 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -12273,12 +12294,13 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq855 [4]bool var yyq855 [4]bool
_, _, _ = yysep855, yyq855, yy2arr855 _, _, _ = yysep855, yyq855, yy2arr855
const yyr855 bool = false const yyr855 bool = false
yyq855[2] = x.FSType != ""
yyq855[3] = x.ReadOnly != false yyq855[3] = x.ReadOnly != false
var yynn855 int var yynn855 int
if yyr855 || yy2arr855 { if yyr855 || yy2arr855 {
r.EncodeArrayStart(4) r.EncodeArrayStart(4)
} else { } else {
yynn855 = 3 yynn855 = 2
for _, b := range yyq855 { for _, b := range yyq855 {
if b { if b {
yynn855++ yynn855++
...@@ -12345,21 +12367,27 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { ...@@ -12345,21 +12367,27 @@ func (x *FCVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr855 || yy2arr855 { if yyr855 || yy2arr855 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym865 := z.EncBinary() if yyq855[2] {
_ = yym865 yym865 := z.EncBinary()
if false { _ = yym865
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) r.EncodeString(codecSelferC_UTF81234, "")
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq855[2] {
r.EncodeString(codecSelferC_UTF81234, string("fsType")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fsType"))
yym866 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym866 yym866 := z.EncBinary()
if false { _ = yym866
} else { if false {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType)) } else {
r.EncodeString(codecSelferC_UTF81234, string(x.FSType))
}
} }
} }
if yyr855 || yy2arr855 { if yyr855 || yy2arr855 {
pkg/api/v1/types.go
View file @ 40c97ddd
...@@ -542,7 +542,7 @@ type RBDVolumeSource struct { ...@@ -542,7 +542,7 @@ type RBDVolumeSource struct {
RBDImage string `json:"image"` RBDImage string `json:"image"`
// Filesystem type of the volume that you want to mount. // Filesystem type of the volume that you want to mount.
// Tip: Ensure that the filesystem type is supported by the host operating system. // Tip: Ensure that the filesystem type is supported by the host operating system.
// Examples: "ext4", "xfs", "ntfs". // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd // More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
...@@ -577,9 +577,9 @@ type CinderVolumeSource struct { ...@@ -577,9 +577,9 @@ type CinderVolumeSource struct {
// volume id used to identify the volume in cinder // volume id used to identify the volume in cinder
// More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md // More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md
VolumeID string `json:"volumeID"` VolumeID string `json:"volumeID"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Only ext3 and ext4 are allowed // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md // More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: Defaults to false (read/write). ReadOnly here will force // Optional: Defaults to false (read/write). ReadOnly here will force
...@@ -648,10 +648,10 @@ type GCEPersistentDiskVolumeSource struct { ...@@ -648,10 +648,10 @@ type GCEPersistentDiskVolumeSource struct {
PDName string `json:"pdName"` PDName string `json:"pdName"`
// Filesystem type of the volume that you want to mount. // Filesystem type of the volume that you want to mount.
// Tip: Ensure that the filesystem type is supported by the host operating system. // Tip: Ensure that the filesystem type is supported by the host operating system.
// Examples: "ext4", "xfs", "ntfs". // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk // More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType"` FSType string `json:"fsType,omitempty"`
// The partition in the volume that you want to mount. // The partition in the volume that you want to mount.
// If omitted, the default is to mount by volume name. // If omitted, the default is to mount by volume name.
// Examples: For volume /dev/sda1, you specify the partition as "1". // Examples: For volume /dev/sda1, you specify the partition as "1".
...@@ -669,9 +669,9 @@ type GCEPersistentDiskVolumeSource struct { ...@@ -669,9 +669,9 @@ type GCEPersistentDiskVolumeSource struct {
type FlexVolumeSource struct { type FlexVolumeSource 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.
Driver string `json:"driver"` Driver string `json:"driver"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
FSType string `json:"fsType,omitempty"` FSType string `json:"fsType,omitempty"`
// Optional: SecretRef is reference to the authentication secret for User, default is empty. // Optional: SecretRef is reference to the authentication secret for User, default is empty.
SecretRef *LocalObjectReference `json:"secretRef,omitempty"` SecretRef *LocalObjectReference `json:"secretRef,omitempty"`
...@@ -694,10 +694,10 @@ type AWSElasticBlockStoreVolumeSource struct { ...@@ -694,10 +694,10 @@ type AWSElasticBlockStoreVolumeSource struct {
VolumeID string `json:"volumeID"` VolumeID string `json:"volumeID"`
// Filesystem type of the volume that you want to mount. // Filesystem type of the volume that you want to mount.
// Tip: Ensure that the filesystem type is supported by the host operating system. // Tip: Ensure that the filesystem type is supported by the host operating system.
// Examples: "ext4", "xfs", "ntfs". // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore // More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType"` FSType string `json:"fsType,omitempty"`
// The partition in the volume that you want to mount. // The partition in the volume that you want to mount.
// If omitted, the default is to mount by volume name. // If omitted, the default is to mount by volume name.
// Examples: For volume /dev/sda1, you specify the partition as "1". // Examples: For volume /dev/sda1, you specify the partition as "1".
...@@ -768,10 +768,10 @@ type ISCSIVolumeSource struct { ...@@ -768,10 +768,10 @@ type ISCSIVolumeSource struct {
ISCSIInterface string `json:"iscsiInterface,omitempty"` ISCSIInterface string `json:"iscsiInterface,omitempty"`
// Filesystem type of the volume that you want to mount. // Filesystem type of the volume that you want to mount.
// Tip: Ensure that the filesystem type is supported by the host operating system. // Tip: Ensure that the filesystem type is supported by the host operating system.
// Examples: "ext4", "xfs", "ntfs". // Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi // More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType"` FSType string `json:"fsType,omitempty"`
// ReadOnly here will force the ReadOnly setting in VolumeMounts. // ReadOnly here will force the ReadOnly setting in VolumeMounts.
// Defaults to false. // Defaults to false.
ReadOnly bool `json:"readOnly,omitempty"` ReadOnly bool `json:"readOnly,omitempty"`
...@@ -785,11 +785,11 @@ type FCVolumeSource struct { ...@@ -785,11 +785,11 @@ type FCVolumeSource struct {
TargetWWNs []string `json:"targetWWNs"` TargetWWNs []string `json:"targetWWNs"`
// Required: FC target lun number // Required: FC target lun number
Lun *int32 `json:"lun"` Lun *int32 `json:"lun"`
// Required: Filesystem type to mount. // Filesystem type to mount.
// Must be a filesystem type supported by the host operating system. // Must be a filesystem type supported by the host operating system.
// Ex. "ext4", "xfs", "ntfs" // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
// TODO: how do we prevent errors in the filesystem from compromising the machine // TODO: how do we prevent errors in the filesystem from compromising the machine
FSType string `json:"fsType"` FSType string `json:"fsType,omitempty"`
// Optional: Defaults to false (read/write). ReadOnly here will force // Optional: Defaults to false (read/write). ReadOnly here will force
// the ReadOnly setting in VolumeMounts. // the ReadOnly setting in VolumeMounts.
ReadOnly bool `json:"readOnly,omitempty"` ReadOnly bool `json:"readOnly,omitempty"`
......
pkg/api/v1/types_swagger_doc_generated.go
View file @ 40c97ddd
...@@ -30,7 +30,7 @@ package v1 ...@@ -30,7 +30,7 @@ package v1
var map_AWSElasticBlockStoreVolumeSource = map[string]string{ var map_AWSElasticBlockStoreVolumeSource = map[string]string{
"": "Represents a Persistent Disk resource in AWS.\n\nAn AWS EBS disk must exist and be formatted before mounting to a container. The disk must also be in the same AWS zone as the kubelet. An AWS EBS disk can only be mounted as read/write once. AWS EBS volumes support ownership management and SELinux relabeling.", "": "Represents a Persistent Disk resource in AWS.\n\nAn AWS EBS disk must exist and be formatted before mounting to a container. The disk must also be in the same AWS zone as the kubelet. An AWS EBS disk can only be mounted as read/write once. AWS EBS volumes support ownership management and SELinux relabeling.",
"volumeID": "Unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore", "volumeID": "Unique ID of the persistent disk resource in AWS (Amazon EBS volume). More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore",
"fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore", "fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore",
"partition": "The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as \"1\". Similarly, the volume partition for /dev/sda is \"0\" (or you can leave the property empty).", "partition": "The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as \"1\". Similarly, the volume partition for /dev/sda is \"0\" (or you can leave the property empty).",
"readOnly": "Specify \"true\" to force and set the ReadOnly property in VolumeMounts to \"true\". If omitted, the default is \"false\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore", "readOnly": "Specify \"true\" to force and set the ReadOnly property in VolumeMounts to \"true\". If omitted, the default is \"false\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore",
} }
...@@ -96,7 +96,7 @@ func (CephFSVolumeSource) SwaggerDoc() map[string]string { ...@@ -96,7 +96,7 @@ func (CephFSVolumeSource) SwaggerDoc() map[string]string {
var map_CinderVolumeSource = map[string]string{ var map_CinderVolumeSource = map[string]string{
"": "Represents a cinder volume resource in Openstack. A Cinder volume must exist before mounting to a container. The volume must also be in the same region as the kubelet. Cinder volumes support ownership management and SELinux relabeling.", "": "Represents a cinder volume resource in Openstack. A Cinder volume must exist before mounting to a container. The volume must also be in the same region as the kubelet. Cinder volumes support ownership management and SELinux relabeling.",
"volumeID": "volume id used to identify the volume in cinder More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md", "volumeID": "volume id used to identify the volume in cinder More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md",
"fsType": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Only ext3 and ext4 are allowed More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md", "fsType": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md",
"readOnly": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md", "readOnly": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. More info: http://releases.k8s.io/HEAD/examples/mysql-cinder-pd/README.md",
} }
...@@ -455,7 +455,7 @@ var map_FCVolumeSource = map[string]string{ ...@@ -455,7 +455,7 @@ var map_FCVolumeSource = map[string]string{
"": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.", "": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.",
"targetWWNs": "Required: FC target world wide names (WWNs)", "targetWWNs": "Required: FC target world wide names (WWNs)",
"lun": "Required: FC target lun number", "lun": "Required: FC target lun number",
"fsType": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\"", "fsType": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",
"readOnly": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", "readOnly": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
} }
...@@ -466,7 +466,7 @@ func (FCVolumeSource) SwaggerDoc() map[string]string { ...@@ -466,7 +466,7 @@ func (FCVolumeSource) SwaggerDoc() map[string]string {
var map_FlexVolumeSource = map[string]string{ var map_FlexVolumeSource = map[string]string{
"": "FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.", "": "FlexVolume represents a generic volume resource that is provisioned/attached using a exec based plugin. This is an alpha feature and may change in future.",
"driver": "Driver is the name of the driver to use for this volume.", "driver": "Driver is the name of the driver to use for this volume.",
"fsType": "Required: Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\"", "fsType": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". The default filesystem depends on FlexVolume script.",
"secretRef": "Optional: SecretRef is reference to the authentication secret for User, default is empty.", "secretRef": "Optional: SecretRef is reference to the authentication secret for User, default is empty.",
"readOnly": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", "readOnly": "Optional: Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
"options": "Optional: Extra command options if any.", "options": "Optional: Extra command options if any.",
...@@ -488,7 +488,7 @@ func (FlockerVolumeSource) SwaggerDoc() map[string]string { ...@@ -488,7 +488,7 @@ func (FlockerVolumeSource) SwaggerDoc() map[string]string {
var map_GCEPersistentDiskVolumeSource = map[string]string{ var map_GCEPersistentDiskVolumeSource = map[string]string{
"": "Represents a Persistent Disk resource in Google Compute Engine.\n\nA GCE PD must exist and be formatted before mounting to a container. The disk must also be in the same GCE project and zone as the kubelet. A GCE PD can only be mounted as read/write once. GCE PDs support ownership management and SELinux relabeling.", "": "Represents a Persistent Disk resource in Google Compute Engine.\n\nA GCE PD must exist and be formatted before mounting to a container. The disk must also be in the same GCE project and zone as the kubelet. A GCE PD can only be mounted as read/write once. GCE PDs support ownership management and SELinux relabeling.",
"pdName": "Unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk", "pdName": "Unique name of the PD resource in GCE. Used to identify the disk in GCE. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk",
"fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk", "fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk",
"partition": "The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as \"1\". Similarly, the volume partition for /dev/sda is \"0\" (or you can leave the property empty). More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk", "partition": "The partition in the volume that you want to mount. If omitted, the default is to mount by volume name. Examples: For volume /dev/sda1, you specify the partition as \"1\". Similarly, the volume partition for /dev/sda is \"0\" (or you can leave the property empty). More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk",
"readOnly": "ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk", "readOnly": "ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk",
} }
...@@ -568,7 +568,7 @@ var map_ISCSIVolumeSource = map[string]string{ ...@@ -568,7 +568,7 @@ var map_ISCSIVolumeSource = map[string]string{
"iqn": "Target iSCSI Qualified Name.", "iqn": "Target iSCSI Qualified Name.",
"lun": "iSCSI target lun number.", "lun": "iSCSI target lun number.",
"iscsiInterface": "Optional: Defaults to 'default' (tcp). iSCSI interface name that uses an iSCSI transport.", "iscsiInterface": "Optional: Defaults to 'default' (tcp). iSCSI interface name that uses an iSCSI transport.",
"fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi", "fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#iscsi",
"readOnly": "ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false.", "readOnly": "ReadOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false.",
} }
...@@ -1237,7 +1237,7 @@ var map_RBDVolumeSource = map[string]string{ ...@@ -1237,7 +1237,7 @@ var map_RBDVolumeSource = map[string]string{
"": "Represents a Rados Block Device mount that lasts the lifetime of a pod. RBD volumes support ownership management and SELinux relabeling.", "": "Represents a Rados Block Device mount that lasts the lifetime of a pod. RBD volumes support ownership management and SELinux relabeling.",
"monitors": "A collection of Ceph monitors. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it", "monitors": "A collection of Ceph monitors. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it",
"image": "The rados image name. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it", "image": "The rados image name. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it",
"fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd", "fsType": "Filesystem type of the volume that you want to mount. Tip: Ensure that the filesystem type is supported by the host operating system. Examples: \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified. More info: http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#rbd",
"pool": "The rados pool name. Default is rbd. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it.", "pool": "The rados pool name. Default is rbd. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it.",
"user": "The rados user name. Default is admin. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it", "user": "The rados user name. Default is admin. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it",
"keyring": "Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it", "keyring": "Keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: http://releases.k8s.io/HEAD/examples/rbd/README.md#how-to-use-it",
......
pkg/api/validation/validation.go
View file @ 40c97ddd
...@@ -532,9 +532,6 @@ func validateISCSIVolumeSource(iscsi *api.ISCSIVolumeSource, fldPath *field.Path ...@@ -532,9 +532,6 @@ func validateISCSIVolumeSource(iscsi *api.ISCSIVolumeSource, fldPath *field.Path
if len(iscsi.IQN) == 0 { if len(iscsi.IQN) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("iqn"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("iqn"), ""))
} }
if len(iscsi.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
if iscsi.Lun < 0 || iscsi.Lun > 255 { if iscsi.Lun < 0 || iscsi.Lun > 255 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("lun"), iscsi.Lun, InclusiveRangeErrorMsg(0, 255))) allErrs = append(allErrs, field.Invalid(fldPath.Child("lun"), iscsi.Lun, InclusiveRangeErrorMsg(0, 255)))
} }
...@@ -547,10 +544,6 @@ func validateFCVolumeSource(fc *api.FCVolumeSource, fldPath *field.Path) field.E ...@@ -547,10 +544,6 @@ func validateFCVolumeSource(fc *api.FCVolumeSource, fldPath *field.Path) field.E
allErrs = append(allErrs, field.Required(fldPath.Child("targetWWNs"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("targetWWNs"), ""))
} }
if len(fc.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
if fc.Lun == nil { if fc.Lun == nil {
allErrs = append(allErrs, field.Required(fldPath.Child("lun"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("lun"), ""))
} else { } else {
...@@ -566,9 +559,6 @@ func validateGCEPersistentDiskVolumeSource(pd *api.GCEPersistentDiskVolumeSource ...@@ -566,9 +559,6 @@ func validateGCEPersistentDiskVolumeSource(pd *api.GCEPersistentDiskVolumeSource
if len(pd.PDName) == 0 { if len(pd.PDName) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("pdName"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("pdName"), ""))
} }
if len(pd.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
if pd.Partition < 0 || pd.Partition > 255 { if pd.Partition < 0 || pd.Partition > 255 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("partition"), pd.Partition, pdPartitionErrorMsg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("partition"), pd.Partition, pdPartitionErrorMsg))
} }
...@@ -580,9 +570,6 @@ func validateAWSElasticBlockStoreVolumeSource(PD *api.AWSElasticBlockStoreVolume ...@@ -580,9 +570,6 @@ func validateAWSElasticBlockStoreVolumeSource(PD *api.AWSElasticBlockStoreVolume
if len(PD.VolumeID) == 0 { if len(PD.VolumeID) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("volumeID"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("volumeID"), ""))
} }
if len(PD.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
if PD.Partition < 0 || PD.Partition > 255 { if PD.Partition < 0 || PD.Partition > 255 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("partition"), PD.Partition, pdPartitionErrorMsg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("partition"), PD.Partition, pdPartitionErrorMsg))
} }
...@@ -686,9 +673,6 @@ func validateRBDVolumeSource(rbd *api.RBDVolumeSource, fldPath *field.Path) fiel ...@@ -686,9 +673,6 @@ func validateRBDVolumeSource(rbd *api.RBDVolumeSource, fldPath *field.Path) fiel
if len(rbd.RBDImage) == 0 { if len(rbd.RBDImage) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("image"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("image"), ""))
} }
if len(rbd.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
return allErrs return allErrs
} }
...@@ -697,9 +681,6 @@ func validateCinderVolumeSource(cd *api.CinderVolumeSource, fldPath *field.Path) ...@@ -697,9 +681,6 @@ func validateCinderVolumeSource(cd *api.CinderVolumeSource, fldPath *field.Path)
if len(cd.VolumeID) == 0 { if len(cd.VolumeID) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("volumeID"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("volumeID"), ""))
} }
if len(cd.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
return allErrs return allErrs
} }
...@@ -716,9 +697,6 @@ func validateFlexVolumeSource(fv *api.FlexVolumeSource, fldPath *field.Path) fie ...@@ -716,9 +697,6 @@ func validateFlexVolumeSource(fv *api.FlexVolumeSource, fldPath *field.Path) fie
if len(fv.Driver) == 0 { if len(fv.Driver) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("driver"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("driver"), ""))
} }
if len(fv.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
return allErrs return allErrs
} }
......
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