From 8a8e7e2d2e0a77fd94d4aa4bd5aef1ee59f68189 Mon Sep 17 00:00:00 2001 From: Ton Ngo Date: Thu, 30 Jul 2015 04:15:07 +0000 Subject: [PATCH] Migrate to Kubernetes Release 1 Kubernetes Release 1.0 was announced at OSCON A new Fedora Atomic image has been built with version 1.0.4 and this series of patches will update the templates, scripts, documents to work with the new image. The api has also been changed from v1beta3 to v1 and the beta api is no longer available, so the interface between Magnum and Kubernetes master are updated as well in this series of patches. This particular patch will bring up a V1 cluster with the bay-create command. Because the switch to the V1 API requires all the code changes to be applied at once, this patch pulls in portion of 3 patches together. The changes include: 1. devstack plugin downloads the new image. 2. k8s conductor and other code calls the new V1 client and k8s methods. 3. Configuration for k8s services and docker updated with new parameters. 4. Minion registration and example code updated to V1. 5. Functional tests updated to V1. 6. Gate test setup points to the new image. Co-Authored-By: Hongbin Lu Change-Id: I046931ad491e8b7ee45943852901eac5c3df913e Partially-Implements: blueprint kubernetes-v1 --- magnum/common/pythonk8sclient/swagger_client/api_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magnum/common/pythonk8sclient/swagger_client/api_client.py b/magnum/common/pythonk8sclient/swagger_client/api_client.py index 6d24a3a..97745eb 100644 --- a/magnum/common/pythonk8sclient/swagger_client/api_client.py +++ b/magnum/common/pythonk8sclient/swagger_client/api_client.py @@ -187,7 +187,7 @@ class ApiClient(object): """ if isinstance(obj, type(None)): return None - elif isinstance(obj, (str, int, float, bool, tuple)): + elif isinstance(obj, (unicode, str, int, float, bool, tuple, file)): return obj elif isinstance(obj, list): return [self.sanitize_for_serialization(sub_obj)