Skip to content

Commit

Permalink
Rip out graphql, closes #1147.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrtcppv committed Mar 6, 2023
1 parent bfc572f commit 9daa372
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 114 deletions.
2 changes: 0 additions & 2 deletions .circleci/push_aws.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
docker login "$AWS_REGISTRY" --username AWS --password $(/home/ubuntu/.local/bin/aws ecr get-login-password)
docker tag cvisionai/tator_online:$CIRCLE_SHA1 $AWS_REGISTRY/tator_online:$CIRCLE_SHA1
docker push $AWS_REGISTRY/tator_online:$CIRCLE_SHA1
docker tag cvisionai/tator_graphql:$CIRCLE_SHA1 $AWS_REGISTRY/tator_graphql:$CIRCLE_SHA1
docker push $AWS_REGISTRY/tator_graphql:$CIRCLE_SHA1
docker tag cvisionai/tator_ui:$CIRCLE_SHA1 $AWS_REGISTRY/tator_ui:$CIRCLE_SHA1
docker push $AWS_REGISTRY/tator_ui:$CIRCLE_SHA1
2 changes: 0 additions & 2 deletions .circleci/push_oci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@ docker manifest push $OCI_REGISTRY/tator_client:$CIRCLE_SHA1
docker manifest push $OCI_REGISTRY/tator_client:latest
docker tag cvisionai/tator_online:$CIRCLE_SHA1 $OCI_REGISTRY/tator_online:$CIRCLE_SHA1
docker push $OCI_REGISTRY/tator_online:$CIRCLE_SHA1
docker tag cvisionai/tator_graphql:$CIRCLE_SHA1 $OCI_REGISTRY/tator_graphql:$CIRCLE_SHA1
docker push $OCI_REGISTRY/tator_graphql:$CIRCLE_SHA1
docker tag cvisionai/tator_ui:$CIRCLE_SHA1 $OCI_REGISTRY/tator_ui:$CIRCLE_SHA1
docker push $OCI_REGISTRY/tator_ui:$CIRCLE_SHA1
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CONTAINERS=ui postgis pgbouncer redis client gunicorn nginx pruner sizer

OPERATIONS=reset logs bash

IMAGES=ui-image graphql-image postgis-image client-image transcode-image
IMAGES=ui-image postgis-image client-image transcode-image

GIT_VERSION=$(shell git rev-parse HEAD)

Expand Down Expand Up @@ -196,11 +196,6 @@ ui-image: webpack
DOCKER_BUILDKIT=1 docker build --build-arg GIT_VERSION=$(GIT_VERSION) --build-arg DOCKERHUB_USER=$(DOCKERHUB_USER) --network host -t $(DOCKERHUB_USER)/tator_ui:$(GIT_VERSION) -f containers/tator_ui/Dockerfile . || exit 255
docker push $(DOCKERHUB_USER)/tator_ui:$(GIT_VERSION)

.PHONY: graphql-image
graphql-image: doc/_build/schema.yaml
DOCKER_BUILDKIT=1 docker build --network host -t $(DOCKERHUB_USER)/tator_graphql:$(GIT_VERSION) -f containers/tator_graphql/Dockerfile . || exit 255
docker push $(DOCKERHUB_USER)/tator_graphql:$(GIT_VERSION)

.PHONY: postgis-image
postgis-image:
DOCKER_BUILDKIT=1 docker build --network host -t $(DOCKERHUB_USER)/tator_postgis:$(GIT_VERSION) --build-arg APT_REPO_HOST=$(APT_REPO_HOST) -f containers/postgis/Dockerfile . || exit 255
Expand Down
8 changes: 0 additions & 8 deletions containers/tator_graphql/Dockerfile

This file was deleted.

34 changes: 0 additions & 34 deletions helm/tator/templates/_nginx-server.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -208,40 +208,6 @@ server {
}
{{- end }}

location /graphql {
alias /graphql/;
# Allow for big REST responses.
proxy_connect_timeout 1200;
proxy_send_timeout 1200;
proxy_read_timeout 1200;
send_timeout 1200;
{{- if .Values.maintenance }}
return 503;
{{- end }}
add_header Cross-Origin-Opener-Policy same-origin;
add_header Cross-Origin-Embedder-Policy require-corp;
proxy_pass http://graphql-svc:3000;

proxy_redirect off;
proxy_http_version 1.1;
proxy_set_header Connection "";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $server_name;
{{- if .Values.requireHttps }}
proxy_set_header X-Forwarded-Proto https;
{{- end }}
add_header Cache-Control "max-age=0, must-revalidate";
{{include "cors.template" $corsSettings | indent 4}}

gzip on;
gzip_types application/json;
gzip_min_length 1024;
}

location ~ ^/$|^/rest$|^/rest/$|^/static|^/(projects|token|organizations)|^/\d+/ {
{{- if .Values.maintenance }}
return 503;
Expand Down
62 changes: 0 additions & 62 deletions helm/tator/templates/graphql.yaml

This file was deleted.

0 comments on commit 9daa372

Please sign in to comment.