Merge pull request #125600 from thockin/plus_default_deprecated_volumes
Use +default for deprecated volume types
This commit is contained in:
@@ -313,6 +313,7 @@
|
||||
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
|
||||
"properties": {
|
||||
"cachingMode": {
|
||||
"default": "ReadWrite",
|
||||
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -327,14 +328,17 @@
|
||||
"type": "string"
|
||||
},
|
||||
"fsType": {
|
||||
"default": "ext4",
|
||||
"description": "fsType is 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.",
|
||||
"type": "string"
|
||||
},
|
||||
"kind": {
|
||||
"default": "Shared",
|
||||
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
|
||||
"type": "string"
|
||||
},
|
||||
"readOnly": {
|
||||
"default": false,
|
||||
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
|
||||
"type": "boolean"
|
||||
}
|
||||
@@ -2873,6 +2877,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"iscsiInterface": {
|
||||
"default": "default",
|
||||
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -2941,6 +2946,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"iscsiInterface": {
|
||||
"default": "default",
|
||||
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6206,6 +6212,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"keyring": {
|
||||
"default": "/etc/ceph/keyring",
|
||||
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6219,6 +6226,7 @@
|
||||
"x-kubernetes-list-type": "atomic"
|
||||
},
|
||||
"pool": {
|
||||
"default": "rbd",
|
||||
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6235,6 +6243,7 @@
|
||||
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
|
||||
},
|
||||
"user": {
|
||||
"default": "admin",
|
||||
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
}
|
||||
@@ -6258,6 +6267,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"keyring": {
|
||||
"default": "/etc/ceph/keyring",
|
||||
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6271,6 +6281,7 @@
|
||||
"x-kubernetes-list-type": "atomic"
|
||||
},
|
||||
"pool": {
|
||||
"default": "rbd",
|
||||
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6287,6 +6298,7 @@
|
||||
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
|
||||
},
|
||||
"user": {
|
||||
"default": "admin",
|
||||
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
}
|
||||
@@ -6758,6 +6770,7 @@
|
||||
"description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume",
|
||||
"properties": {
|
||||
"fsType": {
|
||||
"default": "xfs",
|
||||
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6787,6 +6800,7 @@
|
||||
"type": "boolean"
|
||||
},
|
||||
"storageMode": {
|
||||
"default": "ThinProvisioned",
|
||||
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6815,6 +6829,7 @@
|
||||
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
|
||||
"properties": {
|
||||
"fsType": {
|
||||
"default": "xfs",
|
||||
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6844,6 +6859,7 @@
|
||||
"type": "boolean"
|
||||
},
|
||||
"storageMode": {
|
||||
"default": "ThinProvisioned",
|
||||
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
|
||||
"type": "string"
|
||||
},
|
||||
|
||||
@@ -1421,6 +1421,7 @@
|
||||
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
|
||||
"properties": {
|
||||
"cachingMode": {
|
||||
"default": "ReadWrite",
|
||||
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -1435,14 +1436,17 @@
|
||||
"type": "string"
|
||||
},
|
||||
"fsType": {
|
||||
"default": "ext4",
|
||||
"description": "fsType is 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.",
|
||||
"type": "string"
|
||||
},
|
||||
"kind": {
|
||||
"default": "Shared",
|
||||
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
|
||||
"type": "string"
|
||||
},
|
||||
"readOnly": {
|
||||
"default": false,
|
||||
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
|
||||
"type": "boolean"
|
||||
}
|
||||
@@ -2772,6 +2776,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"iscsiInterface": {
|
||||
"default": "default",
|
||||
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -4247,6 +4252,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"keyring": {
|
||||
"default": "/etc/ceph/keyring",
|
||||
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -4260,6 +4266,7 @@
|
||||
"x-kubernetes-list-type": "atomic"
|
||||
},
|
||||
"pool": {
|
||||
"default": "rbd",
|
||||
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -4276,6 +4283,7 @@
|
||||
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
|
||||
},
|
||||
"user": {
|
||||
"default": "admin",
|
||||
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
}
|
||||
@@ -4389,6 +4397,7 @@
|
||||
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
|
||||
"properties": {
|
||||
"fsType": {
|
||||
"default": "xfs",
|
||||
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -4418,6 +4427,7 @@
|
||||
"type": "boolean"
|
||||
},
|
||||
"storageMode": {
|
||||
"default": "ThinProvisioned",
|
||||
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
|
||||
"type": "string"
|
||||
},
|
||||
|
||||
@@ -770,6 +770,7 @@
|
||||
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
|
||||
"properties": {
|
||||
"cachingMode": {
|
||||
"default": "ReadWrite",
|
||||
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -784,14 +785,17 @@
|
||||
"type": "string"
|
||||
},
|
||||
"fsType": {
|
||||
"default": "ext4",
|
||||
"description": "fsType is 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.",
|
||||
"type": "string"
|
||||
},
|
||||
"kind": {
|
||||
"default": "Shared",
|
||||
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
|
||||
"type": "string"
|
||||
},
|
||||
"readOnly": {
|
||||
"default": false,
|
||||
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
|
||||
"type": "boolean"
|
||||
}
|
||||
@@ -2121,6 +2125,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"iscsiInterface": {
|
||||
"default": "default",
|
||||
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -3451,6 +3456,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"keyring": {
|
||||
"default": "/etc/ceph/keyring",
|
||||
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -3464,6 +3470,7 @@
|
||||
"x-kubernetes-list-type": "atomic"
|
||||
},
|
||||
"pool": {
|
||||
"default": "rbd",
|
||||
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -3480,6 +3487,7 @@
|
||||
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
|
||||
},
|
||||
"user": {
|
||||
"default": "admin",
|
||||
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
}
|
||||
@@ -3593,6 +3601,7 @@
|
||||
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
|
||||
"properties": {
|
||||
"fsType": {
|
||||
"default": "xfs",
|
||||
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -3622,6 +3631,7 @@
|
||||
"type": "boolean"
|
||||
},
|
||||
"storageMode": {
|
||||
"default": "ThinProvisioned",
|
||||
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
|
||||
"type": "string"
|
||||
},
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
|
||||
"properties": {
|
||||
"cachingMode": {
|
||||
"default": "ReadWrite",
|
||||
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -46,14 +47,17 @@
|
||||
"type": "string"
|
||||
},
|
||||
"fsType": {
|
||||
"default": "ext4",
|
||||
"description": "fsType is 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.",
|
||||
"type": "string"
|
||||
},
|
||||
"kind": {
|
||||
"default": "Shared",
|
||||
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
|
||||
"type": "string"
|
||||
},
|
||||
"readOnly": {
|
||||
"default": false,
|
||||
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
|
||||
"type": "boolean"
|
||||
}
|
||||
@@ -427,6 +431,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"iscsiInterface": {
|
||||
"default": "default",
|
||||
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -961,6 +966,7 @@
|
||||
"type": "string"
|
||||
},
|
||||
"keyring": {
|
||||
"default": "/etc/ceph/keyring",
|
||||
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -974,6 +980,7 @@
|
||||
"x-kubernetes-list-type": "atomic"
|
||||
},
|
||||
"pool": {
|
||||
"default": "rbd",
|
||||
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -990,6 +997,7 @@
|
||||
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
|
||||
},
|
||||
"user": {
|
||||
"default": "admin",
|
||||
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
|
||||
"type": "string"
|
||||
}
|
||||
@@ -1004,6 +1012,7 @@
|
||||
"description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume",
|
||||
"properties": {
|
||||
"fsType": {
|
||||
"default": "xfs",
|
||||
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"",
|
||||
"type": "string"
|
||||
},
|
||||
@@ -1033,6 +1042,7 @@
|
||||
"type": "boolean"
|
||||
},
|
||||
"storageMode": {
|
||||
"default": "ThinProvisioned",
|
||||
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
|
||||
"type": "string"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user