Nginx deploy automation

.gitlab-ci.yml

@@ -68,6 +68,13 @@ variables:
     - kustomize edit set image DOCKER_IMAGE=${DOCKER_IMAGE}
     - kubectl apply -k .
 
+.deploy-nginx-template:
+  <<: *prepare-context
+  script:
+    - cd k8s/frontend/nginx/
+    - kustomize edit set image DOCKER_IMAGE=${DOCKER_IMAGE}
+    - kubectl apply -k .
+
 # template for deploy the configmap used by the backend backend
 # update docker image in appropriate environment
 .deploy-config-be-template:
@@ -78,7 +85,7 @@ variables:
 
 # template for deploy context for frontend
 # publish static assets to appropriate environment
-.deploy-fe-template:
+.publish-assets-template:
   <<: *prepare-context
   script:
     - cd k8s/frontend/
@@ -158,7 +165,7 @@ Deploy:BE-Config:RC:
 
 # Publish static assets to QA environment
 Publish:Assets:RC:
-  extends: .deploy-fe-template
+  extends: .publish-assets-template
   stage: deploy_rc
   <<: *fe-code-change-rules
   environment:
@@ -230,7 +237,7 @@ Deploy:BE-config:Live:
 # This is manual step it explicitly needs to be triggered by pressing a button in gitlab interface
 # The job is scheduled only for main branch and when deploy freeze is not in place
 Publish:Assets:Live:
-  extends: .deploy-fe-template
+  extends: .publish-assets-template
   stage: deploy
   <<: *fe-code-change-rules
   environment:
@@ -243,3 +250,37 @@ Publish:Assets:Live:
       changes:
         - frontend/**/*
       when: manual
+
+# Deploy Nginx to Live to serve static assets
+# This is manual step it explicitly needs to be triggered by pressing a button in gitlab interface
+# The job is scheduled only for main branch and when deploy freeze is not in place
+Deploy:Nginx:Live:
+  stage: deploy
+  extends: .deploy-nginx-template
+  <<: *static-code-change-rules
+  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:1.0.4
+  environment:
+    name: production
+  variables:
+    AGENT: ${PROD_AGENT}
+    NS: amr
+    DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-fe
+  rules:
+    - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "nda2"'
+      changes:
+        - frontend/**/*
+      when: manual
+
+# Deploy Nginx to RC to serve static assets
+# The job is scheduled only for main branch
+Deploy:Nginx:RC:
+  stage: deploy_rc
+  extends: .deploy-nginx-template
+  <<: *static-code-change-rules
+  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:1.0.4
+  environment:
+    name: development
+  variables:
+    AGENT: ${REVIEW_AGENT}
+    NS: amr
+    DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-fe

frontend/nginx-conf/local.conf

@@ -13,9 +13,9 @@
 server {
     listen 8000;
     server_name localhost;
+    root /usr/assets/dist;  # Directory containing static files
 
     location / {
-        root /usr/assets/dist;  # Directory containing static files
         index index.html index.htm;
         try_files $uri $uri/ =404;  # Serve 404 if file not found
     }

k8s/frontend/kustomization.yaml

@@ -1,4 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- publish_assets.yaml
+- nginx/pvc.yaml
+- nginx/service.yaml
+- nginx/deployment.yaml
+- nginx/ingress.yaml

k8s/frontend/deployment.yaml → k8s/frontend/nginx/deployment.yaml

@@ -17,7 +17,7 @@ spec:
       imagePullSecrets:
         - name: ensemblweb-pull-secret
       containers:
-      - image: dockerhub.ebi.ac.uk/ensembl-web/amr-portal:d9bf511d-fe
+      - image: DOCKER_IMAGE
         imagePullPolicy: Always
         name: amr-portal-nginx
         ports:

k8s/frontend/nginx/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- deployment.yaml

k8s/frontend/publish_assets/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- publish_assets.yaml