[CICD] k8s.yml shorten file

Deco-Team · Feb 25, 2024 · e57c6ea · e57c6ea
1 parent 8430c0c
commit e57c6ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/.github/workflows/k8s.yml b/.github/workflows/k8s.yml
@@ -54,25 +54,16 @@ jobs:
         IMAGE_TAG: ${{ steps.commit.outputs.short }}
 
       run: |
-        echo ${{ env.ECR_REGISTRY }}
-        
         touch .env
-        echo NODE_ENV=${{ vars.NODE_ENV }} >> .env
-        echo PORT=${{ vars.PORT }} >> .env
-        echo MONGODB_CONNECTION_STRING=${{ secrets.MONGODB_CONNECTION_STRING }} >> .env
-        echo CORS_VALID_ORIGINS=${{ vars.CORS_VALID_ORIGINS }} >> .env
-
-        echo JWT_ACCESS_SECRET=${{ vars.JWT_ACCESS_SECRET }} >> .env
-        echo JWT_ACCESS_EXPIRATION=${{ vars.JWT_ACCESS_EXPIRATION }} >> .env
-        echo JWT_REFRESH_SECRET=${{ vars.JWT_REFRESH_SECRET }} >> .env
-        echo JWT_REFRESH_EXPIRATION=${{ vars.JWT_REFRESH_EXPIRATION }} >> .env
-
-        echo SMTP_USERNAME=${{ secrets.SMTP_USERNAME }} >> .env
-        echo SMTP_PASSWORD=${{ secrets.SMTP_PASSWORD }} >> .env
-        echo SMTP_HOST=${{ vars.SMTP_HOST }} >> .env
-        echo SMTP_PORT=${{ vars.SMTP_PORT }} >> .env
-        echo SMTP_FROM_EMAIL=${{ vars.SMTP_FROM_EMAIL }} >> .env
-        echo SMTP_FROM_NAME=${{ vars.SMTP_FROM_NAME }} >> .env
+        for var in NODE_ENV PORT CORS_VALID_ORIGINS JWT_ACCESS_SECRET JWT_ACCESS_EXPIRATION JWT_REFRESH_SECRET JWT_REFRESH_EXPIRATION SMTP_HOST SMTP_PORT SMTP_FROM_EMAIL SMTP_FROM_NAME
+        do
+           echo $var=${{ vars[$var] }} >> .env
+        done
+
+        for var in MONGODB_CONNECTION_STRING SMTP_USERNAME SMTP_PASSWORD
+        do
+           echo $var=${{ secrets[$var] }} >> .env
+        done
 
         docker buildx create --use
 

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
@@ -11,7 +11,6 @@ spec:
       port: 5000
       targetPort: 5000
 
-
 ---
 
 apiVersion: apps/v1
@@ -38,7 +37,6 @@ spec:
     spec:
       containers:
       - name: api
-        # image: public.ecr.aws/s5q4d9h5/furnique:0.1
         image: DOCKER_IMAGE
         resources:
           requests:
@@ -49,14 +47,5 @@ spec:
             cpu: "500m"
         ports:
         - containerPort: 5000
-        # readinessProbe:
-        #   tcpSocket:
-        #     port: 5000
-        #   initialDelaySeconds: 5
-        #   periodSeconds: 5
-        # livenessProbe:
-        #   httpGet:
-        #     path: /health
-        #     port: 3000
         imagePullPolicy: Always
       serviceAccountName: default
diff --git a/src/i18n/vn/auth.json b/src/i18n/vn/auth.json
@@ -1,4 +1,4 @@
 {
-  "welcome": "Xin chào!!",
+  "welcome": "Xin chào!",
   "invalid_email_or_password": "Email hoặc mật khẩu không đúng. Vui lòng thử lại."
 }