ocadotechnology
diff --git a/‎.gcloudignore
+1 b/‎.gcloudignore
+1
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎app.yaml.tmpl
+1 b/‎app.yaml.tmpl
+1
diff --git a/‎build.sh
+19 b/‎build.sh
+19
diff --git a/‎clusters_setup/deploy.py
+104-26 b/‎clusters_setup/deploy.py
+104-26
diff --git a/‎clusters_setup/fleet.yaml
+34 b/‎clusters_setup/fleet.yaml
+34
diff --git a/‎clusters_setup/ingress.yaml
+3 b/‎clusters_setup/ingress.yaml
+3
diff --git a/‎clusters_setup/rs_aimmo_game_creator.yaml
+1 b/‎clusters_setup/rs_aimmo_game_creator.yaml
+1
diff --git a/‎clusters_setup/terraform/.terraform.lock.hcl
+73 b/‎clusters_setup/terraform/.terraform.lock.hcl
+73
@@ -8,3 +8,4 @@ lib/*info/**
 lib/PIL/**
 lib/setuptools/script (dev).tmpl
 lib/**/static/**
+node_modules
@@ -1,3 +1,4 @@
+.terraform
 app.yaml
 lib
 static
 
@@ -41,3 +41,4 @@ env_variables:
   REDIS_PORT: '${REDIS_PORT}'
   AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
   AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
+  KUBECONFIG: 'kubeconfig.yaml'
@@ -17,6 +17,25 @@ then
     pip install -t lib --upgrade --no-deps aimmo
 else
     pip install -t lib --pre --upgrade --no-deps aimmo
+
+    # Uncomment the blocks below to install aimmo from a branch - don't forget to uncomment the line in generate_requirements.py too
+    # git clone --depth 1 --branch agones3 https://github.com/ocadotechnology/aimmo.git
+
+    # pushd aimmo
+    # pip install wheel
+    # ./aimmo_runner/build_worker_wheel.sh
+    # popd
+
+    # pushd aimmo/game_frontend
+    # curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
+    # export NVM_DIR="$HOME/.nvm"
+    # [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+    # nvm install 12.20.2
+    # nvm use 12.20.2
+    # yarn --frozen-lockfile
+    # NODE_ENV=production node djangoBundler.js
+    # popd
+    # pip install -t lib --pre --upgrade --no-deps ./aimmo
 fi
 
 python generate_requirements.py
 
@@ -21,7 +21,8 @@ def create_ingress_yaml(module_name):
     """
     Uses a template ingress yaml file in the same directory to construct a python yaml
     object. Replaces the ingress.global-static-ip-name annotation with the
-    correct module name (depending on which cluster this script is ran in).
+    correct module name (depending on which cluster this script is ran in). Similarly for
+    cors-allow-origin, it replaces it with the correct url for selected module.
 
     Also replaces the TLS certificate host name and the host for the ingress paths.
 
@@ -30,27 +31,70 @@ def create_ingress_yaml(module_name):
     """
     path = os.path.join(CURR_DIR, "ingress.yaml")
 
-    host_name = module_name + "-aimmo.codeforlife.education"
+    host_name = f"{module_name}-aimmo.codeforlife.education"
+
+    cors_origin = f"https://{module_name}-dot-decent-digit-629.appspot.com"
+    if module_name == "default":
+        cors_origin = f"https://www.codeforlife.education"
 
     with open(path) as yaml_file:
         content = yaml.safe_load(yaml_file.read())
         content["metadata"]["annotations"][
             "kubernetes.io/ingress.global-static-ip-name"
-        ] = (module_name + "-aimmo-ingress")
+        ] = f"{module_name}-aimmo-ingress"
+        content["metadata"]["annotations"][
+            "nginx.ingress.kubernetes.io/cors-allow-origin"
+        ] = cors_origin
         content["spec"]["tls"][0]["hosts"][0] = host_name
         content["spec"]["rules"][0]["host"] = host_name
 
     return content
 
 
+def create_fleet_yaml(module_name, aimmo_version):
+    """
+    Uses a template fleet yaml file in the same directory to construct a python yaml
+    object. Replaces image version with the one received as a parameter. Also replaces
+    the GAME_API_URL environment variable with the correct url for the deployment
+    environment we are in.
+
+    :param module_name: The name of the environment we're in (ie. staging, dev).
+    :param aimmo_version: The game version we want to deploy.
+    :return: python object containing yaml with modified values.
+    """
+    path = os.path.join(CURR_DIR, "fleet.yaml")
+
+    game_api_url = (
+        f"https://{module_name}-dot-decent-digit-629.appspot.com/kurono/api/games/"
+    )
+    container_image = f"ocadotechnology/aimmo-game:{aimmo_version}"
+
+    with open(path) as yaml_file:
+        content = yaml.safe_load(yaml_file.read())
+
+        env_variables = content["spec"]["template"]["spec"]["template"]["spec"][
+            "containers"
+        ][0]["env"]
+        game_api_url_index = env_variables.index(
+            {"name": "GAME_API_URL", "value": "REPLACE_ME"}
+        )
+        env_variables[game_api_url_index]["value"] = game_api_url
+        content["spec"]["template"]["spec"]["template"]["spec"]["containers"][0][
+            "image"
+        ] = container_image
+
+    return content
+
+
 def create_creator_yaml(module_name, aimmo_version):
     """
     Loads an aimmo-game-creator yaml into a dictionary.
 
     Replaces the GAME_API_URL environment variable with the correct url for the
     deployment environment we are in
 
-    :param module_name: The name of the environment we're in (ie. staging, dev)
+    :param module_name: The name of the environment we're in (ie. staging, dev).
+    :param aimmo_version: The game version we want to deploy.
     :return: python object containing yaml with modified values.
     """
 
@@ -87,49 +131,80 @@ def _replace_image_tag(content):
     return content
 
 
-def restart_pods(game_creator_yaml, ingress_yaml):
+def restart_pods(game_creator_yaml, ingress_yaml, fleet_yaml):
     """
     Restarts the kubernetes replication controllers, pods, services and ingresses
     in the 'default' namespace
 
     :param game_creator_yaml: The dict to create the aimmo game creator rc
     :param ingress_yaml: The dict to create the ingress
+    :param fleet_yaml: The dict to create the fleet
     """
     for rs in apps_api_instance.list_namespaced_replica_set("default").items:
-        apps_api_instance.delete_namespaced_replica_set(
-            body=kubernetes.client.V1DeleteOptions(),
-            name=rs.metadata.name,
-            namespace="default",
-        )
-    for rc in api_instance.list_namespaced_replication_controller("default").items:
-        api_instance.delete_namespaced_replication_controller(
-            body=kubernetes.client.V1DeleteOptions(),
-            name=rc.metadata.name,
-            namespace="default",
-        )
-    for pod in api_instance.list_namespaced_pod("default").items:
-        api_instance.delete_namespaced_pod(
-            body=kubernetes.client.V1DeleteOptions(),
-            name=pod.metadata.name,
-            namespace="default",
-        )
+        if rs.metadata.name == game_creator_yaml["metadata"]["name"]:
+            apps_api_instance.delete_namespaced_replica_set(
+                body=kubernetes.client.V1DeleteOptions(),
+                name=rs.metadata.name,
+                namespace="default",
+            )
     for service in api_instance.list_namespaced_service("default").items:
-        api_instance.delete_namespaced_service(
-            name=service.metadata.name, namespace="default"
-        )
+        if service.metadata.name.startswith("game-"):
+            api_instance.delete_namespaced_service(
+                name=service.metadata.name, namespace="default"
+            )
     for ingress in networking_api_instance.list_namespaced_ingress("default").items:
         networking_api_instance.delete_namespaced_ingress(
             name=ingress.metadata.name,
             namespace="default",
             body=kubernetes.client.V1DeleteOptions(),
         )
 
+    fleets_to_delete = custom_objects_api_instance.list_namespaced_custom_object(
+        group="agones.dev",
+        version="v1",
+        namespace="default",
+        plural="fleets",
+    )["items"]
+    for fleet in fleets_to_delete:
+        name = fleet["metadata"]["name"]
+        custom_objects_api_instance.delete_namespaced_custom_object(
+            group="agones.dev",
+            version="v1",
+            namespace="default",
+            plural="fleets",
+            name=name,
+        )
+
+    game_servers_to_delete = custom_objects_api_instance.list_namespaced_custom_object(
+        group="agones.dev",
+        version="v1",
+        namespace="default",
+        plural="gameservers",
+    )["items"]
+    for game_server in game_servers_to_delete:
+        name = game_server["metadata"]["name"]
+        custom_objects_api_instance.delete_namespaced_custom_object(
+            group="agones.dev",
+            version="v1",
+            namespace="default",
+            plural="gameservers",
+            name=name,
+        )
+
     networking_api_instance.create_namespaced_ingress("default", ingress_yaml)
 
     apps_api_instance.create_namespaced_replica_set(
         body=game_creator_yaml, namespace="default"
     )
 
+    custom_objects_api_instance.create_namespaced_custom_object(
+        group="agones.dev",
+        version="v1",
+        namespace="default",
+        plural="fleets",
+        body=fleet_yaml,
+    )
+
 
 def main(module_name):
     """
@@ -142,17 +217,20 @@ def main(module_name):
     global api_instance
     global apps_api_instance
     global networking_api_instance
+    global custom_objects_api_instance
     api_instance = kubernetes.client.CoreV1Api()
     apps_api_instance = kubernetes.client.AppsV1Api()
     networking_api_instance = kubernetes.client.NetworkingV1beta1Api()
+    custom_objects_api_instance = kubernetes.client.CustomObjectsApi()
     aimmo_version = get_aimmo_version()
 
     ingress = create_ingress_yaml(module_name=module_name)
     game_creator_rs = create_creator_yaml(
         module_name=module_name, aimmo_version=aimmo_version
     )
+    fleet = create_fleet_yaml(module_name=module_name, aimmo_version=aimmo_version)
 
-    restart_pods(game_creator_rs, ingress)
+    restart_pods(game_creator_rs, ingress, fleet)
 
 
 if __name__ == "__main__":
 
@@ -0,0 +1,34 @@
+apiVersion: "agones.dev/v1"
+kind: Fleet
+metadata:
+  name: aimmo-game
+spec:
+  replicas: 15
+  strategy:
+    type: Recreate
+  template:
+    spec:
+      ports:
+        - name: default
+          protocol: TCPUDP
+          containerPort: 5000
+      health:
+        initialDelaySeconds: 30
+      template:
+        spec:
+          serviceAccountName: worker-manager
+          containers:
+            - name: aimmo-game
+              image: ocadotechnology/aimmo-game:latest
+              env:
+                - name: GAME_API_URL
+                  value: REPLACE_ME
+                - name: GAME_MANAGER
+                  value: kubernetes
+              resources:
+                requests:
+                  memory: "64Mi"
+                  cpu: "24m"
+                limits:
+                  memory: "124Mi"
+                  cpu: "95m"
@@ -7,6 +7,9 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
     kubernetes.io/ingress.global-static-ip-name: REPLACE_STATIC_IP
+    nginx.ingress.kubernetes.io/cors-allow-origin: REPLACE_CORS_ORIGIN
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
 spec:
   tls:
     - hosts:
 
@@ -18,6 +18,7 @@ spec:
         # The api server enforces this constraint.
         app: aimmo-game-creator
     spec:
+      serviceAccountName: game-creator
       containers:
         - name: aimmo-game-creator
           image: ocadotechnology/aimmo-game-creator:latest
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+.terraform`
`1`	`2`	`app.yaml`
`2`	`3`	`lib`
`3`	`4`	`static`