From c22c447e09e821b0563672a67552636b845c2c72 Mon Sep 17 00:00:00 2001 From: Jake Plimack Date: Wed, 14 Mar 2018 10:26:14 -0600 Subject: [PATCH 1/2] 1.1.6 Signed-off-by: Jake Plimack --- container_transform/marathon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_transform/marathon.py b/container_transform/marathon.py index aa38ca2..8af5fea 100644 --- a/container_transform/marathon.py +++ b/container_transform/marathon.py @@ -279,7 +279,7 @@ def emit_port_mappings(self, port_mappings): in port_mappings] def ingest_memory(self, memory): - return memory << 20 + return int(memory) << 20 def emit_memory(self, memory): mem_in_mb = memory >> 20 From ea260d6cc2bd60b6b37e93a5f4db662249a53081 Mon Sep 17 00:00:00 2001 From: Jake Plimack Date: Wed, 14 Mar 2018 10:52:28 -0600 Subject: [PATCH 2/2] and kube Signed-off-by: Jake Plimack --- container_transform/chronos.py | 2 +- container_transform/kubernetes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_transform/chronos.py b/container_transform/chronos.py index cadb169..ef4c323 100644 --- a/container_transform/chronos.py +++ b/container_transform/chronos.py @@ -268,7 +268,7 @@ def emit_port_mappings(self, port_mappings): in port_mappings] def ingest_memory(self, memory): - return memory << 20 + return int(memory) << 20 def emit_memory(self, memory): mem_in_mb = memory >> 20 diff --git a/container_transform/kubernetes.py b/container_transform/kubernetes.py index b9c5f7a..33c620d 100644 --- a/container_transform/kubernetes.py +++ b/container_transform/kubernetes.py @@ -162,7 +162,7 @@ def emit_containers(self, containers, verbose=True): output = { 'kind': 'Deployment', - 'apiVersion': 'extensions/v1beta1', + 'apiVersion': 'apps/v1', 'metadata': { 'name': None, 'namespace': 'default',