Merge pull request #92 from jianxiaoguo/main

add KUBERNETES_LIMITS env config and fix /bin/sh -c no arg err

Author: duanhongyi

rootfs/api/models/app.py

@@ -153,8 +153,11 @@ def _get_entrypoint(self, container_type):
         """
         Return the kubernetes "container command" to be sent off to the scheduler.
         """
-        entrypoint = ['/bin/sh', '-c']
+        entrypoint = []
         release = self.release_set.filter(failed=False).latest()
+        if release is not None and release.build is not None:
+            if release.build.procfile and container_type in release.build.procfile:
+                entrypoint = ['/bin/sh', '-c']
         if self._get_stack(release) == "buildpack":
             if container_type in release.build.procfile:
                 entrypoint = [container_type]

rootfs/api/settings/production.py

@@ -350,17 +350,17 @@
 KUBERNETES_REQUEST_MEMORY_RATIO = int(os.environ.get('KUBERNETES_REQUEST_MEMORY_RATIO', '2'))
 
 # Minimum CPU limit, units are represented in the millicpu of CPUs
-KUBERNETES_LIMITS_MIN_CPU = 125
+KUBERNETES_LIMITS_MIN_CPU = int(os.environ.get('KUBERNETES_LIMITS_MIN_CPU', '125'))
 # Max CPU limit, units are represented in the millicpu of CPUs
-KUBERNETES_LIMITS_MAX_CPU = 32 * 1000
+KUBERNETES_LIMITS_MAX_CPU = int(os.environ.get('KUBERNETES_LIMITS_MAX_CPU', 32 * 1000))
 # Minimum Memory limit, units are represented in Megabytes(M)
-KUBERNETES_LIMITS_MIN_MEMORY = 128
+KUBERNETES_LIMITS_MIN_MEMORY = int(os.environ.get('KUBERNETES_LIMITS_MIN_MEMORY', '128'))
 # Max Memory limit, units are represented in Megabytes(M)
-KUBERNETES_LIMITS_MAX_MEMORY = 128 * 1024
+KUBERNETES_LIMITS_MAX_MEMORY = int(os.environ.get('KUBERNETES_LIMITS_MAX_MEMORY', 128 * 1024))
 # Minimum Stroage Volume limit, units are represented in Gigabytes(G)
-KUBERNETES_LIMITS_MIN_VOLUME = 1
+KUBERNETES_LIMITS_MIN_VOLUME = int(os.environ.get('KUBERNETES_LIMITS_MIN_VOLUME', 1))
 # Max Stroage Volume limit, units are represented in Gigabytes(G)
-KUBERNETES_LIMITS_MAX_VOLUME = 1024 * 16
+KUBERNETES_LIMITS_MAX_VOLUME = int(os.environ.get('KUBERNETES_LIMITS_MAX_VOLUME', 1024 * 16))
 
 # Default pod spec for application.
 KUBERNETES_POD_DEFAULT_RESOURCES = os.environ.get(

rootfs/api/tests/test_pods.py

@@ -589,7 +589,7 @@ def test_run_command_good(self, mock_requests):
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 200, response.data)
         app = App.objects.get(id=app_id)
-        self.assertEqual(app._get_entrypoint('cmd'), ['/bin/sh', '-c'])
+        self.assertEqual(app._get_entrypoint('cmd'), [])
 
         # procfile workflow
         build.sha = 'somereallylongsha'