Skip to content

memory is an integer - v1.1.6 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kplimack wants to merge 2 commits into
base: master
Choose a base branch
from
Open

memory is an integer - v1.1.6 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22c447
1.1.6
kplimack Mar 14, 2018
ea260d6
and kube
kplimack Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion container_transform/chronos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion container_transform/kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion container_transform/marathon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down