From f571017ed4a6087665494c936b864600769bda7d Mon Sep 17 00:00:00 2001 From: Mingyu Song <100754581+mikekks@users.noreply.github.com> Date: Tue, 31 Dec 2024 22:36:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20redis=20=EC=A2=85=EB=A3=8C=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#281)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: redis 종료되지 않도록 수정 * del: 미사용 스크립트 제거 * del: 미사용 파일 제거 * del: 미사용 파일 제거 * del: 미사용 파일 제거 --- .github/workflows/ci-cd-compose.yaml | 137 ------------ .github/workflows/k3s-dev.yaml | 259 ---------------------- .github/workflows/k3s-prod.yaml | 232 ------------------- config/tokens/StoredCredential.txt | Bin 1130 -> 0 bytes layer-api/infra/production/deploy.sh | 4 +- layer-api/k8s/development/deployment.yaml | 38 ---- tokens/StoredCredential | Bin 1130 -> 0 bytes 7 files changed, 2 insertions(+), 668 deletions(-) delete mode 100644 .github/workflows/ci-cd-compose.yaml delete mode 100644 .github/workflows/k3s-dev.yaml delete mode 100644 .github/workflows/k3s-prod.yaml delete mode 100644 config/tokens/StoredCredential.txt delete mode 100644 layer-api/k8s/development/deployment.yaml delete mode 100644 tokens/StoredCredential diff --git a/.github/workflows/ci-cd-compose.yaml b/.github/workflows/ci-cd-compose.yaml deleted file mode 100644 index ded9a65d..00000000 --- a/.github/workflows/ci-cd-compose.yaml +++ /dev/null @@ -1,137 +0,0 @@ -name: deploy action - -on: - push: - branches: - - develop/compose - -env: - REGISTRY: "ghcr.io" - NAMESPACE: "depromeet" - IMAGE_NAME: "kasukabe-server" - # TODO: 멀티모듈 적용시 동적 할당 필요 - MODULE: "layer-api" - -jobs: - setup: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - outputs: - deploy_target: ${{ steps.set-env.outputs.DEPLOY_TARGET }} - steps: - - name: Setup Env - id: set-env - run: | - if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then - echo "DEPLOY_TARGET=production" >> $GITHUB_OUTPUT - else - echo "DEPLOY_TARGET=development" >> $GITHUB_OUTPUT - fi - - build: - name: build - needs: [ setup ] - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - env: - DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }} - REGISTRY: "ghcr.io" - NAMESPACE: "depromeet" - IMAGE_NAME: "kasukabe-server" - # TODO: 멀티모듈 적용시 동적 할당 필요 - MODULE: "layer-api" - APPLICATION_SECRET_PROPERTIES: ${{ secrets.APPLICATION_SECRET_PROPERTIES }} - GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} - - steps: - - name: Setup Java - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'corretto' - - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Setup Gradle - uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0 - - - name: Create application-secret.properties - run: | - echo "${APPLICATION_SECRET_PROPERTIES}" > ./${{ env.MODULE }}/src/main/resources/application-secret.properties - - - name: Build ${{ env.MODULE }} module - run: ./gradlew :${{ env.MODULE }}:build - - - name: Run tests:${{ env.MODULE }} - run: ./gradlew :${{ env.MODULE }}:test - - - name: login github container registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/${{ env.MODULE }} - - - name: push - uses: docker/build-push-action@v4 - with: - context: ./${{ env.MODULE }} - platforms: linux/amd64 - push: true - tags: | - ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/${{ env.MODULE }}:latest - # ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/${{ env.MODULE }}:${{ github.run_id }} - - - deploy: - name: Deploy - needs: [ build, setup ] - runs-on: ubuntu-latest - env: - DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }} - # TODO: 멀티모듈 적용시 동적 할당 필요 - MODULE: "layer-api" - - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Create application-secret.properties file - run: | - echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > ./${{ env.MODULE }}/infra/${{ env.DEPLOY_TARGET }}/application-secret.properties - - - name: Send Docker Compose - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.INSTANCE_HOST }} - username: ${{ secrets.INSTANCE_USERNAME }} - password: ${{ secrets.INSTANCE_PASSWORD }} - port: 22 - source: ./${{ env.MODULE }}/infra/${{ env.DEPLOY_TARGET }}/* - target: "/home" - - - name: Deploy with Docker Compose - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.INSTANCE_HOST }} - username: ${{ secrets.INSTANCE_USERNAME }} - password: ${{ secrets.INSTANCE_PASSWORD }} - port: 22 - script: | - cd /home/${{ env.MODULE }}/infra/${{ env.DEPLOY_TARGET }} - echo "${{ secrets.APPLICATION_SECRET_PROPERTIES }}" > application-secret.properties - docker compose pull - docker compose up -d - docker image prune -a -f diff --git a/.github/workflows/k3s-dev.yaml b/.github/workflows/k3s-dev.yaml deleted file mode 100644 index aeb1b7b5..00000000 --- a/.github/workflows/k3s-dev.yaml +++ /dev/null @@ -1,259 +0,0 @@ -name: Spring Boot Multi-module K3s Deployment - -on: - push: - branches: - - develop-test # 실행되지 않도록 브랜치 명 변경 - -env: - REGISTRY: "ghcr.io" - NAMESPACE: "depromeet" - IMAGE_NAME: "kasukabe-server" - -jobs: - setup: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - outputs: - deploy_target: ${{ steps.set-env.outputs.DEPLOY_TARGET }} - sha_short: ${{ steps.sha_short.outputs.sha_short }} - changed_modules: ${{ steps.detect-changes.outputs.changed_modules }} - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Setup Env - id: set-env - run: | - if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then - echo "DEPLOY_TARGET=production" >> $GITHUB_OUTPUT - else - echo "DEPLOY_TARGET=development" >> $GITHUB_OUTPUT - fi - - - name: Get short SHA - id: sha_short - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: Detect Changed Modules - id: detect-changes - run: | - CHANGED_MODULES="" - - if git diff --name-only HEAD^ HEAD | grep -q '^layer-api/'; then - if [ -z "$CHANGED_MODULES" ]; then - CHANGED_MODULES="layer-api" - else - CHANGED_MODULES="$CHANGED_MODULES,layer-api" - fi - fi - - if git diff --name-only HEAD^ HEAD | grep -q '^layer-batch/'; then - if [ -z "$CHANGED_MODULES" ]; then - CHANGED_MODULES="layer-batch" - else - CHANGED_MODULES="$CHANGED_MODULES,layer-batch" - fi - fi - - echo "changed_modules=$CHANGED_MODULES" - echo "changed_modules=$CHANGED_MODULES" >> $GITHUB_OUTPUT - - build: - name: build - needs: [ setup ] - runs-on: ubuntu-latest - if: ${{ needs.setup.outputs.changed_modules != '' }} - permissions: - contents: read - packages: write - - env: - DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }} - APPLICATION_SECRET_PROPERTIES: ${{ secrets.APPLICATION_SECRET_PROPERTIES }} - GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} - SHA_SHORT: ${{ needs.setup.outputs.sha_short }} - CHANGED_MODULES: ${{ needs.setup.outputs.changed_modules }} - - steps: - - name: Setup Java - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'corretto' - - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Gradle Caching - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Setup Gradle - uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0 - - - name: Create application-secret.properties - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - echo "${APPLICATION_SECRET_PROPERTIES}" > ./$MODULE/src/main/resources/application-secret.properties - if [ "$MODULE" = "layer-batch" ]; then - cp -R ./layer-api/src/main/resources/tokens ./$MODULE/src/main/resources/tokens - fi - done - - - name: Build Changed Modules - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - ./gradlew :$MODULE:build - done - - - name: Run Tests for Changed Modules - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - ./gradlew :$MODULE:test - done - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE - - - name: Push Docker Images for Changed Modules - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - IMAGE_TAG="${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }}" - docker build --build-arg SPRING_PROFILE=dev ./$MODULE -t $IMAGE_TAG - docker push $IMAGE_TAG - done - - deploy: - name: Deploy to K3s - needs: [ build, setup ] - runs-on: ubuntu-latest - if: ${{ needs.setup.outputs.changed_modules != '' }} - env: - DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }} - SHA_SHORT: ${{ needs.setup.outputs.sha_short }} - CHANGED_MODULES: ${{ needs.setup.outputs.changed_modules }} - - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Install kubectl - uses: azure/setup-kubectl@v1 - with: - version: 'v1.21.0' - - - name: Set up kubeconfig - run: | - mkdir -p $HOME/.kube - echo "${{ secrets.KUBE_CONFIG }}" > $HOME/.kube/config - chmod 600 $HOME/.kube/config - - - name: Delete existing deployments (if exists) - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - kubectl delete deployment $MODULE-deployment --ignore-not-found - done - - - name: Create K3s deployment files - run: | - TARGET=${{ env.DEPLOY_TARGET}} - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - if [ "$MODULE" = "layer-api" ]; then - PORT=8080 - elif [ "$MODULE" = "layer-batch" ]; then - PORT=8085 - else - PORT=8080 - fi - - cat < deployment-$MODULE.yaml - apiVersion: apps/v1 - kind: Deployment - metadata: - name: $MODULE-$TARGET - namespace: default - labels: - app: $MODULE-$TARGET - spec: - replicas: 1 - selector: - matchLabels: - app: $MODULE-$TARGET - template: - metadata: - labels: - app: $MODULE-$TARGET - spec: - containers: - - name: $MODULE-$TARGET - image: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }} - ports: - - containerPort: $PORT - env: - - name: TZ - value: "Asia/Seoul" - - name: SPRING_PROFILES_ACTIVE - value: "${{ env.DEPLOY_TARGET }}" - volumeMounts: - - name: secret-volume - mountPath: /config/application-secret.properties - subPath: application-secret.properties - - name: log-volume - mountPath: /log - - name: tokens-volume - mountPath: /config/tokens - volumes: - - name: secret-volume - secret: - secretName: app-secret-$TARGET - - name: log-volume - hostPath: - path: /${{ env.DEPLOY_TARGET }}/log/$MODULE - type: DirectoryOrCreate - - name: tokens-volume - hostPath: - path: /home/tokens - type: Directory - --- - apiVersion: v1 - kind: Service - metadata: - name: $MODULE-service-$TARGET - namespace: default - labels: - app: $MODULE-$TARGET - spec: - selector: - app: $MODULE-$TARGET - ports: - - protocol: TCP - port: 80 - targetPort: $PORT - EOF - done - - - - name: Deploy to K3s - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - kubectl apply -f deployment-$MODULE.yaml - done diff --git a/.github/workflows/k3s-prod.yaml b/.github/workflows/k3s-prod.yaml deleted file mode 100644 index 30cb74cb..00000000 --- a/.github/workflows/k3s-prod.yaml +++ /dev/null @@ -1,232 +0,0 @@ -name: Spring Boot Multi-module K3s Deployment - -on: - push: - branches: - - main-test # 실행되지 않도록 브랜치 명 변경 - -env: - REGISTRY: "ghcr.io" - NAMESPACE: "depromeet" - IMAGE_NAME: "kasukabe-server" - -jobs: - setup: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - outputs: - deploy_target: ${{ steps.set-env.outputs.DEPLOY_TARGET }} - sha_short: ${{ steps.sha_short.outputs.sha_short }} - changed_modules: ${{ steps.detect-changes.outputs.changed_modules }} - steps: - - name: Checkout code - uses: actions/checkout@v1 - - - name: Setup Env - id: set-env - run: | - if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then - echo "DEPLOY_TARGET=production" >> $GITHUB_OUTPUT - else - echo "DEPLOY_TARGET=development" >> $GITHUB_OUTPUT - fi - - - name: Get short SHA - id: sha_short - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: Detect Changed Modules - id: detect-changes - run: | - CHANGED_MODULES="" - - - CHANGED_MODULES="layer-batch,layer-api" - - echo "changed_modules=$CHANGED_MODULES" - echo "changed_modules=$CHANGED_MODULES" >> $GITHUB_OUTPUT - - build: - name: build - needs: [ setup ] - runs-on: ubuntu-latest - if: ${{ needs.setup.outputs.changed_modules != '' }} - permissions: - contents: read - packages: write - - env: - DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }} - APPLICATION_SECRET_PROPERTIES: ${{ secrets.APPLICATION_SECRET_PROPERTIES }} - GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} - SHA_SHORT: ${{ needs.setup.outputs.sha_short }} - CHANGED_MODULES: ${{ needs.setup.outputs.changed_modules }} - - steps: - - name: Setup Java - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'corretto' - - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Gradle Caching - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Setup Gradle - uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0 - - - name: Create application-secret.properties - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - echo "${APPLICATION_SECRET_PROPERTIES}" > ./$MODULE/src/main/resources/application-secret.properties - if [[ "${MODULE}" != "layer-api" ]]; then - cp -R ./layer-api/src/main/resources/tokens ./$MODULE/src/main/resources/tokens - fi - done - - name: Build Changed Modules - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - ./gradlew :$MODULE:build - done - - - name: Run Tests for Changed Modules - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - ./gradlew :$MODULE:test - done - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE - - - name: Push Docker Images for Changed Modules - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - IMAGE_TAG="${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }}" - docker build --build-arg SPRING_PROFILE=prod ./$MODULE -t $IMAGE_TAG - docker push $IMAGE_TAG - done - - deploy: - name: Deploy to K3s - needs: [ build, setup ] - runs-on: ubuntu-latest - if: ${{ needs.setup.outputs.changed_modules != '' }} - env: - DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }} - SHA_SHORT: ${{ needs.setup.outputs.sha_short }} - CHANGED_MODULES: ${{ needs.setup.outputs.changed_modules }} - - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - - name: Install kubectl - uses: azure/setup-kubectl@v1 - with: - version: 'v1.21.0' - - - name: Set up kubeconfig - run: | - mkdir -p $HOME/.kube - echo "${{ secrets.KUBE_CONFIG }}" > $HOME/.kube/config - chmod 600 $HOME/.kube/config - - - name: Create K3s deployment files - run: | - TARGET=${{ env.DEPLOY_TARGET}} - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - cat < deployment-$MODULE.yaml - apiVersion: apps/v1 - kind: Deployment - metadata: - name: $MODULE-$TARGET - namespace: default - labels: - app: $MODULE-$TARGET - spec: - replicas: 1 - selector: - matchLabels: - app: $MODULE-$TARGET - template: - metadata: - labels: - app: $MODULE-$TARGET - spec: - containers: - - name: $MODULE-$TARGET - image: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }} - ports: - - containerPort: 8080 - env: - - name: TZ - value: "Asia/Seoul" - - name: SPRING_PROFILES_ACTIVE - value: "${{ env.DEPLOY_TARGET }}" - volumeMounts: - - name: secret-volume - mountPath: /config/application-secret.properties - subPath: application-secret.properties - - name: log-volume - mountPath: /log - - name: tokens-volume - mountPath: /config/tokens - volumes: - - name: secret-volume - secret: - secretName: app-secret-$TARGET - - name: log-volume - hostPath: - path: /${{ env.DEPLOY_TARGET }}/log/$MODULE - type: DirectoryOrCreate - - name: tokens-volume - hostPath: - path: /home/tokens - type: Directory - --- - apiVersion: v1 - kind: Service - metadata: - name: $MODULE-service-$TARGET - namespace: default - labels: - app: $MODULE-$TARGET - spec: - selector: - app: $MODULE-$TARGET - ports: - - protocol: TCP - port: 80 - targetPort: 8080 - EOF - done - - - - - name: Deploy to K3s - run: | - for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do - kubectl apply -f deployment-$MODULE.yaml - done diff --git a/config/tokens/StoredCredential.txt b/config/tokens/StoredCredential.txt deleted file mode 100644 index 63b1c6c17b9026d421421e9725d098cde63b28b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1130 zcma)5L66%+6rN;vp>!*>Z~zGjq^dn|sGZo`>=N}*yh)vSv7Jqvgv}xW6MO88V|$YE zOq>M7v8vQVi&XvqCqRq1!U-WR9Jp}hKr4ZSs)`dA)KkaVN?R_~jx_J`-uJ%uzWL_( zAFz>9@Ja}0Q05FraucQ_3r;p({Qak&U;FsCHBi*S`G`PIhb|-3057o-Md^q{-h6WX zU67v(**Oun#4Rwe&QnA=1;r2cj{klAzZcGR9~1$YPXJhZe0)Nux+InZLV^g%aDrtw z!YE-fk)Cs3|u_Pv z>kAb5xdJQtDfkQ&<`V|~SU|NZ!?NaDJBpe)i!>ct4ZXv7Fx20Vc-Qu~r@D?QuTFc? z_O9L1=uy9}br!XyPI^map+vFTt#wB?+P#6*$e5<}m!ThHR38t!3ki=?hZ}<~VG6F= z^_^B6WKPEolPq+$tyz6GHJW&24LVev#P&hiqmtq_ss?4?{1wlIVx zw1#%ou`^vVs|KwdE%u%CqoAY1UNQ}(YCl}KjrQ13! BLUE ###" echo "1. get blue image" @@ -62,5 +62,5 @@ else sudo nginx -s reload echo "5. green container down" - sudo sudo docker-compose -f docker-compose-green.yaml down + sudo docker-compose -f docker-compose-green.yaml rm -s -f layer-api-green batch-job-green admin-app-green fi \ No newline at end of file diff --git a/layer-api/k8s/development/deployment.yaml b/layer-api/k8s/development/deployment.yaml deleted file mode 100644 index d11a269b..00000000 --- a/layer-api/k8s/development/deployment.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: "layer-api" - labels: - app: "layer-api" -spec: - replicas: 1 - selector: - matchLabels: - app: "layer-api" - template: - metadata: - name: "layer-api" - labels: - app: "layer-api" - spec: - containers: - - name: "layer-api" - image: ghcr.io/depromeet/kasukabe-server/api - resources: - limits: - cpu: "256m" - memory: "256Mi" - volumeMounts: - - name: application-properties - mountPath: /config - readOnly: true - volumes: - - name: application-properties - configMap: - name: layer-configmap-api - items: - - key: "application.yaml" - path: "application.yaml" - imagePullSecrets: - - name: registry-secret - restartPolicy: Always diff --git a/tokens/StoredCredential b/tokens/StoredCredential deleted file mode 100644 index 63b1c6c17b9026d421421e9725d098cde63b28b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1130 zcma)5L66%+6rN;vp>!*>Z~zGjq^dn|sGZo`>=N}*yh)vSv7Jqvgv}xW6MO88V|$YE zOq>M7v8vQVi&XvqCqRq1!U-WR9Jp}hKr4ZSs)`dA)KkaVN?R_~jx_J`-uJ%uzWL_( zAFz>9@Ja}0Q05FraucQ_3r;p({Qak&U;FsCHBi*S`G`PIhb|-3057o-Md^q{-h6WX zU67v(**Oun#4Rwe&QnA=1;r2cj{klAzZcGR9~1$YPXJhZe0)Nux+InZLV^g%aDrtw z!YE-fk)Cs3|u_Pv z>kAb5xdJQtDfkQ&<`V|~SU|NZ!?NaDJBpe)i!>ct4ZXv7Fx20Vc-Qu~r@D?QuTFc? z_O9L1=uy9}br!XyPI^map+vFTt#wB?+P#6*$e5<}m!ThHR38t!3ki=?hZ}<~VG6F= z^_^B6WKPEolPq+$tyz6GHJW&24LVev#P&hiqmtq_ss?4?{1wlIVx zw1#%ou`^vVs|KwdE%u%CqoAY1UNQ}(YCl}KjrQ13! Date: Sat, 4 Jan 2025 13:49:38 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=EC=96=B4=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=20=EC=88=98=EC=A0=95=20(#284)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/layer/domain/analyze/entity/AnalyzeDetail.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layer-domain/src/main/java/org/layer/domain/analyze/entity/AnalyzeDetail.java b/layer-domain/src/main/java/org/layer/domain/analyze/entity/AnalyzeDetail.java index 754b4d0a..67518ae5 100644 --- a/layer-domain/src/main/java/org/layer/domain/analyze/entity/AnalyzeDetail.java +++ b/layer-domain/src/main/java/org/layer/domain/analyze/entity/AnalyzeDetail.java @@ -2,6 +2,7 @@ import org.layer.domain.analyze.enums.AnalyzeDetailType; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -26,6 +27,7 @@ public class AnalyzeDetail { private int count; + @Column(name = "`rank`") private int rank; @Enumerated(EnumType.STRING)