Merge pull request #131 from Ensembl/deploy-newk8s

Deploy newk8s
Ensembl · Aug 16, 2024 · e873023 · e873023
2 parents 7b3f80e + ba5ec77
commit e873023
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 22 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -59,9 +59,8 @@ test:
 # Build docker image for k8s-deploy branch
 build:
   extends: .build
-  only:
-    - develop
-    - main
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "main"'
 
 # Template to deploy application to web's k8s cluster
 .deploy-web:
@@ -80,7 +79,6 @@ build:
   rules:
     - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "develop" && $CI_PROJECT_NAMESPACE== "ensembl-apps"'
 
-
 # deploy to staging at WP-HH
 Staging:
   extends: .deploy-web
@@ -111,6 +109,7 @@ Live:Fallback:
   environment:
     name : fallback
 
+
 # deploy to live at WP-HL
 Live:
   extends: .deploy-web
@@ -121,6 +120,14 @@ Live:
   environment:
     name : production
 
+# deploy to live at WP-HL
+dev:wp-hl:
+  extends: .deploy-web
+  variables:
+    BASE: k8s/web-prod/overlays/dev
+  environment:
+    name : development
+
 Public:
   extends: .deploy-web
   variables:

diff --git a/k8s/web-prod/base/deployment.yaml b/k8s/web-prod/base/deployment.yaml
@@ -1,21 +1,21 @@
 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

diff --git a/k8s/web-prod/base/ingress.yaml b/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

diff --git a/k8s/web-prod/base/service.yaml b/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

diff --git a/k8s/web-prod/overlays/apps/apps-service.yaml b/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

diff --git a/k8s/web-prod/overlays/apps/kustomization.yaml b/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
diff --git a/k8s/web-prod/overlays/dev/patch.yaml b/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:

diff --git a/k8s/web-prod/overlays/internal/patch.yaml b/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:

diff --git a/k8s/web-prod/overlays/prod/patch.yaml b/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:

diff --git a/k8s/web-prod/overlays/public-graphql/patch.yaml b/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:

diff --git a/k8s/web-prod/overlays/staging/patch.yaml b/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: