diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 42169407ec2..8f071538f3f 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -65,10 +65,6 @@ "Comment": "v7.0.6-4-g2492d97", "Rev": "2492d97b402e00797833c03ac5fa1c572c7bb29a" }, - { - "ImportPath": "github.com/ClusterHQ/flocker-go", - "Rev": "1c0a791b33bdc01d062b376612aa04e27eed7eb3" - }, { "ImportPath": "github.com/Microsoft/go-winio", "Comment": "v0.1.0", @@ -331,6 +327,10 @@ "Comment": "1.2.0", "Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30" }, + { + "ImportPath": "github.com/clusterhq/flocker-go", + "Rev": "2b8b7259d3139c96c4a6871031355808ab3fd3b3" + }, { "ImportPath": "github.com/codegangsta/negroni", "Comment": "v0.1.0-62-g8d75e11", diff --git a/Godeps/LICENSES b/Godeps/LICENSES index 4bc102e8923..108a3121d1e 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -9231,7 +9231,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -= vendor/github.com/ClusterHQ/flocker-go licensed under: = += vendor/github.com/clusterhq/flocker-go licensed under: = Apache License Version 2.0, January 2004 @@ -9424,7 +9424,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. See the License for the specific language governing permissions and limitations under the License. -= vendor/github.com/ClusterHQ/flocker-go/LICENSE d8103d9796cd0e951379d0834edad066 - += vendor/github.com/clusterhq/flocker-go/LICENSE d8103d9796cd0e951379d0834edad066 - ================================================================================ diff --git a/api/swagger-spec/apps_v1alpha1.json b/api/swagger-spec/apps_v1alpha1.json index 850f21e5fd7..2b67b4806db 100644 --- a/api/swagger-spec/apps_v1alpha1.json +++ b/api/swagger-spec/apps_v1alpha1.json @@ -1813,14 +1813,15 @@ }, "v1.FlockerVolumeSource": { "id": "v1.FlockerVolumeSource", - "description": "Represents a Flocker volume mounted by the Flocker agent. Flocker volumes do not support ownership management or SELinux relabeling.", - "required": [ - "datasetName" - ], + "description": "Represents a Flocker volume mounted by the Flocker agent. One and only one of datasetName and datasetUUID should be set. Flocker volumes do not support ownership management or SELinux relabeling.", "properties": { "datasetName": { "type": "string", - "description": "Required: the volume name. This is going to be store on metadata -\u003e name on the payload for Flocker" + "description": "Name of the dataset stored as metadata -\u003e name on the dataset for Flocker should be considered as deprecated" + }, + "datasetUUID": { + "type": "string", + "description": "UUID of the dataset. This is unique identifier of a Flocker dataset" } } }, diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 5ff9ed4278b..35d84daaa68 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -1818,14 +1818,15 @@ }, "v1.FlockerVolumeSource": { "id": "v1.FlockerVolumeSource", - "description": "Represents a Flocker volume mounted by the Flocker agent. Flocker volumes do not support ownership management or SELinux relabeling.", - "required": [ - "datasetName" - ], + "description": "Represents a Flocker volume mounted by the Flocker agent. One and only one of datasetName and datasetUUID should be set. Flocker volumes do not support ownership management or SELinux relabeling.", "properties": { "datasetName": { "type": "string", - "description": "Required: the volume name. This is going to be store on metadata -\u003e name on the payload for Flocker" + "description": "Name of the dataset stored as metadata -\u003e name on the dataset for Flocker should be considered as deprecated" + }, + "datasetUUID": { + "type": "string", + "description": "UUID of the dataset. This is unique identifier of a Flocker dataset" } } }, diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index 957eb6df9f7..dad4b76944e 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -8427,14 +8427,15 @@ }, "v1.FlockerVolumeSource": { "id": "v1.FlockerVolumeSource", - "description": "Represents a Flocker volume mounted by the Flocker agent. Flocker volumes do not support ownership management or SELinux relabeling.", - "required": [ - "datasetName" - ], + "description": "Represents a Flocker volume mounted by the Flocker agent. One and only one of datasetName and datasetUUID should be set. Flocker volumes do not support ownership management or SELinux relabeling.", "properties": { "datasetName": { "type": "string", - "description": "Required: the volume name. This is going to be store on metadata -\u003e name on the payload for Flocker" + "description": "Name of the dataset stored as metadata -\u003e name on the dataset for Flocker should be considered as deprecated" + }, + "datasetUUID": { + "type": "string", + "description": "UUID of the dataset. This is unique identifier of a Flocker dataset" } } }, diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 3cb720e758f..9ba11f35415 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -17638,14 +17638,15 @@ }, "v1.FlockerVolumeSource": { "id": "v1.FlockerVolumeSource", - "description": "Represents a Flocker volume mounted by the Flocker agent. Flocker volumes do not support ownership management or SELinux relabeling.", - "required": [ - "datasetName" - ], + "description": "Represents a Flocker volume mounted by the Flocker agent. One and only one of datasetName and datasetUUID should be set. Flocker volumes do not support ownership management or SELinux relabeling.", "properties": { "datasetName": { "type": "string", - "description": "Required: the volume name. This is going to be store on metadata -\u003e name on the payload for Flocker" + "description": "Name of the dataset stored as metadata -\u003e name on the dataset for Flocker should be considered as deprecated" + }, + "datasetUUID": { + "type": "string", + "description": "UUID of the dataset. This is unique identifier of a Flocker dataset" } } }, diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go index 231e39a7a4a..accbbd3b203 100644 --- a/cmd/kube-controller-manager/app/plugins.go +++ b/cmd/kube-controller-manager/app/plugins.go @@ -41,6 +41,7 @@ import ( "k8s.io/kubernetes/pkg/volume/azure_dd" "k8s.io/kubernetes/pkg/volume/cinder" "k8s.io/kubernetes/pkg/volume/flexvolume" + "k8s.io/kubernetes/pkg/volume/flocker" "k8s.io/kubernetes/pkg/volume/gce_pd" "k8s.io/kubernetes/pkg/volume/glusterfs" "k8s.io/kubernetes/pkg/volume/host_path" @@ -108,6 +109,8 @@ func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config componen allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...) allPlugins = append(allPlugins, quobyte.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, flocker.ProbeVolumePlugins()...) + if cloud != nil { switch { case aws.ProviderName == cloud.ProviderName(): diff --git a/docs/api-reference/apps/v1alpha1/definitions.html b/docs/api-reference/apps/v1alpha1/definitions.html index dbadc97470a..3ad226cdaed 100755 --- a/docs/api-reference/apps/v1alpha1/definitions.html +++ b/docs/api-reference/apps/v1alpha1/definitions.html @@ -2353,7 +2353,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
Represents a Flocker volume mounted by the Flocker agent. Flocker volumes do not support ownership management or SELinux relabeling.
+Represents a Flocker volume mounted by the Flocker agent. One and only one of datasetName and datasetUUID should be set. Flocker volumes do not support ownership management or SELinux relabeling.
datasetName |
-Required: the volume name. This is going to be store on metadata → name on the payload for Flocker |
-true |
+Name of the dataset stored as metadata → name on the dataset for Flocker should be considered as deprecated |
+false |
+string |
++ |
datasetUUID |
+UUID of the dataset. This is unique identifier of a Flocker dataset |
+false |
string |