From 08fede2dd01434e7e83fdfa7c74d68684e3153a4 Mon Sep 17 00:00:00 2001 From: eedo_y Date: Sun, 17 May 2026 16:35:04 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EC=83=88=EB=A1=9C=EC=9A=B4=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20=EA=B0=92=20=EB=B3=80=EA=B2=BD=20(#69)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s-argocd/applications/dev/app/admin.yaml | 2 +- k8s-argocd/applications/dev/app/backend.yaml | 2 +- k8s-argocd/applications/dev/app/frontend.yaml | 2 +- k8s-helm/platform-chart/values-dev.yaml | 4 ++-- k8s-helm/releases/monitoring-loki/values-dev-gitops.yaml | 8 ++++---- k8s-helm/releases/monitoring-tempo/values-dev-gitops.yaml | 2 +- k8s-kustomize/overlays/dev/admin/kustomization.yaml | 2 +- k8s-kustomize/overlays/dev/backend/kustomization.yaml | 2 +- k8s-kustomize/overlays/dev/frontend/kustomization.yaml | 2 +- k8s-kustomize/overlays/dev/kustomization.yaml | 1 + k8s-kustomize/overlays/prod/kustomization.yaml | 1 + terraform/environments/dev/backend.tf | 2 +- terraform/environments/dev/storage.tf | 6 +++--- terraform/environments/dev/variables.tf | 2 +- 14 files changed, 20 insertions(+), 18 deletions(-) diff --git a/k8s-argocd/applications/dev/app/admin.yaml b/k8s-argocd/applications/dev/app/admin.yaml index 8da8d79..791ec67 100644 --- a/k8s-argocd/applications/dev/app/admin.yaml +++ b/k8s-argocd/applications/dev/app/admin.yaml @@ -15,7 +15,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io annotations: - argocd-image-updater.argoproj.io/image-list: frontend=asia-northeast3-docker.pkg.dev/dev-pinhouse/pinhouse-dev-admin/pinhouse-admin + argocd-image-updater.argoproj.io/image-list: frontend=asia-northeast3-docker.pkg.dev/dev-pinhouse-2/pinhouse-dev-admin/pinhouse-admin argocd-image-updater.argoproj.io/frontend.update-strategy: newest-build argocd-image-updater.argoproj.io/frontend.allow-tags: regexp:^[0-9]{8}_[0-9]{6}-[a-f0-9]{7}$ argocd-image-updater.argoproj.io/frontend.kustomize.image-name: REPLACE_ME diff --git a/k8s-argocd/applications/dev/app/backend.yaml b/k8s-argocd/applications/dev/app/backend.yaml index b7b4d77..b00a548 100644 --- a/k8s-argocd/applications/dev/app/backend.yaml +++ b/k8s-argocd/applications/dev/app/backend.yaml @@ -15,7 +15,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io annotations: - argocd-image-updater.argoproj.io/image-list: backend=asia-northeast3-docker.pkg.dev/dev-pinhouse/pinhouse-dev-be/pinhouse-server + argocd-image-updater.argoproj.io/image-list: backend=asia-northeast3-docker.pkg.dev/dev-pinhouse-2/pinhouse-dev-be/pinhouse-server argocd-image-updater.argoproj.io/backend.update-strategy: newest-build argocd-image-updater.argoproj.io/backend.allow-tags: regexp:^[0-9]{8}_[0-9]{6}-[a-f0-9]{7}$ argocd-image-updater.argoproj.io/backend.kustomize.image-name: REPLACE_ME diff --git a/k8s-argocd/applications/dev/app/frontend.yaml b/k8s-argocd/applications/dev/app/frontend.yaml index 91d2958..ca6053c 100644 --- a/k8s-argocd/applications/dev/app/frontend.yaml +++ b/k8s-argocd/applications/dev/app/frontend.yaml @@ -15,7 +15,7 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io annotations: - argocd-image-updater.argoproj.io/image-list: frontend=asia-northeast3-docker.pkg.dev/dev-pinhouse/pinhouse-dev-fe/pinhouse-web + argocd-image-updater.argoproj.io/image-list: frontend=asia-northeast3-docker.pkg.dev/dev-pinhouse-2/pinhouse-dev-fe/pinhouse-web argocd-image-updater.argoproj.io/frontend.update-strategy: newest-build argocd-image-updater.argoproj.io/frontend.allow-tags: regexp:^[0-9]{8}_[0-9]{6}-[a-f0-9]{7}$ argocd-image-updater.argoproj.io/frontend.kustomize.image-name: REPLACE_ME diff --git a/k8s-helm/platform-chart/values-dev.yaml b/k8s-helm/platform-chart/values-dev.yaml index b823225..9364be1 100644 --- a/k8s-helm/platform-chart/values-dev.yaml +++ b/k8s-helm/platform-chart/values-dev.yaml @@ -16,7 +16,7 @@ certManager: # DNS-01 Challenge (CloudDNS) cloudDNS: - projectId: "dev-pinhouse" + projectId: "dev-pinhouse-2" # 게이트웨이 gateway: @@ -185,7 +185,7 @@ externalSecrets: spec: provider: gcpsm: - projectID: dev-pinhouse + projectID: dev-pinhouse-2 secrets: - name: backend-secret-kv diff --git a/k8s-helm/releases/monitoring-loki/values-dev-gitops.yaml b/k8s-helm/releases/monitoring-loki/values-dev-gitops.yaml index b0095f6..cab8a19 100644 --- a/k8s-helm/releases/monitoring-loki/values-dev-gitops.yaml +++ b/k8s-helm/releases/monitoring-loki/values-dev-gitops.yaml @@ -17,11 +17,11 @@ loki: # Loki 로그 청크와 인덱스는 GCS 버킷에 저장합니다. storage: bucketNames: - chunks: "pinhouse-dev-loki" - ruler: "pinhouse-dev-loki" - admin: "pinhouse-dev-loki" + chunks: "pinhouse-dev-loki-terraform" + ruler: "pinhouse-dev-loki-terraform" + admin: "pinhouse-dev-loki-terraform" gcs: - bucket_name: "pinhouse-dev-loki" + bucket_name: "pinhouse-dev-loki-terraform" singleBinary: replicas: 1 diff --git a/k8s-helm/releases/monitoring-tempo/values-dev-gitops.yaml b/k8s-helm/releases/monitoring-tempo/values-dev-gitops.yaml index 3490330..a525aaa 100644 --- a/k8s-helm/releases/monitoring-tempo/values-dev-gitops.yaml +++ b/k8s-helm/releases/monitoring-tempo/values-dev-gitops.yaml @@ -13,7 +13,7 @@ tempo: # 트레이스 원본 데이터는 GCS 버킷에 저장합니다. trace: gcs: - bucket_name: "pinhouse-dev-tempo" + bucket_name: "pinhouse-dev-tempo-terraform" block: retention: 336h diff --git a/k8s-kustomize/overlays/dev/admin/kustomization.yaml b/k8s-kustomize/overlays/dev/admin/kustomization.yaml index e3cb0ff..0474d41 100644 --- a/k8s-kustomize/overlays/dev/admin/kustomization.yaml +++ b/k8s-kustomize/overlays/dev/admin/kustomization.yaml @@ -14,7 +14,7 @@ nameSuffix: -dev # ArgoCD Image Updater가 자동으로 newTag를 업데이트 images: - name: REPLACE_ME - newName: asia-northeast3-docker.pkg.dev/dev-pinhouse/pinhouse-dev-admin/pinhouse-admin + newName: asia-northeast3-docker.pkg.dev/dev-pinhouse-2/pinhouse-dev-admin/pinhouse-admin newTag: latest # overlays 수정내용 반영 diff --git a/k8s-kustomize/overlays/dev/backend/kustomization.yaml b/k8s-kustomize/overlays/dev/backend/kustomization.yaml index 40d08bf..88dc86d 100644 --- a/k8s-kustomize/overlays/dev/backend/kustomization.yaml +++ b/k8s-kustomize/overlays/dev/backend/kustomization.yaml @@ -14,7 +14,7 @@ nameSuffix: -dev # ArgoCD Image Updater가 자동으로 newTag를 업데이트 images: - name: REPLACE_ME - newName: asia-northeast3-docker.pkg.dev/dev-pinhouse/pinhouse-dev-be/pinhouse-server + newName: asia-northeast3-docker.pkg.dev/dev-pinhouse-2/pinhouse-dev-be/pinhouse-server newTag: latest # overlays 수정내용 반영 diff --git a/k8s-kustomize/overlays/dev/frontend/kustomization.yaml b/k8s-kustomize/overlays/dev/frontend/kustomization.yaml index e852a30..b66d1f0 100644 --- a/k8s-kustomize/overlays/dev/frontend/kustomization.yaml +++ b/k8s-kustomize/overlays/dev/frontend/kustomization.yaml @@ -14,7 +14,7 @@ nameSuffix: -dev # ArgoCD Image Updater가 자동으로 newTag를 업데이트 images: - name: REPLACE_ME - newName: asia-northeast3-docker.pkg.dev/dev-pinhouse/pinhouse-dev-fe/pinhouse-web + newName: asia-northeast3-docker.pkg.dev/dev-pinhouse-2/pinhouse-dev-fe/pinhouse-web newTag: latest # overlays 수정내용 반영 diff --git a/k8s-kustomize/overlays/dev/kustomization.yaml b/k8s-kustomize/overlays/dev/kustomization.yaml index 6b53bca..150f99b 100644 --- a/k8s-kustomize/overlays/dev/kustomization.yaml +++ b/k8s-kustomize/overlays/dev/kustomization.yaml @@ -5,3 +5,4 @@ kind: Kustomization resources: - frontend - backend + - admin diff --git a/k8s-kustomize/overlays/prod/kustomization.yaml b/k8s-kustomize/overlays/prod/kustomization.yaml index 6b53bca..150f99b 100644 --- a/k8s-kustomize/overlays/prod/kustomization.yaml +++ b/k8s-kustomize/overlays/prod/kustomization.yaml @@ -5,3 +5,4 @@ kind: Kustomization resources: - frontend - backend + - admin diff --git a/terraform/environments/dev/backend.tf b/terraform/environments/dev/backend.tf index 9a9d37b..6b02fe3 100644 --- a/terraform/environments/dev/backend.tf +++ b/terraform/environments/dev/backend.tf @@ -3,7 +3,7 @@ # ======================================== terraform { backend "gcs" { - bucket = "pinhouse-dev-state-bucket" + bucket = "pinhouse-dev-terraform-state-bucket" prefix = "terraform/dev/state" } } diff --git a/terraform/environments/dev/storage.tf b/terraform/environments/dev/storage.tf index 56890ad..11be036 100644 --- a/terraform/environments/dev/storage.tf +++ b/terraform/environments/dev/storage.tf @@ -18,7 +18,7 @@ module "storage" { # 기본 버킷 추가 var.create_storage_buckets ? tomap({ static_assets = { - name = "${var.project}-${var.environment}" + name = "${var.project}-${var.environment}-terraform" storage_class = "STANDARD" uniform_bucket_level_access = true versioning_enabled = true @@ -53,7 +53,7 @@ module "storage" { # 모니터링 버킷 추가 var.create_monitoring_buckets ? tomap({ loki = { - name = "${var.project}-${var.environment}-${var.monitoring_loki}" + name = "${var.project}-${var.environment}-${var.monitoring_loki}-terraform" storage_class = "STANDARD" uniform_bucket_level_access = true versioning_enabled = true @@ -62,7 +62,7 @@ module "storage" { cors = [] } tempo = { - name = "${var.project}-${var.environment}-${var.monitoring_tempo}" + name = "${var.project}-${var.environment}-${var.monitoring_tempo}-terraform" storage_class = "STANDARD" uniform_bucket_level_access = true versioning_enabled = true diff --git a/terraform/environments/dev/variables.tf b/terraform/environments/dev/variables.tf index e44f027..656627a 100644 --- a/terraform/environments/dev/variables.tf +++ b/terraform/environments/dev/variables.tf @@ -4,7 +4,7 @@ variable "project_id" { description = "배포 대상 GCP 프로젝트 ID입니다." type = string - default = "dev-pinhouse" + default = "dev-pinhouse-2" } variable "project" {