Deploy newk8s

.gitlab-ci.yml

@@ -59,15 +59,14 @@ test:
 # Build docker image for k8s-deploy branch
 build:
   extends: .build
-  only:
-    - develop
-    - main
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "deploy-newk8s" || $CI_COMMIT_BRANCH == "main"'
 
 # Template to deploy application to web's k8s cluster
 .deploy-web:
   extends: .deploy
   rules:
-    - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "main" && $CI_PROJECT_NAMESPACE== "ensembl-web"'
+    - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "develop" && $CI_PROJECT_NAMESPACE== "ensembl-web"'
 
 # Template to deploy application to apps k8s cluster
 .deploy-apps:
@@ -77,53 +76,53 @@ build:
   rules:
     - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "develop" && $CI_PROJECT_NAMESPACE== "ensembl-apps"'
 
-# deploy to staging at WP-HX
-staging:wp-hx:
-  extends: .deploy-web
-  variables:
-    BASE: k8s/web-prod/overlays/staging
-  environment:
-    name: wp-hx-staging
-
 # deploy to staging at WP-HH
-staging:wp-hh:
+staging:wp-hl:
   extends: .deploy-web
   variables:
     BASE: k8s/web-prod/overlays/staging
   environment:
-    name: wp-hh-staging
-
-# deploy to internal at WP-HX
-internal:wp-hx:
-  extends: .deploy-web
-  variables:
-    BASE: k8s/web-prod/overlays/internal
-  environment:
-    name: wp-hx-internal
+    name: wp40-hl-staging
 
 # deploy to internal at WP-HH
-internal:wp-hh:
+internal:wp-hl:
   extends: .deploy-web
   variables:
     BASE: k8s/web-prod/overlays/internal
   environment:
-    name: wp-hh-internal
+    name: wp40-hl-internal
 
  # deploy to live at WP-HX
 live:wp-hx:
   extends: .deploy-web
   variables:
     BASE: k8s/web-prod/overlays/prod
   environment:
-    name : wp-hx-live
+    name : wp41-hx-prod
 
 # deploy to live at WP-HL
 live:wp-hl:
   extends: .deploy-web
   variables:
     BASE: k8s/web-prod/overlays/prod
   environment:
-    name : wp-hh-live
+    name : wp40-hl-prod
+
+# deploy to live at WP-HL
+dev:wp-hl:
+  extends: .deploy-web
+  variables:
+    BASE: k8s/web-prod/overlays/dev
+  environment:
+    name : wp40-hl-development
+
+  # deploy to live at WP-HL
+dev:wp-hx:
+  extends: .deploy-web
+  variables:
+    BASE: k8s/web-prod/overlays/dev
+  environment:
+    name : wp41-hx-development
 
 deploy:public:
   extends: .deploy-web

k8s/web-prod/base/configmap.yaml

@@ -7,4 +7,4 @@ data:
   https_proxy: <HTTP_PROXY>
 kind: ConfigMap
 metadata:
-  name: thoas-configmap
+  name: graphql-core-configmap

k8s/web-prod/base/deployment.yaml

@@ -1,28 +1,28 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: thoas-server-deployment
+  name: graphql-core-deployment
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: thoas-server
+      app: graphql-core
   template:
     metadata:
       labels:
-        app: thoas-server
+        app: graphql-core
     spec:
       imagePullSecrets:
         - name: ensemblweb-pull-secret 
       containers:
-        - name: thoas-server
+        - name: graphql-core
           image: DOCKER_IMAGE
           ports:
             - containerPort: 8000
           imagePullPolicy: Always
           envFrom:
             - configMapRef:
-                name: thoas-configmap
+                name: graphql-core-configmap
             - secretRef:
                 name: mongo-config
           command: ["uvicorn"]

k8s/web-prod/base/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: thoas-server-ingress
+  name: graphql-core-ingress
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$2
 spec:
@@ -12,7 +12,7 @@ spec:
       paths:
       - backend:
           service:
-            name: thoas-server-svc
+            name: graphql-core-svc
             port:
               number: 8000
         path: path

k8s/web-prod/base/service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: thoas-server-svc
+  name: graphql-core-svc
   labels:
-    app: thoas-server-svc
+    app: graphql-core-svc
 spec:
   selector:
-    app: thoas-server
+    app: graphql-core
   type: ClusterIP
   ports:
     - port: 8000

k8s/web-prod/overlays/apps/apps-service.yaml

@@ -2,13 +2,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: thoas-server-svc
+  name: graphql-core-svc
   namespace: ensembl-apps
   labels:
-    app: thoas-server-svc
+    app: graphql-core-svc
 spec:
   selector:
-    app: thoas-server
+    app: graphql-core
   type: NodePort
   ports:
     - port: 8000

k8s/web-prod/overlays/apps/kustomization.yaml

@@ -9,5 +9,5 @@ patches:
       group: apps
       version: v1
       kind: Deployment
-      name: thoas-server-deployment
+      name: graphql-core-deployment
     path: patch.yaml

k8s/web-prod/overlays/dev/patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: thoas-server-deployment
+  name: graphql-core-deployment
 spec:
   template:
     spec:

k8s/web-prod/overlays/internal/patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: thoas-server-deployment
+  name: graphql-core-deployment
 spec:
   template:
     spec:

k8s/web-prod/overlays/prod/patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: thoas-server-deployment
+  name: graphql-core-deployment
 spec:
   template:
     spec:

k8s/web-prod/overlays/public-graphql/patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: thoas-server-deployment
+  name: graphql-core-deployment
 spec:
   template:
     spec:

k8s/web-prod/overlays/staging/patch.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: thoas-server-deployment
+  name: graphql-core-deployment
 spec:
   template:
     spec: