Fixed merge conflicts

ocadotechnology · May 16, 2018 · 77b0d14 · 77b0d14
1 parent ff088f4
commit 77b0d14
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/aimmo-game-creator/game_manager.py b/aimmo-game-creator/game_manager.py
@@ -227,11 +227,11 @@ def _create_game_rc(self, id, environment_variables):
                                     "name": "aimmo-game",
                                     "resources": {
                                         "limits": {
-                                            "cpu": "1000m",
+                                            "cpu": "300m",
                                             "memory": "128Mi",
                                         },
                                         "requests": {
-                                            "cpu": "100m",
+                                            "cpu": "10m",
                                             "memory": "64Mi",
                                         },
                                     },