Merge branch 'master' into update_new_mega_names

Author: jemarq04

.github/workflows/docker-k8s.yml

@@ -66,10 +66,11 @@ jobs:
       - name: Lint k8s
         run: (cd Resources/k8s/kustomize && yamllint .)
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.12.0
+        uses: helm/kind-action@v1.13.0
         with:
           cluster_name: pokeapi
-          version: v0.21.0
+          config: Resources/kind/config-ga.yaml
+          version: v0.31.0
       - name: Create deployment configuration
         run: |
           cp Resources/k8s/kustomize/base/secrets/postgres.env.sample Resources/k8s/kustomize/base/secrets/postgres.env
@@ -79,7 +80,7 @@ jobs:
         run: kind load docker-image pokeapi/pokeapi:local --name pokeapi
       - name: K8s Apply
         run: |
-          make kustomize-local-apply
+          make kustomize-ga-apply
           kubectl proxy &
           sleep 1
           bash Resources/scripts/wait.sh http://localhost:8001/api/v1/namespaces/pokeapi/services/pokeapi/proxy/api/v2/

Makefile

@@ -133,6 +133,9 @@ kustomize-staging-apply:  # (Kustomize) Run kubectl apply -k on the connected k8
 kustomize-local-apply:  # (Kustomize) Run kubectl apply -k on the connected k8s cluster using the locally available pokeapi/pokeapi:local
 	kubectl apply -k Resources/k8s/kustomize/local/
 
+kustomize-ga-apply:  # (Kustomize) Run kubectl apply -k on the connected k8s cluster using the Github Actions config (share host data with the cluster)
+	kubectl apply -k Resources/k8s/kustomize/ga/
+
 k8s-migrate:  # (k8s) Run any pending migrations
 	kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate ${docker_config}
 

Resources/k8s/kustomize/base/deployments/pokeapi-deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     component: pokeapi
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       component: pokeapi
@@ -29,17 +29,11 @@ spec:
           args:
             - apk add --update git &&
               git clone --depth=1 --single-branch --branch=master --recurse-submodules --shallow-submodules https://github.com/PokeAPI/pokeapi.git &&
-              mv /code/pokeapi/data/v2/cries/* /tmp/cries/ &&
-              mv /code/pokeapi/data/v2/csv/* /tmp/csv/ &&
-              mv /code/pokeapi/data/v2/sprites/* /tmp/sprites/
+              mv /code/pokeapi/data/v2/* /tmp/
           workingDir: /code
           volumeMounts:
-            - mountPath: /tmp/cries
-              name: cries-data-share
-            - mountPath: /tmp/csv
-              name: csv-data-share
-            - mountPath: /tmp/sprites
-              name: sprites-data-share
+            - mountPath: /tmp/
+              name: data-share
       containers:
         - name: pokeapi
           image: pokeapi/pokeapi:master
@@ -69,12 +63,8 @@ spec:
             - configMapRef:
                 name: pokeapi-configmap
           volumeMounts:
-            - mountPath: /code/data/v2/cries
-              name: cries-data-share
-            - mountPath: /code/data/v2/csv
-              name: csv-data-share
-            - mountPath: /code/data/v2/sprites
-              name: sprites-data-share
+            - mountPath: /code/data/v2/
+              name: data-share
           resources: {}
           readinessProbe:
             periodSeconds: 5
@@ -89,9 +79,5 @@ spec:
               path: /api/v2/
               port: 8080
       volumes:
-        - name: cries-data-share
-          emptyDir: {}
-        - name: csv-data-share
-          emptyDir: {}
-        - name: sprites-data-share
+        - name: data-share
           emptyDir: {}

Resources/k8s/kustomize/ga/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../local
+
+patches:
+  - path: pokeapi-deployment-patch.yaml
+    target:
+      kind: Deployment
+      labelSelector: component=pokeapi

Resources/k8s/kustomize/ga/pokeapi-deployment-patch.yaml

@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: pokeapi
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: data-download
+          image: alpine:3.21.2
+          command: ['ls']
+          args: ['/tmp/csv']
+      containers:
+        - name: pokeapi
+          volumeMounts:
+            - mountPath: /code/data/v2/
+              name: data-share
+      volumes:
+        - name: data-share
+          hostPath:
+            path: /code/pokeapi/data/v2/
+          emptyDir:
+            $patch: delete

Resources/kind/config-ga.yaml

@@ -0,0 +1,7 @@
+apiVersion: kind.x-k8s.io/v1alpha4
+kind: Cluster
+nodes:
+  - role: control-plane
+    extraMounts:
+      - hostPath: /home/runner/work/pokeapi/pokeapi/data/v2/
+        containerPath: /code/pokeapi/data/v2/

data/v2/build.py

@@ -2102,8 +2102,13 @@ def csv_record_to_objects(info):
             trade_species_id=int(info[17]) if info[17] != "" else None,
             needs_overworld_rain=bool(int(info[18])),
             turn_upside_down=bool(int(info[19])),
-            region_id=int(info[20]) if info[20] != "" else None,
-            base_form_id=int(info[21]) if info[21] != "" else None,
+            needs_multiplayer=bool(int(info[20])),
+            region_id=int(info[21]) if info[21] != "" else None,
+            base_form_id=int(info[22]) if info[22] != "" else None,
+            used_move_id=int(info[23]) if info[23] != "" else None,
+            min_move_count=int(info[24]) if info[24] != "" else None,
+            min_steps=int(info[25]) if info[25] != "" else None,
+            min_damage_taken=int(info[26]) if info[26] != "" else None,
         )
 
     build_generic((PokemonEvolution,), "pokemon_evolution.csv", csv_record_to_objects)

data/v2/csv/evolution_trigger_prose.csv

@@ -17,3 +17,6 @@ evolution_trigger_id,local_language_id,name
 8,9,Land three critical hits in a battle
 9,9,Go somewhere after taking damage
 10,9,Other
+14,9,Use move
+15,9,Defeat three Bisharp that hold a Leader's Crest
+16,9,Collect 999 Gimmighoul Coins

data/v2/csv/evolution_triggers.csv

@@ -12,3 +12,6 @@ id,identifier
 11,agile-style-move
 12,strong-style-move
 13,recoil-damage
+14,use-move
+15,three-defeated-bisharp
+16,gimmmighoul-coins