release / dev 서버 분리 작업

.github/workflows/build-push.yml

@@ -0,0 +1,40 @@
+name: Build and Deploy to Docker Hub
+
+on:
+  push:
+    branches: [ "release", "dev" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        run: ./gradlew build --daemon --parallel
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: Set Docker repository
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/release" ]]; then
+            echo "DOCKER_REPO=yeseulhong/grass-diary-release" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+            echo "DOCKER_REPO=yeseulhong/grass-diary-dev" >> $GITHUB_ENV
+          fi
+
+      - name: Build and Push Docker Image
+        run: |
+          docker buildx create --use
+          docker buildx build --platform linux/arm64,linux/amd64 -t ${{ env.DOCKER_REPO }}:latest --push .

k8s/deployment.yaml → k8s/dev/deployment.yaml

@@ -2,8 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: spring-boot-app
+  namespace: grass-diary-backend-dev
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: spring-boot-app
@@ -14,7 +15,7 @@ spec:
     spec:
       containers:
         - name: spring-boot-app
-          image: yeseulhong/grass-diary:${IMAGE_TAG}
+          image: yeseulhong/grass-diary-release:latest
           ports:
             - containerPort: 8080
           env:

k8s/dev/ingress.yaml

@@ -0,0 +1,23 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: dev-ingress
+  namespace: grass-diary-backend-dev
+  annotations:
+    kubernetes.io/ingress.class: nginx
+spec:
+  tls:
+  - hosts:
+    - dev.chzzk-diary-server.shop
+    secretName: dev-tls-secret
+  rules:
+  - host: dev.chzzk-diary-server.shop
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: spring-boot-app-svc
+            port: 
+              number: 80

k8s/service.yaml → k8s/dev/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: spring-boot-app-svc
+  namespace: grass-diary-backend-dev
 spec:
   selector:
     app: spring-boot-app

k8s/release/deployment.yaml

@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spring-boot-app
+  namespace: grass-diary-backend-release
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: spring-boot-app
+  template:
+    metadata:
+      labels:
+        app: spring-boot-app
+    spec:
+      containers:
+        - name: spring-boot-app
+          image: yeseulhong/grass-diary-release:latest
+          ports:
+            - containerPort: 8080
+          env:
+            - name: GOOGLE_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: google-secrets
+                  key: GOOGLE_CLIENT_ID
+            - name: GOOGLE_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: google-secrets
+                  key: GOOGLE_CLIENT_SECRET
+            - name: JWT_ACCESS_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: jwt-secrets
+                  key: JWT_ACCESS_SECRET_KEY
+            - name: JWT_REFRESH_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: jwt-secrets
+                  key: JWT_REFRESH_SECRET_KEY
+            - name: DB_SERVER_URL
+              valueFrom:
+                secretKeyRef:
+                  name: db-secrets
+                  key: DB_SERVER_URL
+            - name: DB_USER_ID
+              valueFrom:
+                secretKeyRef:
+                  name: db-secrets
+                  key: DB_USER_ID
+            - name: DB_USER_PW
+              valueFrom:
+                secretKeyRef:
+                  name: db-secrets
+                  key: DB_USER_PW
+            - name: S3_ACCESS_PUBLIC_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: s3-secrets
+                  key: S3_ACCESS_PUBLIC_KEY
+            - name: S3_ACCESS_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: s3-secrets
+                  key: S3_ACCESS_SECRET_KEY
+            - name: S3_BUCKET_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: s3-secrets
+                  key: S3_BUCKET_NAME
+

k8s/release/ingress.yaml

@@ -0,0 +1,23 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: release-ingress
+  namespace: grass-diary-backend-release
+  annotations:
+    kubernetes.io/ingress.class: nginx
+spec:
+  tls:
+  - hosts:
+    - release.chzzk-diary-server.shop
+    secretName: release-tls-secret
+  rules:
+  - host: release.chzzk-diary-server.shop
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: spring-boot-app-svc
+            port: 
+              number: 80

k8s/release/service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: spring-boot-app-svc
+  namespace: grass-diary-backend-release
+spec:
+  selector:
+    app: spring-boot-app
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8080
+

src/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.jpa.properties.hibernate.show_sql=true
 spring.jpa.show-sql=true
 oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID}
 oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET}
-oauth2.client.registration.google.redirect-uri=http://localhost:8080/api/auth/code/google
+oauth2.client.registration.google.redirect-uri=https://release.chzzk-diary-server.shop/api/auth/code/google
 oauth2.client.registration.google.authorization-grant-type=code
 oauth2.client.registration.google.scope=profile email
 oauth2.client.provider.google.authorization-uri=https://accounts.google.com/o/oauth2/v2/auth