Merge pull request #1264 from PokeAPI/gql-v1beta2

v1beta2

Author: Naramsim

Makefile

@@ -2,6 +2,7 @@ veekun_pokedex_repository = ../pokedex
 local_config = --settings=config.local
 docker_config = --settings=config.docker-compose
 gql_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml
+gqlv1beta_compose_config = -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml -f Resources/compose/docker-compose-prod-graphql-v1beta.yml
 
 .PHONY: help
 .SILENT:
@@ -104,11 +105,17 @@ sync-to-veekun: pull pull-veekun  # Copy data from this repository to ../pokedex
 # read-env-file:  # Exports ./.env into shell environment variables
 # 	export `egrep -v '^#' .env | xargs`
 
+hasura-export-v1beta:
+	hasura md export --project graphql/v1beta
+
+hasura-apply-v1beta:
+	hasura md apply --project graphql/v1beta
+
 hasura-export:  # Export Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
-	hasura md export --project graphql
+	hasura md export --project graphql/v1beta2
 
 hasura-apply:  # Apply local Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
-	hasura md apply --project graphql
+	hasura md apply --project graphql/v1beta2
 
 hasura-get-anon-schema:  # Dumps GraphQL schema
 	gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql
@@ -143,6 +150,23 @@ down-graphql-prod:
 	docker volume prune --all --force
 	sync; echo 3 > /proc/sys/vm/drop_caches
 
+update-graphql-v1beta-data-prod:
+	docker compose ${gqlv1beta_compose_config} stop
+	git pull origin master
+	git submodule update --remote --merge
+	docker compose ${gqlv1beta_compose_config} up --pull always -d app cache db
+	sync; echo 3 > /proc/sys/vm/drop_caches
+	make docker-migrate
+	make docker-build-db
+	docker compose ${gqlv1beta_compose_config} stop app cache
+	docker compose ${gqlv1beta_compose_config} up --pull always -d graphql-engine graphiql
+	sleep 120
+	make hasura-apply-v1beta
+	docker compose ${gqlv1beta_compose_config} up --pull always -d web
+	docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
+	docker image prune -af
+	sync; echo 3 > /proc/sys/vm/drop_caches
+
 # Nginx doesn't start if upstream graphql-engine is down
 update-graphql-data-prod:
 	docker compose ${gql_compose_config} stop

Resources/compose/docker-compose-prod-graphql-v1beta.yml

@@ -0,0 +1,4 @@
+version: '2.4'
+services:
+  graphiql:
+    image: pokeapi/graphiql:2.0.0

Resources/compose/docker-compose-prod-graphql.yml

@@ -33,12 +33,9 @@ services:
       HASURA_GRAPHQL_EVENTS_HTTP_POOL_SIZE: 10
 
   graphiql:
-    image: pokeapi/graphiql:2.0.0
+    image: pokeapi/graphiql:2.0.1
     expose:
       - 80
     depends_on:
       - graphql-engine
     restart: always
-
-volumes:
-  graphiql:

Resources/k8s/kustomize/base/jobs/load-graphql.yaml

@@ -38,4 +38,4 @@ spec:
               git clone https://github.com/PokeAPI/pokeapi.git &&
               cd pokeapi &&
               (git checkout $(POKEAPI_CHECKOUT_REF) || git checkout master) &&
-              hasura md apply --endpoint http://graphql:8080 --project graphql --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET)
+              hasura md apply --endpoint http://graphql:8080 --project graphql/v1beta2 --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET)