diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 729eb5a47f..d0e819413b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -2410,6 +2410,14 @@
"ImportPath": "github.com/square/go-jose/json",
"Rev": "789a4c4bd4c118f7564954f441b29c153ccd6a96"
},
+ {
+ "ImportPath": "github.com/storageos/go-api",
+ "Rev": "74f9beb613cacf0cc282facc2e1550a3231e126f"
+ },
+ {
+ "ImportPath": "github.com/storageos/go-api/types",
+ "Rev": "74f9beb613cacf0cc282facc2e1550a3231e126f"
+ },
{
"ImportPath": "github.com/stretchr/objx",
"Rev": "1a9d0bb9f541897e62256577b352fdbc1fb4fd94"
diff --git a/Godeps/LICENSES b/Godeps/LICENSES
index d994dd379e..721abcfb31 100644
--- a/Godeps/LICENSES
+++ b/Godeps/LICENSES
@@ -77112,6 +77112,112 @@ SOFTWARE.
================================================================================
+================================================================================
+= vendor/github.com/storageos/go-api licensed under: =
+
+MIT License
+
+Copyright (c) 2015-2017 StorageOS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+Copyright (c) 2013-2017, go-dockerclient authors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+= vendor/github.com/storageos/go-api/LICENCE d8f852a0f38554263e64363f57b07fc4 -
+================================================================================
+
+
+================================================================================
+= vendor/github.com/storageos/go-api/types licensed under: =
+
+MIT License
+
+Copyright (c) 2015-2017 StorageOS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+Copyright (c) 2013-2017, go-dockerclient authors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+= vendor/github.com/storageos/go-api/LICENCE d8f852a0f38554263e64363f57b07fc4 -
+================================================================================
+
+
================================================================================
= vendor/github.com/stretchr/objx licensed under: =
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 33eee3d787..70ade600a0 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -49239,6 +49239,10 @@
"description": "Name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass.",
"type": "string"
},
+ "storageos": {
+ "description": "StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.StorageOSPersistentVolumeSource"
+ },
"vsphereVolume": {
"description": "VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine",
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.VsphereVirtualDiskVolumeSource"
@@ -50712,6 +50716,56 @@
}
}
},
+ "io.k8s.kubernetes.pkg.api.v1.StorageOSPersistentVolumeSource": {
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "fsType": {
+ "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.",
+ "type": "string"
+ },
+ "readOnly": {
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
+ "type": "boolean"
+ },
+ "secretRef": {
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted.",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.ObjectReference"
+ },
+ "volumeName": {
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace.",
+ "type": "string"
+ },
+ "volumeNamespace": {
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created.",
+ "type": "string"
+ }
+ }
+ },
+ "io.k8s.kubernetes.pkg.api.v1.StorageOSVolumeSource": {
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "fsType": {
+ "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.",
+ "type": "string"
+ },
+ "readOnly": {
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
+ "type": "boolean"
+ },
+ "secretRef": {
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted.",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.LocalObjectReference"
+ },
+ "volumeName": {
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace.",
+ "type": "string"
+ },
+ "volumeNamespace": {
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created.",
+ "type": "string"
+ }
+ }
+ },
"io.k8s.kubernetes.pkg.api.v1.TCPSocketAction": {
"description": "TCPSocketAction describes an action based on opening a socket",
"required": [
@@ -50893,6 +50947,10 @@
"description": "Secret represents a secret that should populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret",
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.SecretVolumeSource"
},
+ "storageos": {
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.StorageOSVolumeSource"
+ },
"vsphereVolume": {
"description": "VsphereVolume represents a vSphere volume attached and mounted on kubelets host machine",
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.VsphereVirtualDiskVolumeSource"
diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json
index 223ea8cd08..2a6e7d973e 100644
--- a/api/swagger-spec/apps_v1beta1.json
+++ b/api/swagger-spec/apps_v1beta1.json
@@ -3945,6 +3945,10 @@
"scaleIO": {
"$ref": "v1.ScaleIOVolumeSource",
"description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
+ "storageos": {
+ "$ref": "v1.StorageOSVolumeSource",
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -4808,6 +4812,32 @@
}
}
},
+ "v1.StorageOSVolumeSource": {
+ "id": "v1.StorageOSVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"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 9c16d4386d..429b0b3e6f 100644
--- a/api/swagger-spec/batch_v1.json
+++ b/api/swagger-spec/batch_v1.json
@@ -1692,6 +1692,10 @@
"scaleIO": {
"$ref": "v1.ScaleIOVolumeSource",
"description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
+ "storageos": {
+ "$ref": "v1.StorageOSVolumeSource",
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -2555,6 +2559,32 @@
}
}
},
+ "v1.StorageOSVolumeSource": {
+ "id": "v1.StorageOSVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"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_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json
index 5b44e2da7c..e2ee18fcd1 100644
--- a/api/swagger-spec/batch_v2alpha1.json
+++ b/api/swagger-spec/batch_v2alpha1.json
@@ -2773,6 +2773,10 @@
"scaleIO": {
"$ref": "v1.ScaleIOVolumeSource",
"description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
+ "storageos": {
+ "$ref": "v1.StorageOSVolumeSource",
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -3636,6 +3640,32 @@
}
}
},
+ "v1.StorageOSVolumeSource": {
+ "id": "v1.StorageOSVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"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 3b88dd3270..384c198a2b 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -7417,6 +7417,10 @@
"scaleIO": {
"$ref": "v1.ScaleIOVolumeSource",
"description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
+ "storageos": {
+ "$ref": "v1.StorageOSVolumeSource",
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -8280,6 +8284,32 @@
}
}
},
+ "v1.StorageOSVolumeSource": {
+ "id": "v1.StorageOSVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/api/swagger-spec/settings.k8s.io_v1alpha1.json b/api/swagger-spec/settings.k8s.io_v1alpha1.json
index ab62c4c2ef..906485e9ac 100644
--- a/api/swagger-spec/settings.k8s.io_v1alpha1.json
+++ b/api/swagger-spec/settings.k8s.io_v1alpha1.json
@@ -1557,6 +1557,10 @@
"scaleIO": {
"$ref": "v1.ScaleIOVolumeSource",
"description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
+ "storageos": {
+ "$ref": "v1.StorageOSVolumeSource",
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -2382,6 +2386,32 @@
}
}
},
+ "v1.StorageOSVolumeSource": {
+ "id": "v1.StorageOSVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"v1.VolumeMount": {
"id": "v1.VolumeMount",
"description": "VolumeMount describes a mounting of a Volume within a container.",
diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
index 7cee7941a2..84fa687715 100644
--- a/api/swagger-spec/v1.json
+++ b/api/swagger-spec/v1.json
@@ -18891,6 +18891,10 @@
"$ref": "v1.LocalVolumeSource",
"description": "Local represents directly-attached storage with node affinity"
},
+ "storageos": {
+ "$ref": "v1.StorageOSPersistentVolumeSource",
+ "description": "StorageOS represents a StorageOS volume that is attached to the kubelet's host machine and mounted into the pod More info: https://releases.k8s.io/HEAD/examples/volumes/storageos/README.md"
+ },
"accessModes": {
"type": "array",
"items": {
@@ -19482,6 +19486,32 @@
}
}
},
+ "v1.StorageOSPersistentVolumeSource": {
+ "id": "v1.StorageOSPersistentVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.ObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"v1.PersistentVolumeStatus": {
"id": "v1.PersistentVolumeStatus",
"description": "PersistentVolumeStatus is the current status of a persistent volume.",
@@ -19789,6 +19819,10 @@
"scaleIO": {
"$ref": "v1.ScaleIOVolumeSource",
"description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
+ "storageos": {
+ "$ref": "v1.StorageOSVolumeSource",
+ "description": "StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -20095,6 +20129,32 @@
}
}
},
+ "v1.StorageOSVolumeSource": {
+ "id": "v1.StorageOSVolumeSource",
+ "description": "Represents a StorageOS persistent volume resource.",
+ "properties": {
+ "volumeName": {
+ "type": "string",
+ "description": "VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace."
+ },
+ "volumeNamespace": {
+ "type": "string",
+ "description": "VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod's namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to \"default\" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created."
+ },
+ "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."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted."
+ }
+ }
+ },
"v1.Container": {
"id": "v1.Container",
"description": "A single application container that you want to run within a pod.",
diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD
index 2a05c6c2d5..0f4b61a298 100644
--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -90,6 +90,7 @@ go_library(
"//pkg/volume/quobyte:go_default_library",
"//pkg/volume/rbd:go_default_library",
"//pkg/volume/scaleio:go_default_library",
+ "//pkg/volume/storageos:go_default_library",
"//pkg/volume/vsphere_volume:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go
index 45dbec4f2a..6ef8477856 100644
--- a/cmd/kube-controller-manager/app/plugins.go
+++ b/cmd/kube-controller-manager/app/plugins.go
@@ -54,6 +54,7 @@ import (
"k8s.io/kubernetes/pkg/volume/quobyte"
"k8s.io/kubernetes/pkg/volume/rbd"
"k8s.io/kubernetes/pkg/volume/scaleio"
+ "k8s.io/kubernetes/pkg/volume/storageos"
"k8s.io/kubernetes/pkg/volume/vsphere_volume"
)
@@ -75,6 +76,7 @@ func ProbeAttachableVolumePlugins(config componentconfig.VolumeConfiguration) []
allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)
return allPlugins
}
@@ -123,6 +125,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen
allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)
if cloud != nil {
switch {
diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD
index 64d3404928..89e870fb0b 100644
--- a/cmd/kubelet/app/BUILD
+++ b/cmd/kubelet/app/BUILD
@@ -103,6 +103,7 @@ go_library(
"//pkg/volume/rbd:go_default_library",
"//pkg/volume/scaleio:go_default_library",
"//pkg/volume/secret:go_default_library",
+ "//pkg/volume/storageos:go_default_library",
"//pkg/volume/vsphere_volume:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go
index be45e063d4..852bd12bf0 100644
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -54,6 +54,7 @@ import (
"k8s.io/kubernetes/pkg/volume/rbd"
"k8s.io/kubernetes/pkg/volume/scaleio"
"k8s.io/kubernetes/pkg/volume/secret"
+ "k8s.io/kubernetes/pkg/volume/storageos"
"k8s.io/kubernetes/pkg/volume/vsphere_volume"
// Cloud providers
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
@@ -97,6 +98,7 @@ func ProbeVolumePlugins(pluginDir string) []volume.VolumePlugin {
allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, storageos.ProbeVolumePlugins()...)
return allPlugins
}
diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html
index 4722d2f3b8..6b682a60b2 100755
--- a/docs/api-reference/apps/v1beta1/definitions.html
+++ b/docs/api-reference/apps/v1beta1/definitions.html
@@ -3185,6 +3185,13 @@ The StatefulSet guarantees that a given network identity will always map to the
v1.ScaleIOVolumeSource |
|
+
+storageos |
+StorageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. |
+false |
+v1.StorageOSVolumeSource |
+ |
+
@@ -6547,6 +6554,68 @@ Examples:
+
+
+
v1.StorageOSVolumeSource
+
+
Represents a StorageOS persistent volume resource.
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+volumeName |
+VolumeName is the human-readable name of the StorageOS volume. Volume names are only unique within a namespace. |
+false |
+string |
+ |
+
+
+volumeNamespace |
+VolumeNamespace specifies the scope of the volume within StorageOS. If no namespace is specified then the Pod’s namespace will be used. This allows the Kubernetes name scoping to be mirrored within StorageOS for tighter integration. Set VolumeName to any name to override the default behaviour. Set to "default" if you are not using namespaces within StorageOS. Namespaces that do not pre-exist within StorageOS will be created. |
+false |
+string |
+ |
+
+
+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 |
+
+
+secretRef |
+SecretRef specifies the secret to use for obtaining the StorageOS API credentials. If not specified, default values will be attempted. |
+false |
+v1.LocalObjectReference |
+ |
+
+
+
+
v1beta1.StatefulSetUpdateStrategy
@@ -6738,7 +6807,7 @@ Examples:
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html
index 621cafd0f3..45d334c537 100755
--- a/docs/api-reference/batch/v1/definitions.html
+++ b/docs/api-reference/batch/v1/definitions.html
@@ -2700,6 +2700,13 @@ When an object is created, the system will populate this list with the current s