diff --git a/api/swagger-spec/apps_v1alpha1.json b/api/swagger-spec/apps_v1alpha1.json
index ab3bc7e07b3..ee00f282c1c 100644
--- a/api/swagger-spec/apps_v1alpha1.json
+++ b/api/swagger-spec/apps_v1alpha1.json
@@ -1425,6 +1425,10 @@
"quobyte": {
"$ref": "v1.QuobyteVolumeSource",
"description": "Quobyte represents a Quobyte mount on the host that shares a pod's lifetime"
+ },
+ "azureDisk": {
+ "$ref": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod."
}
}
},
@@ -2023,6 +2027,40 @@
}
}
},
+ "v1.AzureDiskVolumeSource": {
+ "id": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
+ "required": [
+ "diskName",
+ "diskURI"
+ ],
+ "properties": {
+ "diskName": {
+ "type": "string",
+ "description": "The Name of the data disk in the blob storage"
+ },
+ "diskURI": {
+ "type": "string",
+ "description": "The URI the data disk in the blob storage"
+ },
+ "cachingMode": {
+ "$ref": "v1.AzureDataDiskCachingMode",
+ "description": "Host Caching mode: None, Read Only, Read Write."
+ },
+ "fsType": {
+ "type": "string",
+ "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": {
+ "type": "boolean",
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
+ }
+ }
+ },
+ "v1.AzureDataDiskCachingMode": {
+ "id": "v1.AzureDataDiskCachingMode",
+ "properties": {}
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json
index 6dde52ee70a..f9cddc777fb 100644
--- a/api/swagger-spec/batch_v1.json
+++ b/api/swagger-spec/batch_v1.json
@@ -1430,6 +1430,10 @@
"quobyte": {
"$ref": "v1.QuobyteVolumeSource",
"description": "Quobyte represents a Quobyte mount on the host that shares a pod's lifetime"
+ },
+ "azureDisk": {
+ "$ref": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod."
}
}
},
@@ -2028,6 +2032,40 @@
}
}
},
+ "v1.AzureDiskVolumeSource": {
+ "id": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
+ "required": [
+ "diskName",
+ "diskURI"
+ ],
+ "properties": {
+ "diskName": {
+ "type": "string",
+ "description": "The Name of the data disk in the blob storage"
+ },
+ "diskURI": {
+ "type": "string",
+ "description": "The URI the data disk in the blob storage"
+ },
+ "cachingMode": {
+ "$ref": "v1.AzureDataDiskCachingMode",
+ "description": "Host Caching mode: None, Read Only, Read Write."
+ },
+ "fsType": {
+ "type": "string",
+ "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": {
+ "type": "boolean",
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
+ }
+ }
+ },
+ "v1.AzureDataDiskCachingMode": {
+ "id": "v1.AzureDataDiskCachingMode",
+ "properties": {}
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json
index 91ba7642fcd..7cd25a016e9 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -8594,6 +8594,10 @@
"quobyte": {
"$ref": "v1.QuobyteVolumeSource",
"description": "Quobyte represents a Quobyte mount on the host that shares a pod's lifetime"
+ },
+ "azureDisk": {
+ "$ref": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod."
}
}
},
@@ -9192,6 +9196,40 @@
}
}
},
+ "v1.AzureDiskVolumeSource": {
+ "id": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
+ "required": [
+ "diskName",
+ "diskURI"
+ ],
+ "properties": {
+ "diskName": {
+ "type": "string",
+ "description": "The Name of the data disk in the blob storage"
+ },
+ "diskURI": {
+ "type": "string",
+ "description": "The URI the data disk in the blob storage"
+ },
+ "cachingMode": {
+ "$ref": "v1.AzureDataDiskCachingMode",
+ "description": "Host Caching mode: None, Read Only, Read Write."
+ },
+ "fsType": {
+ "type": "string",
+ "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": {
+ "type": "boolean",
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
+ }
+ }
+ },
+ "v1.AzureDataDiskCachingMode": {
+ "id": "v1.AzureDataDiskCachingMode",
+ "properties": {}
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
index d63d26aca57..a02af0949d0 100644
--- a/api/swagger-spec/v1.json
+++ b/api/swagger-spec/v1.json
@@ -17317,6 +17317,10 @@
"$ref": "v1.QuobyteVolumeSource",
"description": "Quobyte represents a Quobyte mount on the host that shares a pod's lifetime"
},
+ "azureDisk": {
+ "$ref": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod."
+ },
"accessModes": {
"type": "array",
"items": {
@@ -17732,6 +17736,40 @@
}
}
},
+ "v1.AzureDiskVolumeSource": {
+ "id": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
+ "required": [
+ "diskName",
+ "diskURI"
+ ],
+ "properties": {
+ "diskName": {
+ "type": "string",
+ "description": "The Name of the data disk in the blob storage"
+ },
+ "diskURI": {
+ "type": "string",
+ "description": "The URI the data disk in the blob storage"
+ },
+ "cachingMode": {
+ "$ref": "v1.AzureDataDiskCachingMode",
+ "description": "Host Caching mode: None, Read Only, Read Write."
+ },
+ "fsType": {
+ "type": "string",
+ "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": {
+ "type": "boolean",
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts."
+ }
+ }
+ },
+ "v1.AzureDataDiskCachingMode": {
+ "id": "v1.AzureDataDiskCachingMode",
+ "properties": {}
+ },
"v1.PersistentVolumeStatus": {
"id": "v1.PersistentVolumeStatus",
"description": "PersistentVolumeStatus is the current status of a persistent volume.",
@@ -17986,6 +18024,10 @@
"quobyte": {
"$ref": "v1.QuobyteVolumeSource",
"description": "Quobyte represents a Quobyte mount on the host that shares a pod's lifetime"
+ },
+ "azureDisk": {
+ "$ref": "v1.AzureDiskVolumeSource",
+ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod."
}
}
},
diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go
index d015bb5b11a..0d0dc539367 100644
--- a/cmd/kube-controller-manager/app/plugins.go
+++ b/cmd/kube-controller-manager/app/plugins.go
@@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/util/io"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/aws_ebs"
+ "k8s.io/kubernetes/pkg/volume/azure_dd"
"k8s.io/kubernetes/pkg/volume/cinder"
"k8s.io/kubernetes/pkg/volume/flexvolume"
"k8s.io/kubernetes/pkg/volume/gce_pd"
@@ -60,6 +61,7 @@ func ProbeAttachableVolumePlugins(config componentconfig.VolumeConfiguration) []
allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, flexvolume.ProbeVolumePlugins(config.FlexVolumePluginDir)...)
allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)
return allPlugins
}
diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go
index b71a87ca33d..a3c6343f4c8 100644
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -29,6 +29,7 @@ import (
// Volume plugins
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/aws_ebs"
+ "k8s.io/kubernetes/pkg/volume/azure_dd"
"k8s.io/kubernetes/pkg/volume/azure_file"
"k8s.io/kubernetes/pkg/volume/cephfs"
"k8s.io/kubernetes/pkg/volume/cinder"
@@ -84,6 +85,7 @@ func ProbeVolumePlugins(pluginDir string) []volume.VolumePlugin {
allPlugins = append(allPlugins, azure_file.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, configmap.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)
return allPlugins
}
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html
index 7e44b782df8..b2ccf35765c 100755
--- a/docs/api-reference/batch/v1/definitions.html
+++ b/docs/api-reference/batch/v1/definitions.html
@@ -2963,6 +2963,68 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+
+
v1.AzureDiskVolumeSource
+
+
AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+diskName |
+The Name of the data disk in the blob storage |
+true |
+string |
+ |
+
+
+diskURI |
+The URI the data disk in the blob storage |
+true |
+string |
+ |
+
+
+cachingMode |
+Host Caching mode: None, Read Only, Read Write. |
+false |
+v1.AzureDataDiskCachingMode |
+ |
+
+
+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. |
+false |
+string |
+ |
+
+
+readOnly |
+Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. |
+false |
+boolean |
+false |
+
+
+
+
v1.VsphereVirtualDiskVolumeSource
@@ -3313,6 +3375,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
v1.QuobyteVolumeSource |
|
+
+azureDisk |
+AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. |
+false |
+v1.AzureDiskVolumeSource |
+ |
+
@@ -4119,6 +4188,10 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+
+
v1.AzureDataDiskCachingMode
+
v1.RBDVolumeSource
@@ -4214,7 +4287,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html
index ae297fdefaa..1a630b20c27 100755
--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@@ -2789,6 +2789,68 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
+
+