Merge branch 'master' into dependabot/pip/django-3.2.16

# Conflicts: # Pipfile.lock # aimmo-game-creator/game_manager.py # aimmo_runner/setup.py
ocadotechnology · Nov 7, 2022 · ad34a5d · ad34a5d
2 parents 17f8b79 + cee51e1
commit ad34a5d
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 <!--next-version-placeholder-->
 
+## v2.5.8 (2022-11-04)
+### Fix
+* Add kubernetes to setup.py ([#1721](https://github.com/ocadotechnology/aimmo/issues/1721)) ([`9323fd7`](https://github.com/ocadotechnology/aimmo/commit/9323fd77226f567d9f81298ea55517e48e3c26c5))
+
+## v2.5.7 (2022-10-27)
+### Fix
+* Game class show fix ([#1719](https://github.com/ocadotechnology/aimmo/issues/1719)) ([`521ffc1`](https://github.com/ocadotechnology/aimmo/commit/521ffc13f70ed8517fb8cf9646c379ed67c47e7a))
+
+## v2.5.6 (2022-10-24)
+### Fix
+* Also use ServiceBackendPort ([`71d117d`](https://github.com/ocadotechnology/aimmo/commit/71d117d094c14b5d212f73db9dfd88bbcfd83d90))
+
+## v2.5.5 (2022-10-24)
+### Fix
+* Use Kubernetes 23 and update Ingress API ([`ce0d346`](https://github.com/ocadotechnology/aimmo/commit/ce0d346ae47c5ce033d31d34a88a98cefc748db7))
+
 ## v2.5.4 (2022-10-20)
 ### Fix
 * Update k8s api ([#1715](https://github.com/ocadotechnology/aimmo/issues/1715)) ([`3ec86ac`](https://github.com/ocadotechnology/aimmo/commit/3ec86ac4e8c585688f1494cd3970a86dd2ac45aa))

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/aimmo-game-creator/game_manager.py b/aimmo-game-creator/game_manager.py
@@ -181,7 +181,8 @@ def _create_game_name(game_id):
 
     def _add_path_to_ingress(self, game_id):
         game_name = KubernetesGameManager._create_game_name(game_id)
-        game_service = kubernetes.client.V1IngressServiceBackend(game_name, 80)
+        game_port = kubernetes.client.V1ServiceBackendPort(number=80)
+        game_service = kubernetes.client.V1IngressServiceBackend(game_name, game_port)
         backend = kubernetes.client.V1IngressBackend(service=game_service)
         path = kubernetes.client.V1HTTPIngressPath(backend, f"/{game_name}(/|$)(.*)", path_type="Prefix")
 
@@ -195,7 +196,8 @@ def _add_path_to_ingress(self, game_id):
 
     def _remove_path_from_ingress(self, game_id):
         game_name = KubernetesGameManager._create_game_name(game_id)
-        game_service = kubernetes.client.V1IngressServiceBackend(game_name, 80)
+        game_port = kubernetes.client.V1ServiceBackendPort(number=80)
+        game_service = kubernetes.client.V1IngressServiceBackend(game_name, game_port)
         backend = kubernetes.client.V1IngressBackend(service=game_service)
         path = kubernetes.client.V1HTTPIngressPath(backend, f"/{game_name}(/|$)(.*)", path_type="Prefix")
         try:

diff --git a/aimmo/__init__.py b/aimmo/__init__.py
@@ -1 +1 @@
-__version__ = "2.5.4"
+__version__ = "2.5.8"
diff --git a/aimmo/templatetags/players_utils.py b/aimmo/templatetags/players_utils.py
@@ -11,13 +11,16 @@ def get_user_playable_games(context, base_url):
     user = context.request.user
     teacher = user.new_teacher
     if logged_in_as_teacher(user):
-        playable_games = list(Game.objects.filter(owner=user, is_archived=False))
+        playable_games = list(Game.objects.filter(owner=user, is_archived=False).exclude(game_class=None))
         if teacher.is_admin:
             playable_games += list(
-                Game.objects.filter(game_class__teacher__school=teacher.school, is_archived=False).exclude(owner=user)
+                Game.objects.filter(game_class__teacher__school=teacher.school, is_archived=False)
+                # passing multiple args does not seem to work
+                .exclude(owner=user).exclude(game_class=None)
             )
     else:
         playable_games = Game.objects.none()
+
     return {
         "user": user,
         "base_url": base_url,

diff --git a/aimmo_runner/setup.py b/aimmo_runner/setup.py
@@ -14,7 +14,7 @@
         "six",
         "hypothesis",
         "psutil",
-        "docker >= 3.5, < 3.6",
+        "docker<6",
         "kubernetes==23.6.0",
     ],
     zip_safe=False,

diff --git a/setup.py b/setup.py
@@ -30,6 +30,7 @@
         "hypothesis==5.41.3",
         "cfl-common",
         "django-csp==3.7",
+        "kubernetes==23.6.0",
     ],
     tests_require=["docker >= 3.5, < 3.6", "PyYAML == 5.4"],
     version=version,