Merge branch 'master' into feature/design-review-changes

.gitlab-ci.yml

 stages:
   - deploy
 
+variables:
+  BROWSER_SERVICE_SLUG: dev
+  GENOME_SEARCH_SERVICE_SLUG: dev
+  TOYGRAPHQL_SERVICE_SLUG: dev
+  THOAS_SERVICE_SLUG: dev
+
 .deploy:
   stage: deploy
   image: dockerhub.ebi.ac.uk/kamal/deploy-tools:0.2
@@ -16,20 +22,46 @@ stages:
     - GENOME_SEARCH_SERVICE_TAG=`yq r values.yaml be-services.genome-search-service`
     - GENOME_SEARCH_SERVICE_TAG="${GENOME_SEARCH_SERVICE_TAG//[[:space:]]/}"
     - GENOME_SEARCH_SERVICE_SLUG="${GENOME_SEARCH_SERVICE_TAG//[^[:alnum:]]/-}"
+    - TOYGRAPHQL_TAG=`yq r values.yaml be-services.toygraphql-service`
+    - TOYGRAPHQL_TAG="${TOYGRAPHQL_TAG//[[:space:]]/}"
+    - TOYGRAPHQL_SERVICE_SLUG="${TOYGRAPHQL_TAG//[^[:alnum:]]/-}"
+    - THOAS_SERVICE_TAG=`yq r values.yaml be-services.thoas-service`
+    - THOAS_SERVICE_TAG="${THOAS_SERVICE_TAG//[[:space:]]/}"
+    - THOAS_SERVICE_SLUG="${THOAS_SERVICE_TAG//[^[:alnum:]]/-}"
+    # ensembl-client
     - sed -i "s#<DEPLOYMENT_ENV>#${SERVICE_SLUG}#g" ensembl_client_service_cluster.yaml
     - sed -i "s#<DEPLOYMENT_ENV>#${SERVICE_SLUG}#g" ensembl_client_ingress.yaml
     - sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_client_ingress.yaml
+    # ensembl-2020-server
     - sed -i "s#<DEPLOYMENT_ENV>#${BROWSER_SERVICE_SLUG}#g" ensembl_server_service.yaml
     - sed -i "s#<DEPLOYMENT_ENV>#${BROWSER_SERVICE_SLUG}#g" ensembl_server_ingress.yaml
     - sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_server_ingress.yaml
+    # 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   
+    # 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
+    - sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_thoas_ingress.yaml 
   script:
+    # 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-2020-genome-search
     - kubectl apply -f ensembl_genome_search_service.yaml
     - kubectl apply -f ensembl_genome_search_ingress.yaml
+    # ensembl-client
     - kubectl apply -f ensembl_client_service_cluster.yaml
     - kubectl apply -f ensembl_client_ingress.yaml
 

ensembl_graphql_server_ingress.yaml

+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ensembl-graphql-server-ingress-<SUB_DOMAIN>
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2             
+spec:
+  rules:
+  - host: <SUB_DOMAIN>.review.ensembl.org
+    http:
+      paths:  
+        - path: /toygraphql($|/)(.*)
+          backend:
+            serviceName: ensembl-graphql-server-<DEPLOYMENT_ENV>-svc
+            servicePort: 8000
\ No newline at end of file

ensembl_graphql_server_service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: ensembl-graphql-server-<DEPLOYMENT_ENV>-svc
+  labels:
+    app: ensembl-graphql-server-<DEPLOYMENT_ENV>-svc
+spec:
+  selector:
+    app: ensembl-graphql-server-<DEPLOYMENT_ENV>
+  type: ClusterIP
+  ports:
+    - port: 8000
+      protocol: TCP
+      targetPort: 5000
\ No newline at end of file

ensembl_thoas_ingress.yaml

+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ensembl-thoas-<SUB_DOMAIN>-ingress
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2             
+spec:
+  rules:
+  - host: <SUB_DOMAIN>.review.ensembl.org
+    http:
+      paths:  
+        - path: /thoas($|/)(.*)
+          backend:
+            serviceName: thoas-server-<DEPLOYMENT_ENV>-svc
+            servicePort: 8000
\ No newline at end of file

ensembl_thoas_service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: thoas-server-<DEPLOYMENT_ENV>-svc
+  labels:
+    app: thoas-server-<DEPLOYMENT_ENV>-svc
+spec:
+  selector:
+    app: thoas-server-<DEPLOYMENT_ENV>
+  type: ClusterIP
+  ports:
+    - port: 8000
+      protocol: TCP
+      targetPort: 8000

values.yaml

 fe-services:
-  client-service: feature/design-review-changes
+  client-service: design-review-changes
 be-services:
   browser-service: dev
   genome-search-service: dev
+  toygraphql-service: dev
+  thoas-service: dev