Merge pull request #28 from Gachon-Univ-Creative-Code-Innovation/fix/GUC-236-fix-with-cloud

Fix/guc 236 fix with cloud

Author: hssKang

k8s/github-service.yaml

@@ -2,7 +2,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: github-service
-  namespace: github-service
+  namespace: github
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/path: "/metrics"
+    prometheus.io/port: "4886"
 spec:
   replicas: 1
   selector:
@@ -12,6 +16,10 @@ spec:
     metadata:
       labels:
         app: github-service
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "/metrics"
+        prometheus.io/port: "4886"
     spec:
       containers:
         - name: github-service
@@ -31,12 +39,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: github-service
-  namespace: github-service
+  namespace: github
 spec:
   selector:
     app: github-service
   ports:
     - protocol: TCP
-      port: 4886
+      port: 80
       targetPort: 4886
   type: ClusterIP

k8s/postgres.yaml

@@ -2,19 +2,20 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgres-pvc
-  namespace: github-service
+  namespace: github
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 1Gi
+  storageClassName: gp2
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: postgres
-  namespace: github-service
+  namespace: github
 spec:
   replicas: 1
   selector:
@@ -37,6 +38,8 @@ spec:
               value: "password"
             - name: POSTGRES_DB
               value: "careerDB"
+            - name: PGDATA
+              value: "/var/lib/postgresql/data/pgdata"
           volumeMounts:
             - name: postgres-storage
               mountPath: /var/lib/postgresql/data
@@ -49,7 +52,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: postgres
-  namespace: github-service
+  namespace: github
 spec:
   selector:
     app: postgres

k8s/올리기.md

@@ -1,10 +1,10 @@
-kubectl create namespace github-service
+kubectl create namespace github
 
-kubectl create secret generic github-service-secret --from-file=.env -n github-service
+kubectl create secret generic github-service-secret --from-file=.env -n github
 
 kubectl apply -f ./k8s/
 
-kubectl exec -it <postgreSQL pod> -n github-servic -- bash
+kubectl exec -it <postgreSQL pod> -n github -- bash
 psql -U user -d careerDB
 
 create table public."README_Data" (

main.py

@@ -4,6 +4,7 @@
 from pydantic import BaseModel
 import httpx
 import tempfile
+from prometheus_fastapi_instrumentator import Instrumentator
 
 from src.READMECreater.GithubFetcher import DownloadRepoFiles
 from src.READMECreater.READMEGenerator import GenerateREADME
@@ -20,6 +21,7 @@
 from src.Utils.DBClient import ReadGithubFromUserID, ReadREADMEDB, ReadImageFromUserID
 
 app = FastAPI(title="GitHub AI API")
+instrumentator = Instrumentator().instrument(app).expose(app)
 
 
 class RepoRequest(BaseModel):

requirements.txt

@@ -11,4 +11,5 @@ pyjwt
 pybase64
 supabase
 httpx
-psycopg2-binary
+psycopg2-binary
+prometheus-fastapi-instrumentator