diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index f56018f3dfb..434a82235b3 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -14914,6 +14914,10 @@ "$ref": "v1.FlexVolumeSource", "description": "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." }, + "azureFile": { + "$ref": "v1.AzureFileVolumeSource", + "description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod." + }, "accessModes": { "type": "array", "items": { @@ -15268,6 +15272,28 @@ } } }, + "v1.AzureFileVolumeSource": { + "id": "v1.AzureFileVolumeSource", + "description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod.", + "required": [ + "secretName", + "shareName" + ], + "properties": { + "secretName": { + "type": "string", + "description": "the name of secret that contains Azure Storage Account Name and Key" + }, + "shareName": { + "type": "string", + "description": "Share Name" + }, + "readOnly": { + "type": "boolean", + "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts." + } + } + }, "v1.PersistentVolumeStatus": { "id": "v1.PersistentVolumeStatus", "description": "PersistentVolumeStatus is the current status of a persistent volume.", @@ -15498,6 +15524,10 @@ "fc": { "$ref": "v1.FCVolumeSource", "description": "FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod." + }, + "azureFile": { + "$ref": "v1.AzureFileVolumeSource", + "description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod." } } }, diff --git a/api/swagger-spec/v1beta1.json b/api/swagger-spec/v1beta1.json index e76874e96fe..dd967259880 100644 --- a/api/swagger-spec/v1beta1.json +++ b/api/swagger-spec/v1beta1.json @@ -4333,6 +4333,10 @@ "fc": { "$ref": "v1.FCVolumeSource", "description": "FC represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod." + }, + "azureFile": { + "$ref": "v1.AzureFileVolumeSource", + "description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod." } } }, @@ -4779,6 +4783,28 @@ } } }, + "v1.AzureFileVolumeSource": { + "id": "v1.AzureFileVolumeSource", + "description": "AzureFile represents an Azure File Service mount on the host and bind mount to the pod.", + "required": [ + "secretName", + "shareName" + ], + "properties": { + "secretName": { + "type": "string", + "description": "the name of secret that contains Azure Storage Account Name and Key" + }, + "shareName": { + "type": "string", + "description": "Share Name" + }, + "readOnly": { + "type": "boolean", + "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts." + } + } + }, "v1.Container": { "id": "v1.Container", "description": "A single application container that you want to run within a pod.", diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index 31b50b45108..40eb75c09c3 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_file" "k8s.io/kubernetes/pkg/volume/cephfs" "k8s.io/kubernetes/pkg/volume/cinder" "k8s.io/kubernetes/pkg/volume/downwardapi" @@ -78,7 +79,7 @@ func ProbeVolumePlugins(pluginDir string) []volume.VolumePlugin { allPlugins = append(allPlugins, fc.ProbeVolumePlugins()...) allPlugins = append(allPlugins, flocker.ProbeVolumePlugins()...) allPlugins = append(allPlugins, flexvolume.ProbeVolumePlugins(pluginDir)...) - + allPlugins = append(allPlugins, azure_file.ProbeVolumePlugins()...) return allPlugins } diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 9c57fd6c221..bf0a29241a5 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -2364,6 +2364,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i + +
AzureFile represents an Azure File Service mount on the host and bind mount to the pod.
+Name | +Description | +Required | +Schema | +Default | +
---|---|---|---|---|
secretName |
+the name of secret that contains Azure Storage Account Name and Key |
+true |
+string |
++ |
shareName |
+Share Name |
+true |
+string |
++ |
readOnly |
+Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts. |
+false |
+boolean |
+false |
+
azureFile
AzureFile represents an Azure File Service mount on the host and bind mount to the pod.
false