Merge branch 'main' of https://github.com/DevOps-Video-Sharing/UserService

Author: Trinh-Tan-Dat

.github/workflows/deploymentCD.yaml

@@ -1,10 +1,10 @@
-
 name: Continuous Deployment for User Service
 
 on:
-  push:
-    branches:
-      - main
+  workflow_run:
+    workflows: ["Continuous Integration for Comment Service"]
+    types:
+      - completed
 
 env:
   PROJECT_ID: gke-project-423206
@@ -29,33 +29,28 @@ jobs:
         run: |
           mvn clean
           mvn -B package --file pom.xml
-      
+
       - name: Authenticate
         uses: google-github-actions/auth@v2
         with: 
           credentials_json: ${{ secrets.GCP_SA_KEY }}
-          
+
       - name: Configure gcloud
         uses: google-github-actions/setup-gcloud@v2
         with:
           project_id: ${{ env.PROJECT_ID }}
           install_components: 'gke-gcloud-auth-plugin'
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: datuits
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and Push the docker image
-        run: |
-          docker build -t datuits/devops-user-service:latest .
-          docker push datuits/devops-user-service:latest
-
       - name: Set cluster context
         run: |
           gcloud container clusters get-credentials ${{ env.CLUSTER_NAME }} --zone ${{ env.ZONE }} --project ${{ env.PROJECT_ID }}
 
       - name: Apply Kubernetes manifests
         run: |
           kubectl apply -f resources.yaml
+
+  notifications:
+    needs: deploy
+    uses: ./.github/workflows/notifyCD.yaml
+    secrets:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL}} 

.github/workflows/notifyCD.yaml

@@ -0,0 +1,36 @@
+name: Send Slack Notification for User Service
+
+on:
+  workflow_call:
+    secrets:
+      SLACK_WEBHOOK_URL:
+        required: true
+
+jobs:
+  success_notifier:
+    if: success()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send success notification on Slack
+        uses: slackapi/[email protected]
+        with:
+          payload: |
+            {
+              "text": "The Continuous Deployment for User Service workflow has completed successfully."
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  failure_notifier:
+    if: failure()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send failure notification on Slack
+        uses: slackapi/[email protected]
+        with:
+          payload: |
+            {
+              "text": "The Continuous Deployment for User Service workflow has failed."
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

Dockerfile

@@ -3,10 +3,10 @@ FROM openjdk:17-jdk
 WORKDIR /app
 
 # Copy the JAR file
-COPY target/streaming-0.0.1-SNAPSHOT.jar /app/app.jar
+COPY target/userService-0.0.1-SNAPSHOT.jar /app/app.jar
 
 # Copy all PNG files from the specific directory to a directory in the Docker container
-COPY src/main/java/com/programming/streaming/images/*.png /app/images/
+COPY src/main/java/com/programming/userService/images/*.png /app/images/
 
 # Expose port
 EXPOSE 8080

database.yaml

@@ -21,9 +21,44 @@ spec:
         - name: MONGO_INITDB_DATABASE
           value: user-service
         resources:
+          requests:
+            memory: "32Mi"
+            cpu: "0.05"
           limits:
-            memory: 256Mi
-            cpu: "1"
+            memory: "64Mi"
+            cpu: "0.1"
+          
+        volumeMounts:
+        - name: mongo-storage
+          mountPath: /data/db
+      volumes:
+      - name: mongo-storage
+        persistentVolumeClaim:
+          claimName: user-mongo-pvc
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: user-mongo-pv
+spec:
+  capacity:
+    storage: 70Mi
+  accessModes:
+    - ReadWriteOnce
+  gcePersistentDisk:
+    pdName: user-mongo-disk
+    fsType: ext4
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: user-mongo-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 70Mi
 ---
 apiVersion: v1
 kind: Service
@@ -35,5 +70,4 @@ spec:
   ports:
     - protocol: TCP
       port: 27017
-      targetPort: 27017
-
+      targetPort: 27017

pom.xml

@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.programming</groupId>
-	<artifactId>streaming</artifactId>
+	<artifactId>userService</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>streaming</name>
+	<name>userService</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>17</java.version>

resources.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -24,9 +23,12 @@ spec:
           - name: SPRING_DATA_MONGODB_URI
             value: mongodb://user-mongo-service:27017/user-service
           resources:
+            requests:
+              memory: "32Mi"
+              cpu: "0.2"
             limits:
-              memory: 512Mi
-              cpu: "1"
+              memory: "64Mi"
+              cpu: "0.4"
 ---
 apiVersion: v1
 kind: Service
@@ -39,4 +41,4 @@ spec:
     - protocol: TCP
       port: 8081
       targetPort: 8081
-  type: ClusterIP
+  type: NodePort

…ming/streaming/StreamingApplication.java …ng/userService/StreamingApplication.javasrc/main/java/com/programming/streaming/StreamingApplication.java renamed to src/main/java/com/programming/userService/StreamingApplication.java src/main/java/com/programming/streaming/StreamingApplication.java renamed to src/main/java/com/programming/userService/StreamingApplication.java

@@ -1,4 +1,4 @@
-package com.programming.streaming;
+package com.programming.userService;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

…ing/streaming/config/SecurityConfig.java …g/userService/config/SecurityConfig.javasrc/main/java/com/programming/streaming/config/SecurityConfig.java renamed to src/main/java/com/programming/userService/config/SecurityConfig.java src/main/java/com/programming/streaming/config/SecurityConfig.java renamed to src/main/java/com/programming/userService/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.programming.streaming.config;
+package com.programming.userService.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

…streaming/controller/UserController.java …erService/controller/UserController.javasrc/main/java/com/programming/streaming/controller/UserController.java renamed to src/main/java/com/programming/userService/controller/UserController.java src/main/java/com/programming/streaming/controller/UserController.java renamed to src/main/java/com/programming/userService/controller/UserController.java

@@ -49,11 +49,6 @@ public String getEmail() {
         }
     }
 
-    @GetMapping("/")
-    public String getServiceName(){
-        return "User Service";
-    }
-
     @PostMapping("/send-verification-email")
     public String sendVerificationEmail(@RequestBody String emailJson) {
         SimpleMailMessage message = new SimpleMailMessage();

…ogramming/streaming/entity/AuthUser.java …ramming/userService/entity/AuthUser.javasrc/main/java/com/programming/streaming/entity/AuthUser.java renamed to src/main/java/com/programming/userService/entity/AuthUser.java src/main/java/com/programming/streaming/entity/AuthUser.java renamed to src/main/java/com/programming/userService/entity/AuthUser.java

@@ -1,4 +1,4 @@
-package com.programming.streaming.entity;
+package com.programming.userService.entity;
 
 import lombok.Builder;
 import lombok.Data;