Review on newk8s

.gitlab-ci.yml

@@ -20,35 +20,8 @@ variables:
     - docker rmi ${DOCKER_IMAGE}
     - docker logout $CI_REGISTRY
 
-.deploy:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:latest
-
-  script:
-    - sed -i "s#<DOCKER_IMAGE>#${DOCKER_IMAGE}#g" k8s/deployment.yaml
-    - kubectl apply -f k8s/deployment.yaml
-    - kubectl apply -f k8s/service-node.yaml
-
-# Template to deploy to staging, internal, prod
-.deploy-wp:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:latest
-
-  script:
-    - sed -i "s#<DOCKER_IMAGE>#${DOCKER_IMAGE}#g" k8s/deployment.yaml
-    - kubectl apply -f k8s/deployment.yaml
-
-# Template to deploy to dev (Review apps) using kustmoize
-.deploy-wp-kstmz:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:latest
-
-  script:
-    - kustomize edit set image DOCKER_IMAGE=${DOCKER_IMAGE}
-    - kustomize build . | kubectl apply -f -
-
 # Template to deploy to staging, internal, prod
-.deploy-newk8s:
+.deploy:
   stage: deploy
   image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:latest
   script:
@@ -63,74 +36,35 @@ variables:
     - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "main"'
       when: always
 
-# Template to deploy to dev (Review apps)
-.deploy-wp-review:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:latest
-
-  before_script:
-    - cd k8s/overlays/review
-
-  script:
-    - kustomize edit set namesuffix -- -${CI_COMMIT_REF_SLUG}
-    - kustomize edit set image DOCKER_IMAGE=${DOCKER_IMAGE}
-    - kustomize edit add label -f environment:${CI_COMMIT_REF_SLUG}
-    - kustomize build . | kubectl apply -f -
-
 build:
   extends: .build
 
-# Default help-and-docs api deployment used by all ensembl-client review branches
-Dev:
-  extends: .deploy-wp-kstmz
-  environment:
-    name : wp-hx-dev
-  before_script:
-    - cd k8s/overlays/development
-    - kustomize edit add label -f environment:dev
-  only:
-  - main
-
-# Custom help-and-docs api deployment for any development branch of the api
-Review:
-  extends: .deploy-wp-review
-  environment:
-    name : wp-hx-dev
-  except:
-  - main
-
 Live:WP40:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp40-hl-prod
 
 Live:WP41:HX:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp41-hx-prod
 
 Staging:WP40:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp40-hl-staging
 
 Internal:WP40:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp40-hl-internal
 
-Dev:WP40:HL:
-  extends: .deploy-newk8s
-  <<: *deploy-rules
-  environment:
-    name: wp40-hl-development
-
-Dev:WP41:HX:
-  extends: .deploy-newk8s
+Dev:WP51:HL:
+  extends: .deploy
   <<: *deploy-rules
   environment:
-    name: wp41-hx-development
+    name: wp51-hl-development