Merge pull request #73 from CS3219-AY2425S1/deploy-risky

Deploy final

Author: modembcc

.gitignore

@@ -1,4 +1,5 @@
 **/.env
 .idea
 *.log
-main.exe
+main.exe
+kubernetes

compose.yaml

@@ -1,7 +1,7 @@
 services:
   peerprep:
     build: peerprep
-    image: distractedcat/peerprep
+    image: modembcc/peerprep:7.0.3
     env_file:
       - peerprep/.env
     ports:
@@ -15,10 +15,9 @@ services:
           path: peerprep
           target: /frontend
 
-
   user-service:
     build: user-service
-    image: distractedcat/user-service
+    image: modembcc/user-service:6.0.0
     volumes:
       - /user-service/node_modules
     env_file:
@@ -35,7 +34,7 @@ services:
 
   backend:
     build: backend
-    image: distractedcat/backend
+    image: modembcc/backend:6.0.0
     env_file:
       - backend/.env
     ports:
@@ -74,7 +73,7 @@ services:
 
   matching-service:
     build: matching-service
-    image: distractedcat/matching-service
+    image: modembcc/matching-service:6.0.0
     env_file:
       - matching-service/.env
     extra_hosts:
@@ -90,7 +89,7 @@ services:
 
   matching-service-api:
     build: matching-service-api
-    image: distractedcat/matching-service-api
+    image: modembcc/matching-service-api:6.0.0
     env_file:
       - matching-service-api/.env
     extra_hosts:
@@ -108,7 +107,7 @@ services:
 
   storage-blob-api:
     build: storage-blob-api
-    image: distractedcat/storage-blob-api
+    image: modembcc/storage-blob-api:6.0.0
     env_file:
       - storage-blob-api/.env
     extra_hosts:
@@ -125,7 +124,7 @@ services:
 
   collab:
     build: collab
-    image: distractedcat/collab
+    image: modembcc/collab:7.0.3
     env_file:
       - collab/.env
     ports:
@@ -138,7 +137,7 @@ services:
 
   formatter:
     build: formatter
-    image: distractedcat/formatter
+    image: modembcc/formatter:6.0.0
     extra_hosts:
       - "host.docker.internal:host-gateway"
     ports:
@@ -151,7 +150,7 @@ services:
 
   comms:
     build: comms
-    image: distractedcat/comms
+    image: modembcc/comms:7.0.0
     #env_file:
     #- comms/.env
     ports:
@@ -164,7 +163,7 @@ services:
 
   nginx:
     build: nginx
-    image: distractedcat/nginx
+    image: modembcc/nginx:6.0.0
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/internal.conf
     ports:
@@ -175,10 +174,10 @@ services:
       - user-service
       - storage-blob-api
       - matching-service-api
-  
+
   inbound-gateway:
     build: inbound-gateway
-    image: wzwren/inbound-gateway
+    image: modembcc/inbound-gateway:6.0.1
     ports:
       - "80:80"
     volumes:

inbound-gateway/nginx.conf

@@ -52,5 +52,11 @@ http {
             proxy_set_header Connection "upgrade";
             proxy_read_timeout 86400;
         }
+
+        location /health {
+            access_log off;
+            return 200 'OK\n';
+            add_header Content-Type text/plain;
+        }
     }
 }

kubernetes/apply_k8s_configs.ps1

@@ -1,24 +1,18 @@
 # Array of Kubernetes YAML files to apply
 $files = @(
     "backend-deployment.yaml",
-    "backend-service.yaml",
     "collab-service-deployment.yaml",
-    "collab-service-service.yaml",
     "matching-service-api-deployment.yaml",
-    "matching-service-api-service.yaml",
     "matching-service-deployment.yaml",
     "nginx-deployment.yaml",
-    "nginx-service.yaml",
+    "formatter-deployment.yaml",
+    "formatter-service.yaml",
     "peerprep-deployment.yaml",
-    "peerprep-service.yaml",
-    "rabbitmq-service.yaml",
     "rabbitmq-statefulset.yaml",
-    "redis-service.yaml",
     "redis-statefulset.yaml",
     "storage-blob-api-deployment.yaml",
-    "storage-blob-api-service.yaml",
     "user-service-deployment.yaml",
-    "user-service-service.yaml"
+    "inbound-gateway-deployment.yaml"
 )
 
 # Loop through each file and apply it using kubectl

kubernetes/backend-deployment.yaml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: backend
-          image: distractedcat/backend:1.0.0
+          image: modembcc/backend:6.0.0
           imagePullPolicy: IfNotPresent
           env:
             - name: MONGODB_URI
@@ -31,4 +31,4 @@ spec:
               memory: "128Mi"
             limits:
               cpu: "200m"
-              memory: "256Mi"
+              memory: "256Mi"

kubernetes/collab-service-HPA.yaml

@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: collab
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: collab
+  minReplicas: 1
+  maxReplicas: 5
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 80

kubernetes/collab-service-deployment.yaml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: collab
-          image: distractedcat/collab:3.0.0
+          image: modembcc/collab:7.0.3
           imagePullPolicy: Always
           env:
             - name: PORT
@@ -24,4 +24,11 @@ spec:
               value: http://user-service:3001
           ports:
             - containerPort: 4000
-              name: collab
+              name: collab
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "128Mi"
+            limits:
+              cpu: "200m"
+              memory: "256Mi"

kubernetes/comms-HPA.yaml

@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: comms
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: comms
+  minReplicas: 1
+  maxReplicas: 5
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 80

kubernetes/comms-deployment.yaml

@@ -13,8 +13,15 @@ spec:
     spec:
       containers:
         - name: comms
-          image: distractedcat/comms:1.0.0
+          image: modembcc/comms:7.0.0
           imagePullPolicy: Always
           ports:
             - containerPort: 4001
-              name: comms
+              name: comms
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "128Mi"
+            limits:
+              cpu: "200m"
+              memory: "256Mi"

kubernetes/comms-service.yaml

@@ -9,4 +9,4 @@ spec:
     - protocol: TCP
       port: 4001
       targetPort: 4001
-  type: LoadBalancer
+  type: ClusterIP