fix: Use Kubernetes 23 and update Ingress API

ocadotechnology · Oct 24, 2022 · ce0d346 · ce0d346
1 parent 2fc042c
commit ce0d346
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 114 deletions.
diff --git a/Pipfile b/Pipfile
@@ -13,8 +13,8 @@ black = "*"
 django-test-migrations = "==1.2.0"
 
 [packages]
-aimmo = {editable = true,path = "."}
-kubernetes = "==24.2.0"
+aimmo = {editable = true, path = "."}
+kubernetes = "==23.6.0"
 eventlet = "*"
 docker = "<6"
 wheel = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/aimmo-game-creator/Pipfile b/aimmo-game-creator/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-kubernetes = "==24.2.0"
+kubernetes = "==23.6.0"
 docker = "<6"
 aimmo-game-creator = { editable = true, path = "." }
 google-cloud-logging = "*"

diff --git a/aimmo-game-creator/Pipfile.lock b/aimmo-game-creator/Pipfile.lock
diff --git a/aimmo-game-creator/game_manager.py b/aimmo-game-creator/game_manager.py
@@ -181,8 +181,9 @@ def _create_game_name(game_id):
 
     def _add_path_to_ingress(self, game_id):
         game_name = KubernetesGameManager._create_game_name(game_id)
-        backend = kubernetes.client.V1IngressBackend(game_name, 80)
-        path = kubernetes.client.V1HTTPIngressPath(backend, f"/{game_name}(/|$)(.*)", path_type="exact")
+        game_service = kubernetes.client.V1IngressServiceBackend(game_name, 80)
+        backend = kubernetes.client.V1IngressBackend(service=game_service)
+        path = kubernetes.client.V1HTTPIngressPath(backend, f"/{game_name}(/|$)(.*)", path_type="Prefix")
 
         patch = [{"op": "add", "path": "/spec/rules/0/http/paths/-", "value": path}]
 
@@ -194,8 +195,9 @@ def _add_path_to_ingress(self, game_id):
 
     def _remove_path_from_ingress(self, game_id):
         game_name = KubernetesGameManager._create_game_name(game_id)
-        backend = kubernetes.client.V1IngressBackend(game_name, 80)
-        path = kubernetes.client.V1HTTPIngressPath(backend, f"/{game_name}(/|$)(.*)", path_type="exact")
+        game_service = kubernetes.client.V1IngressServiceBackend(game_name, 80)
+        backend = kubernetes.client.V1IngressBackend(service=game_service)
+        path = kubernetes.client.V1HTTPIngressPath(backend, f"/{game_name}(/|$)(.*)", path_type="Prefix")
         try:
             ingress = self.networking_api.list_namespaced_ingress("default").items[0]
         # These exceptions are usually triggered locally where there is no ingress.

diff --git a/aimmo-game-worker/Pipfile b/aimmo-game-worker/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-kubernetes = "==24.2.0"
+kubernetes = "==23.6.0"
 docker = "<6"
 aimmo-game-worker = {editable = true, path = "."}
 restrictedpython = "==4.0.b7"

diff --git a/aimmo-game-worker/Pipfile.lock b/aimmo-game-worker/Pipfile.lock
diff --git a/aimmo-game/Pipfile b/aimmo-game/Pipfile
@@ -12,7 +12,7 @@ black = "*"
 [packages]
 aimmo-game = {editable = true,path = "."}
 oauthlib = "==3.2.0"
-kubernetes = "==24.2.0"
+kubernetes = "==23.6.0"
 docker = "<6"
 
 [requires]

diff --git a/aimmo-game/Pipfile.lock b/aimmo-game/Pipfile.lock
diff --git a/aimmo_runner/setup.py b/aimmo_runner/setup.py
@@ -14,8 +14,8 @@
         "six",
         "hypothesis",
         "psutil",
-        "docker >= 3.5, < 3.6",
-        "kubernetes == 10.0.0",
+        "docker<6",
+        "kubernetes==23.6.0",
     ],
     zip_safe=False,
 )