diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml deleted file mode 100644 index 5fe693b75220baeccb3e91ca8245578e06c10426..0000000000000000000000000000000000000000 --- a/.gitlab-ci.yaml +++ /dev/null @@ -1,43 +0,0 @@ -stages: - - deploy - -.deploy: - stage: deploy - image: dockerhub.ebi.ac.uk/kamal/deploy-tools:0.2 - - before_script: - - SERVICE_TAG=`yq r values.yaml fe-services.client-service` - - if [ "${SERVICE_TAG}" == "" ] ; then echo "Please sepcify for FE services" ; exit 1 ; fi - - SERVICE_TAG="${SERVICE_TAG//[[:space:]]/}" - - SERVICE_SLUG="${SERVICE_TAG//[^[:alnum:]]/-}" - - BROWSER_SERVICE_TAG=`yq r values.yaml be-services.browser-service` - - BROWSER_SERVICE_TAG="${BROWSER_SERVICE_TAG//[[:space:]]/}" - - BROWSER_SERVICE_SLUG="${BROWSER_SERVICE_TAG//[^[:alnum:]]/-}" - - 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:]]/-}" - - sed -i "s##${SERVICE_SLUG}#g" ensembl_client_service_cluster.yaml - - sed -i "s##${SERVICE_SLUG}#g" ensembl_client_ingress.yaml - - sed -i "s##${SERVICE_SLUG}#g" ensembl_client_ingress.yaml - - sed -i "s##${BROWSER_SERVICE_SLUG}#g" ensembl_server_service.yaml - - sed -i "s##${BROWSER_SERVICE_SLUG}#g" ensembl_server_ingress.yaml - - sed -i "s##${SERVICE_SLUG}#g" ensembl_server_ingress.yaml - - sed -i "s##${GENOME_SEARCH_SERVICE_SLUG}#g" ensembl_genome_search_service.yaml - - sed -i "s##${GENOME_SEARCH_SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml - - sed -i "s##${SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml - - script: - - kubectl apply -f ensembl_server_service.yaml - - kubectl apply -f ensembl_server_ingress.yaml - - kubectl apply -f ensembl_genome_search_service.yaml - - kubectl apply -f ensembl_genome_search_ingress.yaml - - kubectl apply -f ensembl_client_service_cluster.yaml - - kubectl apply -f ensembl_client_ingress.yaml - -Setup-2020: - extends: .deploy - environment: - name : wp-hx-dev-ing - except: - - dev - - master \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fe693b75220baeccb3e91ca8245578e06c10426..aa4e97f35dd3d29bcd7a4cedef2602530469a64e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,6 @@ stages: - sed -i "s##${GENOME_SEARCH_SERVICE_SLUG}#g" ensembl_genome_search_service.yaml - sed -i "s##${GENOME_SEARCH_SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml - sed -i "s##${SERVICE_SLUG}#g" ensembl_genome_search_ingress.yaml - script: - kubectl apply -f ensembl_server_service.yaml - kubectl apply -f ensembl_server_ingress.yaml diff --git a/ensembl_genome_search_ingress.yaml b/ensembl_genome_search_ingress.yaml index 77acd013f04cb5dfe3ca986dccb7a312fc3eec87..9699f715544b84dd84488337a4a322d5a9b8d172 100644 --- a/ensembl_genome_search_ingress.yaml +++ b/ensembl_genome_search_ingress.yaml @@ -1,7 +1,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: ensembl-genome-search--ingress + name: ensembl-genome-search--ingress annotations: nginx.ingress.kubernetes.io/rewrite-target: /api/$2 spec: diff --git a/ensembl_server_ingress.yaml b/ensembl_server_ingress.yaml index cfe4965868b912ca33f3c2d272b2ba9a8bd5d9bf..696a82f4b9a8eb4896b6df61956250debb464a41 100644 --- a/ensembl_server_ingress.yaml +++ b/ensembl_server_ingress.yaml @@ -1,7 +1,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: ensembl-server--ingress + name: ensembl-server--ingress annotations: nginx.ingress.kubernetes.io/rewrite-target: /browser/$2 spec: