diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ef658d87dff..a29e3f0f05b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -401,6 +401,14 @@
"ImportPath": "github.com/clusterhq/flocker-go",
"Rev": "2b8b7259d3139c96c4a6871031355808ab3fd3b3"
},
+ {
+ "ImportPath": "github.com/codedellemc/goscaleio",
+ "Rev": "8ed64a07d23f79bab973f1630651841ccc656887"
+ },
+ {
+ "ImportPath": "github.com/codedellemc/goscaleio/types/v1",
+ "Rev": "8ed64a07d23f79bab973f1630651841ccc656887"
+ },
{
"ImportPath": "github.com/codegangsta/negroni",
"Comment": "v0.1.0-62-g8d75e11",
diff --git a/Godeps/LICENSES b/Godeps/LICENSES
index 5c7ca6626c0..cc6d45c7a2b 100644
--- a/Godeps/LICENSES
+++ b/Godeps/LICENSES
@@ -11475,6 +11475,426 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
+================================================================================
+= vendor/github.com/codedellemc/goscaleio licensed under: =
+
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+= vendor/github.com/codedellemc/goscaleio/LICENSE d2794c0df5b907fdace235a619d80314 -
+================================================================================
+
+
+================================================================================
+= vendor/github.com/codedellemc/goscaleio/types/v1 licensed under: =
+
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+= vendor/github.com/codedellemc/goscaleio/LICENSE d2794c0df5b907fdace235a619d80314 -
+================================================================================
+
+
================================================================================
= vendor/github.com/codegangsta/negroni licensed under: =
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 59325e8f27b..3374de81d99 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -40590,6 +40590,10 @@
"description": "RBD represents a Rados Block Device mount on the host that shares a pod's lifetime. More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md",
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.RBDVolumeSource"
},
+ "scaleIO": {
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.ScaleIOVolumeSource"
+ },
"storageClassName": {
"description": "Name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass.",
"type": "string"
@@ -41567,6 +41571,56 @@
}
}
},
+ "io.k8s.kubernetes.pkg.api.v1.ScaleIOVolumeSource": {
+ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+ "required": [
+ "gateway",
+ "system",
+ "secretRef"
+ ],
+ "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"
+ },
+ "gateway": {
+ "description": "The host address of the ScaleIO API Gateway.",
+ "type": "string"
+ },
+ "protectionDomain": {
+ "description": "The name of the Protection Domain for the configured storage (defaults to \"default\").",
+ "type": "string"
+ },
+ "readOnly": {
+ "description": "Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
+ "type": "boolean"
+ },
+ "secretRef": {
+ "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.LocalObjectReference"
+ },
+ "sslEnabled": {
+ "description": "Flag to enable/disable SSL communication with Gateway, default false",
+ "type": "boolean"
+ },
+ "storageMode": {
+ "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\").",
+ "type": "string"
+ },
+ "storagePool": {
+ "description": "The Storage Pool associated with the protection domain (defaults to \"default\").",
+ "type": "string"
+ },
+ "system": {
+ "description": "The name of the storage system as configured in ScaleIO.",
+ "type": "string"
+ },
+ "volumeName": {
+ "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source.",
+ "type": "string"
+ }
+ }
+ },
"io.k8s.kubernetes.pkg.api.v1.Secret": {
"description": "Secret holds secret data of a certain type. The total bytes of the values in the Data field must be less than MaxSecretSize bytes.",
"properties": {
@@ -42158,6 +42212,10 @@
"description": "RBD represents a Rados Block Device mount on the host that shares a pod's lifetime. More info: http://releases.k8s.io/HEAD/examples/volumes/rbd/README.md",
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.RBDVolumeSource"
},
+ "scaleIO": {
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.",
+ "$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.ScaleIOVolumeSource"
+ },
"secret": {
"description": "Secret represents a secret that should populate this volume. More info: http://kubernetes.io/docs/user-guide/volumes#secrets",
"$ref": "#/definitions/io.k8s.kubernetes.pkg.api.v1.SecretVolumeSource"
diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json
index 92043cafe95..9bc04dfeeb2 100644
--- a/api/swagger-spec/apps_v1beta1.json
+++ b/api/swagger-spec/apps_v1beta1.json
@@ -2722,6 +2722,10 @@
"portworxVolume": {
"$ref": "v1.PortworxVolumeSource",
"description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
+ },
+ "scaleIO": {
+ "$ref": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -3502,6 +3506,57 @@
}
}
},
+ "v1.ScaleIOVolumeSource": {
+ "id": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+ "required": [
+ "gateway",
+ "system",
+ "secretRef"
+ ],
+ "properties": {
+ "gateway": {
+ "type": "string",
+ "description": "The host address of the ScaleIO API Gateway."
+ },
+ "system": {
+ "type": "string",
+ "description": "The name of the storage system as configured in ScaleIO."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail."
+ },
+ "sslEnabled": {
+ "type": "boolean",
+ "description": "Flag to enable/disable SSL communication with Gateway, default false"
+ },
+ "protectionDomain": {
+ "type": "string",
+ "description": "The name of the Protection Domain for the configured storage (defaults to \"default\")."
+ },
+ "storagePool": {
+ "type": "string",
+ "description": "The Storage Pool associated with the protection domain (defaults to \"default\")."
+ },
+ "storageMode": {
+ "type": "string",
+ "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\")."
+ },
+ "volumeName": {
+ "type": "string",
+ "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source."
+ },
+ "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.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 32434755d40..ed805e1f308 100644
--- a/api/swagger-spec/batch_v1.json
+++ b/api/swagger-spec/batch_v1.json
@@ -1505,6 +1505,10 @@
"portworxVolume": {
"$ref": "v1.PortworxVolumeSource",
"description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
+ },
+ "scaleIO": {
+ "$ref": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -2285,6 +2289,57 @@
}
}
},
+ "v1.ScaleIOVolumeSource": {
+ "id": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+ "required": [
+ "gateway",
+ "system",
+ "secretRef"
+ ],
+ "properties": {
+ "gateway": {
+ "type": "string",
+ "description": "The host address of the ScaleIO API Gateway."
+ },
+ "system": {
+ "type": "string",
+ "description": "The name of the storage system as configured in ScaleIO."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail."
+ },
+ "sslEnabled": {
+ "type": "boolean",
+ "description": "Flag to enable/disable SSL communication with Gateway, default false"
+ },
+ "protectionDomain": {
+ "type": "string",
+ "description": "The name of the Protection Domain for the configured storage (defaults to \"default\")."
+ },
+ "storagePool": {
+ "type": "string",
+ "description": "The Storage Pool associated with the protection domain (defaults to \"default\")."
+ },
+ "storageMode": {
+ "type": "string",
+ "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\")."
+ },
+ "volumeName": {
+ "type": "string",
+ "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source."
+ },
+ "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.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 129c718f6d2..975234f4436 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -6969,6 +6969,10 @@
"portworxVolume": {
"$ref": "v1.PortworxVolumeSource",
"description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
+ },
+ "scaleIO": {
+ "$ref": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -7749,6 +7753,57 @@
}
}
},
+ "v1.ScaleIOVolumeSource": {
+ "id": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+ "required": [
+ "gateway",
+ "system",
+ "secretRef"
+ ],
+ "properties": {
+ "gateway": {
+ "type": "string",
+ "description": "The host address of the ScaleIO API Gateway."
+ },
+ "system": {
+ "type": "string",
+ "description": "The name of the storage system as configured in ScaleIO."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail."
+ },
+ "sslEnabled": {
+ "type": "boolean",
+ "description": "Flag to enable/disable SSL communication with Gateway, default false"
+ },
+ "protectionDomain": {
+ "type": "string",
+ "description": "The name of the Protection Domain for the configured storage (defaults to \"default\")."
+ },
+ "storagePool": {
+ "type": "string",
+ "description": "The Storage Pool associated with the protection domain (defaults to \"default\")."
+ },
+ "storageMode": {
+ "type": "string",
+ "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\")."
+ },
+ "volumeName": {
+ "type": "string",
+ "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source."
+ },
+ "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.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 c0b660bfdcc..ed8d9142da5 100644
--- a/api/swagger-spec/settings.k8s.io_v1alpha1.json
+++ b/api/swagger-spec/settings.k8s.io_v1alpha1.json
@@ -1377,6 +1377,10 @@
"portworxVolume": {
"$ref": "v1.PortworxVolumeSource",
"description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
+ },
+ "scaleIO": {
+ "$ref": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
}
}
},
@@ -2119,6 +2123,57 @@
}
}
},
+ "v1.ScaleIOVolumeSource": {
+ "id": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+ "required": [
+ "gateway",
+ "system",
+ "secretRef"
+ ],
+ "properties": {
+ "gateway": {
+ "type": "string",
+ "description": "The host address of the ScaleIO API Gateway."
+ },
+ "system": {
+ "type": "string",
+ "description": "The name of the storage system as configured in ScaleIO."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail."
+ },
+ "sslEnabled": {
+ "type": "boolean",
+ "description": "Flag to enable/disable SSL communication with Gateway, default false"
+ },
+ "protectionDomain": {
+ "type": "string",
+ "description": "The name of the Protection Domain for the configured storage (defaults to \"default\")."
+ },
+ "storagePool": {
+ "type": "string",
+ "description": "The Storage Pool associated with the protection domain (defaults to \"default\")."
+ },
+ "storageMode": {
+ "type": "string",
+ "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\")."
+ },
+ "volumeName": {
+ "type": "string",
+ "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source."
+ },
+ "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.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 596a25328ca..02a6eb1bdc3 100644
--- a/api/swagger-spec/v1.json
+++ b/api/swagger-spec/v1.json
@@ -18013,6 +18013,10 @@
"$ref": "v1.PortworxVolumeSource",
"description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
},
+ "scaleIO": {
+ "$ref": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
+ },
"accessModes": {
"type": "array",
"items": {
@@ -18512,6 +18516,57 @@
}
}
},
+ "v1.ScaleIOVolumeSource": {
+ "id": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
+ "required": [
+ "gateway",
+ "system",
+ "secretRef"
+ ],
+ "properties": {
+ "gateway": {
+ "type": "string",
+ "description": "The host address of the ScaleIO API Gateway."
+ },
+ "system": {
+ "type": "string",
+ "description": "The name of the storage system as configured in ScaleIO."
+ },
+ "secretRef": {
+ "$ref": "v1.LocalObjectReference",
+ "description": "SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail."
+ },
+ "sslEnabled": {
+ "type": "boolean",
+ "description": "Flag to enable/disable SSL communication with Gateway, default false"
+ },
+ "protectionDomain": {
+ "type": "string",
+ "description": "The name of the Protection Domain for the configured storage (defaults to \"default\")."
+ },
+ "storagePool": {
+ "type": "string",
+ "description": "The Storage Pool associated with the protection domain (defaults to \"default\")."
+ },
+ "storageMode": {
+ "type": "string",
+ "description": "Indicates whether the storage for a volume should be thick or thin (defaults to \"thin\")."
+ },
+ "volumeName": {
+ "type": "string",
+ "description": "The name of a volume already created in the ScaleIO system that is associated with this volume source."
+ },
+ "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.PersistentVolumeStatus": {
"id": "v1.PersistentVolumeStatus",
"description": "PersistentVolumeStatus is the current status of a persistent volume.",
@@ -18808,6 +18863,10 @@
"portworxVolume": {
"$ref": "v1.PortworxVolumeSource",
"description": "PortworxVolume represents a portworx volume attached and mounted on kubelets host machine"
+ },
+ "scaleIO": {
+ "$ref": "v1.ScaleIOVolumeSource",
+ "description": "ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes."
}
}
},
diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD
index 7e910f6fb0f..e41a72915c8 100644
--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -87,6 +87,7 @@ go_library(
"//pkg/volume/portworx:go_default_library",
"//pkg/volume/quobyte:go_default_library",
"//pkg/volume/rbd:go_default_library",
+ "//pkg/volume/scaleio:go_default_library",
"//pkg/volume/vsphere_volume:go_default_library",
"//vendor:github.com/golang/glog",
"//vendor:github.com/prometheus/client_golang/prometheus",
diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go
index d924071709c..d9dd42a755b 100644
--- a/cmd/kube-controller-manager/app/plugins.go
+++ b/cmd/kube-controller-manager/app/plugins.go
@@ -53,6 +53,7 @@ import (
"k8s.io/kubernetes/pkg/volume/portworx"
"k8s.io/kubernetes/pkg/volume/quobyte"
"k8s.io/kubernetes/pkg/volume/rbd"
+ "k8s.io/kubernetes/pkg/volume/scaleio"
"k8s.io/kubernetes/pkg/volume/vsphere_volume"
)
@@ -73,6 +74,7 @@ func ProbeAttachableVolumePlugins(config componentconfig.VolumeConfiguration) []
allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
return allPlugins
}
@@ -118,6 +120,7 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen
allPlugins = append(allPlugins, flocker.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
if cloud != nil {
switch {
diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD
index 41fd433115f..c68f6115a52 100644
--- a/cmd/kubelet/app/BUILD
+++ b/cmd/kubelet/app/BUILD
@@ -94,6 +94,7 @@ go_library(
"//pkg/volume/projected:go_default_library",
"//pkg/volume/quobyte:go_default_library",
"//pkg/volume/rbd:go_default_library",
+ "//pkg/volume/scaleio:go_default_library",
"//pkg/volume/secret:go_default_library",
"//pkg/volume/vsphere_volume:go_default_library",
"//vendor:github.com/golang/glog",
diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go
index a6213c8b2e9..a9aea2c365f 100644
--- a/cmd/kubelet/app/plugins.go
+++ b/cmd/kubelet/app/plugins.go
@@ -50,6 +50,7 @@ import (
"k8s.io/kubernetes/pkg/volume/projected"
"k8s.io/kubernetes/pkg/volume/quobyte"
"k8s.io/kubernetes/pkg/volume/rbd"
+ "k8s.io/kubernetes/pkg/volume/scaleio"
"k8s.io/kubernetes/pkg/volume/secret"
"k8s.io/kubernetes/pkg/volume/vsphere_volume"
// Cloud providers
@@ -92,6 +93,7 @@ func ProbeVolumePlugins(pluginDir string) []volume.VolumePlugin {
allPlugins = append(allPlugins, photon_pd.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, projected.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, portworx.ProbeVolumePlugins()...)
+ allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
return allPlugins
}
diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html
index 3430f7e8cf3..69802e20ca8 100755
--- a/docs/api-reference/apps/v1beta1/definitions.html
+++ b/docs/api-reference/apps/v1beta1/definitions.html
@@ -3018,6 +3018,13 @@ The StatefulSet guarantees that a given network identity will always map to the
v1.PortworxVolumeSource |
|
+
+scaleIO |
+ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. |
+false |
+v1.ScaleIOVolumeSource |
+ |
+
@@ -3438,68 +3445,6 @@ The StatefulSet guarantees that a given network identity will always map to the
-
-
-
v1.ContainerPort
-
-
ContainerPort represents a network port in a single container.
-
-
-
-
-
-
-
-
-
-
-
-| Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-name |
-If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. |
-false |
-string |
- |
-
-
-hostPort |
-Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. |
-false |
-integer (int32) |
- |
-
-
-containerPort |
-Number of port to expose on the pod’s IP address. This must be a valid port number, 0 < x < 65536. |
-true |
-integer (int32) |
- |
-
-
-protocol |
-Protocol for port. Must be UDP or TCP. Defaults to "TCP". |
-false |
-string |
- |
-
-
-hostIP |
-What host IP to bind the external port to. |
-false |
-string |
- |
-
-
-
-
v1.PodSpec
@@ -3681,6 +3626,68 @@ The StatefulSet guarantees that a given network identity will always map to the
+
+
+
v1.ContainerPort
+
+
ContainerPort represents a network port in a single container.
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+name |
+If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services. |
+false |
+string |
+ |
+
+
+hostPort |
+Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. |
+false |
+integer (int32) |
+ |
+
+
+containerPort |
+Number of port to expose on the pod’s IP address. This must be a valid port number, 0 < x < 65536. |
+true |
+integer (int32) |
+ |
+
+
+protocol |
+Protocol for port. Must be UDP or TCP. Defaults to "TCP". |
+false |
+string |
+ |
+
+
+hostIP |
+What host IP to bind the external port to. |
+false |
+string |
+ |
+
+
+
+
v1.Lifecycle
@@ -4183,6 +4190,103 @@ Examples:
+
+
+
v1.ScaleIOVolumeSource
+
+
ScaleIOVolumeSource represents a persistent ScaleIO volume
+
+
+
+
+
+
+
+
+
+
+
+| Name |
+Description |
+Required |
+Schema |
+Default |
+
+
+
+
+gateway |
+The host address of the ScaleIO API Gateway. |
+true |
+string |
+ |
+
+
+system |
+The name of the storage system as configured in ScaleIO. |
+true |
+string |
+ |
+
+
+secretRef |
+SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail. |
+true |
+v1.LocalObjectReference |
+ |
+
+
+sslEnabled |
+Flag to enable/disable SSL communication with Gateway, default false |
+false |
+boolean |
+false |
+
+
+protectionDomain |
+The name of the Protection Domain for the configured storage (defaults to "default"). |
+false |
+string |
+ |
+
+
+storagePool |
+The Storage Pool associated with the protection domain (defaults to "default"). |
+false |
+string |
+ |
+
+
+storageMode |
+Indicates whether the storage for a volume should be thick or thin (defaults to "thin"). |
+false |
+string |
+ |
+
+
+volumeName |
+The name of a volume already created in the ScaleIO system that is associated with this volume source. |
+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 |
+
+
+
+
v1.PhotonPersistentDiskVolumeSource
@@ -6152,7 +6256,7 @@ Examples:
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html
index fe6f075ce46..f1679bfc5d8 100755
--- a/docs/api-reference/batch/v1/definitions.html
+++ b/docs/api-reference/batch/v1/definitions.html
@@ -576,6 +576,103 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
+
+