diff --git a/k8s-argocd/applications/dev/app/backend.yaml b/k8s-argocd/applications/dev/app/backend.yaml index 08c1965..b7b4d77 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: 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/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 @@ -39,7 +39,7 @@ spec: # 배포 대상 클러스터와 네임스페이스입니다. destination: server: https://kubernetes.default.svc - namespace: dev-app + namespace: app # Git 기준으로 자동 동기화합니다. syncPolicy: diff --git a/k8s-argocd/applications/dev/app/frontend.yaml b/k8s-argocd/applications/dev/app/frontend.yaml index ae58cd7..91d2958 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: 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/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 @@ -38,7 +38,7 @@ spec: # 배포 대상 클러스터와 네임스페이스입니다. destination: server: https://kubernetes.default.svc - namespace: dev-app + namespace: app # Git 기준으로 자동 동기화합니다. syncPolicy: diff --git a/k8s-argocd/applications/prod/app/backend.yaml b/k8s-argocd/applications/prod/app/backend.yaml index 48fe521..67938a6 100644 --- a/k8s-argocd/applications/prod/app/backend.yaml +++ b/k8s-argocd/applications/prod/app/backend.yaml @@ -21,7 +21,7 @@ metadata: # 어노테이션 메타데이터 annotations: # ArgoCD Image Updater 설정 - argocd-image-updater.argoproj.io/image-list: asia-northeast3-docker.pkg.dev/prod-pinhouse/pinhouse-prod-be/pinhouse-server + argocd-image-updater.argoproj.io/image-list: backend=asia-northeast3-docker.pkg.dev/prod-pinhouse/pinhouse-prod-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/prod/app/frontend.yaml b/k8s-argocd/applications/prod/app/frontend.yaml index e4ba13d..67a637e 100644 --- a/k8s-argocd/applications/prod/app/frontend.yaml +++ b/k8s-argocd/applications/prod/app/frontend.yaml @@ -22,7 +22,7 @@ metadata: # 어노테이션 메타데이터 annotations: # ArgoCD Image Updater 설정 - argocd-image-updater.argoproj.io/image-list: asia-northeast3-docker.pkg.dev/prod-pinhouse/pinhouse-prod-fe/pinhouse-web + argocd-image-updater.argoproj.io/image-list: frontend=asia-northeast3-docker.pkg.dev/prod-pinhouse/pinhouse-prod-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/templates/network-policy/network-policies.yaml b/k8s-helm/platform-chart/templates/network-policy/network-policies.yaml index e4c7815..dc15c94 100644 --- a/k8s-helm/platform-chart/templates/network-policy/network-policies.yaml +++ b/k8s-helm/platform-chart/templates/network-policy/network-policies.yaml @@ -1,7 +1,7 @@ {{- if .Values.networkPolicy.enabled }} --- # Devths NetworkPolicy -# 네임스페이스: dev-app, stg-app, app +# 네임스페이스: app, stg-app, app # Pod 레이블 기준: app: frontend / app: backend / app: ai # # 트래픽 흐름: diff --git a/k8s-helm/platform-chart/values-dev.yaml b/k8s-helm/platform-chart/values-dev.yaml index 1d387df..9050abf 100644 --- a/k8s-helm/platform-chart/values-dev.yaml +++ b/k8s-helm/platform-chart/values-dev.yaml @@ -161,7 +161,7 @@ externalSecrets: secrets: - name: backend-secret-kv - namespace: dev-app + namespace: app spec: refreshInterval: 1h secretStoreRef: diff --git a/k8s-helm/releases/argocd/values-nonprod.yaml.example b/k8s-helm/releases/argocd/values-nonprod.yaml.example deleted file mode 100644 index d144534..0000000 --- a/k8s-helm/releases/argocd/values-nonprod.yaml.example +++ /dev/null @@ -1,19 +0,0 @@ -# Copy to values-nonprod.yaml and add argo/argo-cd overrides here. -# Example: -global: - domain: domain - -configs: - cm: - # Git/Helm 변경 감지 주기. - timeout.reconciliation: "60s" - timeout.reconciliation.jitter: "15s" - - # TLS Termination을 Gateway에서 수행하므로 ArgoCD Server는 insecure 모드로 실행 - params: - server.insecure: "true" - -# ArgoCD Server에 --insecure 플래그 추가 -server: - extraArgs: - - --insecure diff --git a/k8s-helm/releases/calico/values-nonprod.yaml b/k8s-helm/releases/calico/values-nonprod.yaml deleted file mode 100644 index f3e2e1f..0000000 --- a/k8s-helm/releases/calico/values-nonprod.yaml +++ /dev/null @@ -1,8 +0,0 @@ -installation: - calicoNetwork: - bgp: Disabled - ipPools: - - cidr: 192.168.0.0/16 - encapsulation: VXLAN - natOutgoing: Enabled - nodeSelector: all() diff --git a/k8s-helm/releases/cert-manager/values-nonprod.yaml b/k8s-helm/releases/cert-manager/values-nonprod.yaml deleted file mode 100644 index d9d6f2b..0000000 --- a/k8s-helm/releases/cert-manager/values-nonprod.yaml +++ /dev/null @@ -1,4 +0,0 @@ -config: - enableGatewayAPI: true -crds: - enabled: true \ No newline at end of file diff --git a/k8s-helm/releases/external-secret/values-nonprod.yaml b/k8s-helm/releases/external-secret/values-nonprod.yaml deleted file mode 100644 index 5393cb9..0000000 --- a/k8s-helm/releases/external-secret/values-nonprod.yaml +++ /dev/null @@ -1,11 +0,0 @@ -installCRDs: true - -replicaCount: 2 - -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 200m - memory: 256Mi diff --git a/k8s-helm/releases/metrics-server/values-nonprod.yaml b/k8s-helm/releases/metrics-server/values-nonprod.yaml deleted file mode 100644 index cf9876b..0000000 --- a/k8s-helm/releases/metrics-server/values-nonprod.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# ======================================== -# Metrics Server 비운영 값 -# ======================================== -replicas: 1 - -# kubeadm 기반 노드에서 kubelet 메트릭을 안정적으로 수집하기 위한 기본 인자입니다. -defaultArgs: - - --cert-dir=/tmp - - --secure-port=10250 - - --kubelet-preferred-address-types=InternalIP,Hostname,InternalDNS,ExternalDNS,ExternalIP - - --kubelet-use-node-status-port - - --kubelet-insecure-tls - - --metric-resolution=15s - -# 기본 클러스터 규모에 맞춘 리소스 요청값입니다. -resources: - requests: - cpu: 100m - memory: 200Mi - limits: - cpu: 200m - memory: 300Mi diff --git a/k8s-helm/releases/nginx-gateway-fabric/values-nonprod.yaml b/k8s-helm/releases/nginx-gateway-fabric/values-nonprod.yaml deleted file mode 100644 index 3692f1e..0000000 --- a/k8s-helm/releases/nginx-gateway-fabric/values-nonprod.yaml +++ /dev/null @@ -1,16 +0,0 @@ -fullnameOverride: ngf-nginx-gateway-fabric - -# GatewayClass 설정 -nginxGateway: - gatewayClassName: nginx - gatewayControllerName: gateway.nginx.org/nginx-gateway-controller - -# Service 설정 -nginx: - service: - type: NodePort - nodePorts: - - port: 30080 - listenerPort: 80 - - port: 30443 - listenerPort: 443 diff --git a/k8s-kustomize/overlays/dev/backend/kustomization.yaml b/k8s-kustomize/overlays/dev/backend/kustomization.yaml index b31c68e..40d08bf 100644 --- a/k8s-kustomize/overlays/dev/backend/kustomization.yaml +++ b/k8s-kustomize/overlays/dev/backend/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # 네임 스페이스 -namespace: dev-app +namespace: app resources: - ../../../base/backend diff --git a/k8s-kustomize/overlays/dev/frontend/kustomization.yaml b/k8s-kustomize/overlays/dev/frontend/kustomization.yaml index 62d6eb8..e852a30 100644 --- a/k8s-kustomize/overlays/dev/frontend/kustomization.yaml +++ b/k8s-kustomize/overlays/dev/frontend/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # 네임 스페이스 -namespace: dev-app +namespace: app resources: - ../../../base/frontend diff --git a/k8s-kustomize/platform/argocd/overlays/nonprod/httproute.yaml b/k8s-kustomize/platform/argocd/overlays/nonprod/httproute.yaml deleted file mode 100644 index e68fe3f..0000000 --- a/k8s-kustomize/platform/argocd/overlays/nonprod/httproute.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute - -# 기본 설정 -metadata: - name: argocd - namespace: argocd - -# 스펙 -spec: - parentRefs: - - name: pinhouse-gateway - namespace: nginx-gateway - - # 도메인 명 - hostnames: - - "nonprod.argo.pinhouse.co.kr" - - # 참조 규칙 - rules: - - matches: - - path: - type: PathPrefix - value: / - backendRefs: - - name: argocd-server - port: 80 diff --git a/k8s-kustomize/platform/argocd/overlays/nonprod/kustomization.yaml b/k8s-kustomize/platform/argocd/overlays/nonprod/kustomization.yaml deleted file mode 100644 index 5b89931..0000000 --- a/k8s-kustomize/platform/argocd/overlays/nonprod/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - httproute.yaml - -patches: - - path: notifications-cm-context-patch.yaml diff --git a/k8s-kustomize/platform/argocd/overlays/nonprod/notifications-cm-context-patch.yaml b/k8s-kustomize/platform/argocd/overlays/nonprod/notifications-cm-context-patch.yaml deleted file mode 100644 index 5019792..0000000 --- a/k8s-kustomize/platform/argocd/overlays/nonprod/notifications-cm-context-patch.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-notifications-cm - namespace: argocd - -data: - context.argocdUrl: "https://nonprod.argo.pinhouse.co.kr"