Commit 6c4dc02b authored by Kamal Dodiya's avatar Kamal Dodiya
Browse files

Merge branch 'help-docs-integration' into 'master'

Help docs integration

See merge request !4
parents b6891773 da69ea06
Pipeline #168421 failed with stage
in 3 seconds
......@@ -6,6 +6,7 @@ variables:
GENOME_SEARCH_SERVICE_SLUG: dev
THOAS_SERVICE_SLUG: dev
REFGET_SERVICE_SLUG: dev
HELP_DOCS_SERVICE_SLUG: dev
.deploy:
stage: deploy
......@@ -22,15 +23,15 @@ variables:
- 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:]]/-}"
- REFGET_SERVICE_TAG=`yq r values.yaml be-services.refget-service`
- REFGET_SERVICE_TAG="${REFGET_SERVICE_TAG//[[:space:]]/}"
- REFGET_SERVICE_SLUG="${REFGET_SERVICE_TAG//[^[:alnum:]]/-}"
- HELP_DOCS_SERVICE_TAG=`yq r values.yaml be-services.help-docs-service`
- HELP_DOCS_SERVICE_TAG="${HELP_DOCS_SERVICE_TAG//[[:space:]]/}"
- HELP_DOCS_SERVICE_SLUG="${HELP_DOCS_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
......@@ -51,7 +52,14 @@ variables:
- sed -i "s#<DEPLOYMENT_ENV>#${REFGET_SERVICE_SLUG}#g" ensembl_refget_service.yaml
- sed -i "s#<DEPLOYMENT_ENV>#${REFGET_SERVICE_SLUG}#g" ensembl_refget_ingress.yaml
- sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_refget_ingress.yaml
# ensembl-help-docs
- sed -i "s#<DEPLOYMENT_ENV>#${HELP_DOCS_SERVICE_SLUG}#g" ensembl_help_docs_service.yaml
- sed -i "s#<DEPLOYMENT_ENV>#${HELP_DOCS_SERVICE_SLUG}#g" ensembl_help_docs_ingress.yaml
- sed -i "s#<SUB_DOMAIN>#${SERVICE_SLUG}#g" ensembl_help_docs_ingress.yaml
script:
# ensembl-help-and-docs
- kubectl apply -f ensembl_help_docs_service.yaml
- kubectl apply -f ensembl_help_docs_ingress.yaml
# ensembl-refget
- kubectl apply -f ensembl_refget_service.yaml
- kubectl apply -f ensembl_refget_ingress.yaml
......
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /api/$2
name: ensembl-help-docs-ingress-<SUB_DOMAIN>
spec:
rules:
- host: <SUB_DOMAIN>.review.ensembl.org
http:
paths:
- backend:
serviceName: ensembl-help-and-docs-<DEPLOYMENT_ENV>-svc
servicePort: 8000
path: /api/docs($|/)(.*)
\ No newline at end of file
apiVersion: v1
kind: Service
metadata:
name: ensembl-help-and-docs-<DEPLOYMENT_ENV>-svc
labels:
app: ensembl-help-and-docs-<DEPLOYMENT_ENV>-svc
spec:
selector:
app: ensembl-help-and-docs
environment: <DEPLOYMENT_ENV>
type: ClusterIP
ports:
- port: 8000
protocol: TCP
targetPort: 3000
\ No newline at end of file
......@@ -4,4 +4,5 @@ be-services:
browser-service: dev
genome-search-service: dev
thoas-service: dev
refget-service: dev
\ No newline at end of file
refget-service: dev
help-docs-service: dev
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment