Update ingress

.gitlab-ci.yml

@@ -4,7 +4,6 @@ stages:
 variables:
   BROWSER_SERVICE_SLUG: dev
   GENOME_SEARCH_SERVICE_SLUG: dev
-  TOYGRAPHQL_SERVICE_SLUG: dev
   THOAS_SERVICE_SLUG: dev
   REFGET_SERVICE_SLUG: dev
 
@@ -43,11 +42,7 @@ variables:
     # ensembl-2020-genome-search
     - sed -i "s#<DEPLOYMENT_ENV>#${GENOME_SEARCH_SERVICE_SLUG}#g" ensembl_genome_search_service.yaml
     - sed -i "s#<DEPLOYMENT_ENV>#${GENOME_SEARCH_SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml
-    - sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml   
-    # ensembl-toygraphql
-    - sed -i "s#<DEPLOYMENT_ENV>#${TOYGRAPHQL_SERVICE_SLUG}#g" ensembl_graphql_server_service.yaml
-    - sed -i "s#<DEPLOYMENT_ENV>#${TOYGRAPHQL_SERVICE_SLUG}#g" ensembl_graphql_server_ingress.yaml
-    - sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_graphql_server_ingress.yaml   
+    - sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml     
     # ensembl-thoas
     - sed -i "s#<DEPLOYMENT_ENV>#${THOAS_SERVICE_SLUG}#g" ensembl_thoas_service.yaml
     - sed -i "s#<DEPLOYMENT_ENV>#${THOAS_SERVICE_SLUG}#g" ensembl_thoas_ingress.yaml
@@ -63,9 +58,6 @@ variables:
     # ensembl-thoas
     - kubectl apply -f ensembl_thoas_service.yaml
     - kubectl apply -f ensembl_thoas_ingress.yaml
-    # ensembl-toygraphql
-    - kubectl apply -f ensembl_graphql_server_service.yaml
-    - kubectl apply -f ensembl_graphql_server_ingress.yaml
     # ensembl-2020-server
     - kubectl apply -f ensembl_server_service.yaml
     - kubectl apply -f ensembl_server_ingress.yaml

ensembl-server-ingress.yaml

@@ -8,7 +8,7 @@ spec:
   rules:
   - http:
       paths:  
-        - path: /browser($|/)(.*)
+        - path: /api/browser($|/)(.*)
           backend:
             serviceName: ensembl-server-svc
-            servicePort: 8000
\ No newline at end of file
+            servicePort: 8000

ensembl_genome_search_ingress.yaml

@@ -9,7 +9,7 @@ spec:
   - host: <SUB_DOMAIN>.review.ensembl.org
     http:
       paths:
-        - path: /api($|/)(.*)
+        - path: /api/genomesearch($|/)(.*)
           backend:
             serviceName: ensembl-genome-search-<DEPLOYMENT_ENV>-svc
-            servicePort: 8011
\ No newline at end of file
+            servicePort: 8011

ensembl_refget_ingress.yaml

@@ -9,7 +9,7 @@ spec:
   - host: <SUB_DOMAIN>.review.ensembl.org
     http:
       paths:  
-        - path: /refget($|/)(.*)
+        - path: /api/refget($|/)(.*)
           backend:
             serviceName: refget-perl-server-<DEPLOYMENT_ENV>-svc
-            servicePort: 8080
\ No newline at end of file
+            servicePort: 8080

ensembl_server_ingress.yaml

@@ -9,7 +9,7 @@ spec:
   - host: <SUB_DOMAIN>.review.ensembl.org
     http:
       paths:  
-        - path: /browser($|/)(.*)
+        - path: /api/browser($|/)(.*)
           backend:
             serviceName: ensembl-server-<DEPLOYMENT_ENV>-svc
             servicePort: 8000
\ No newline at end of file

ensembl_thoas_ingress.yaml

@@ -9,7 +9,7 @@ spec:
   - host: <SUB_DOMAIN>.review.ensembl.org
     http:
       paths:  
-        - path: /thoas($|/)(.*)
+        - path: /api/thoas($|/)(.*)
           backend:
             serviceName: thoas-server-<DEPLOYMENT_ENV>-svc
-            servicePort: 8000
\ No newline at end of file
+            servicePort: 8000

values.yaml

@@ -3,6 +3,5 @@ fe-services:
 be-services:
   browser-service: dev
   genome-search-service: dev
-  toygraphql-service: dev
   thoas-service: dev
   refget-service: dev
\ No newline at end of file