Refactor/344 k3d shell (#346)

run_k3d.sh 수행 시 Argo 실행에서 k8s 실행 속도 지연이 발생하여 infra 설정이 자주 변경되는 kafka와
spring boot 어플리케이션과 자주 변경되지 않는 Argo, DB, Redis를 분리해서 동작할 수 있도록 변경이
필요합니다.

### 변경사항
- run_k3d.sh 를 run_k3d_app.sh 와 run_k3d_infra.sh로 분리
- run_k3d_app.sh에 현재 빌드 진행 사항 확인할 수 있는 로직 추가

Author: Yoonchulchung

infra/k8s/apps/kustomization.yaml

@@ -0,0 +1,43 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  # Spot Apps
+  - spot-ingress.yaml
+  - spot-gateway.yaml
+  - spot-user.yaml
+  - spot-store.yaml
+  - spot-order.yaml
+  - spot-payment.yaml
+
+  # Spot ServiceMonitors
+  - ../base/monitoring/servicemonitors/spot-gateway-servicemonitor.yaml
+  - ../base/monitoring/servicemonitors/spot-user-servicemonitor.yaml
+  - ../base/monitoring/servicemonitors/spot-order-servicemonitor.yaml
+  - ../base/monitoring/servicemonitors/spot-store-servicemonitor.yaml
+  - ../base/monitoring/servicemonitors/spot-payment-servicemonitor.yaml
+
+configMapGenerator:
+  - name: spot-app-config
+    namespace: spot
+    files:
+      - ../../../config/common.yml
+      - ../../../config/kafka-topics.yml
+      - ../../../config/spot-gateway.yml
+      - ../../../config/spot-user.yml
+      - ../../../config/spot-store.yml
+      - ../../../config/spot-order.yml
+      - ../../../config/spot-payment.yml
+    options:
+      disableNameSuffixHash: true
+
+secretGenerator:
+  - name: spot-secrets
+    namespace: spot
+    envs:
+      - ../../../.env
+    options:
+      disableNameSuffixHash: true
+
+generatorOptions:
+  disableNameSuffixHash: true

infra/k8s/base/kustomization.yaml

@@ -0,0 +1,32 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  # Base
+  - ./namespace.yaml
+  - ./configmap.yaml
+
+  # Kafka
+  - ./kafka/kafka.yaml
+  - ./kafka/kafka-nodepool.yml
+  - ./kafka/kafka-connect.yaml
+  - ./kafka/connectors.yaml
+  - ./kafka/kafka-ui.yaml
+  - ./kafka/allow-kafka-ui-netpol.yaml
+
+  # Temporal
+  - ./temporal/temporal.yaml
+  - ./temporal/temporal-ui.yaml
+
+configMapGenerator:
+  - name: kafka-connect-init-config
+    namespace: spot
+    files:
+      - ../../../connectors/order-outbox.json
+      - ../../../connectors/payment-outbox.json
+      - ../../../connectors/register-connectors.sh
+    options:
+      disableNameSuffixHash: true
+
+generatorOptions:
+  disableNameSuffixHash: true

infra/k8s/kustomization.yaml

@@ -1,110 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-# namespace: spot 제거 - 각 리소스가 자체 네임스페이스 유지
+# 전체 배포 시 사용 (infra + apps + monitoring 포함)
+# 개별 배포는 각 서브 디렉토리 kustomization 사용:
+#   - infra/k8s/infra/      (Kafka, Temporal)
+#   - infra/k8s/apps/       (Spot Apps, ServiceMonitors)
+#   - infra/k8s/monitoring/ (Grafana Dashboard ConfigMaps)
 
 resources:
-  # Base
-  - base/namespace.yaml
-  - base/configmap.yaml
-#  - base/postgres.yaml
-#  - base/redis.yaml
-
-  # Kafka
-  - base/kafka/kafka.yaml
-  - base/kafka/kafka-nodepool.yml
-  - base/kafka/kafka-connect.yaml
-  - base/kafka/connectors.yaml
-  - base/kafka/kafka-ui.yaml
-  - base/kafka/allow-kafka-ui-netpol.yaml
-
-  # temporal
-  - base/temporal/temporal.yaml
-  - base/temporal/temporal-ui.yaml
-
-  # Monitoring & Logging
-  - base/monitoring/loki/loki.yaml
-  - base/monitoring/loki/loki-config.yaml
-  - base/monitoring/monitoring-ingress.yaml
-  - base/monitoring/fluent-bit/fluent-bit.yaml
-  - base/monitoring/fluent-bit/fluent-bit-config.yaml
-
-  # Grafana
-  - base/monitoring/grafana/grafana.yaml
-  - base/monitoring/grafana/grafana-config.yaml
-
-  # Spot Monitoring
-  - base/monitoring/servicemonitors/spot-gateway-servicemonitor.yaml
-  - base/monitoring/servicemonitors/spot-user-servicemonitor.yaml
-  - base/monitoring/servicemonitors/spot-order-servicemonitor.yaml
-  - base/monitoring/servicemonitors/spot-store-servicemonitor.yaml
-  - base/monitoring/servicemonitors/spot-payment-servicemonitor.yaml
-
-  # Spot Apps
-  - apps/spot-ingress.yaml
-  - apps/spot-gateway.yaml
-  - apps/spot-user.yaml
-  - apps/spot-store.yaml
-  - apps/spot-order.yaml
-  - apps/spot-payment.yaml
-
-# config 디렉토리의 yml 파일들을 ConfigMap으로 생성
-configMapGenerator:
-  - name: spot-app-config
-    namespace: spot
-    files:
-      - ../../config/common.yml
-      - ../../config/kafka-topics.yml
-      - ../../config/spot-gateway.yml
-      - ../../config/spot-user.yml
-      - ../../config/spot-store.yml
-      - ../../config/spot-order.yml
-      - ../../config/spot-payment.yml
-    options:
-      disableNameSuffixHash: true
-
-  - name: kafka-connect-init-config
-    namespace: spot
-    files:
-        - ../../connectors/order-outbox.json
-        - ../../connectors/payment-outbox.json
-        - ../../connectors/register-connectors.sh
-    options:
-      disableNameSuffixHash: true
-
-  - name: grafana-dashboards-spot
-    namespace: monitoring
-    files:
-      - base/monitoring/grafana/dashboards/spot-logs.json
-
-  - name: grafana-dashboards-9578
-    namespace: monitoring
-    files:
-      - base/monitoring/grafana/dashboards/9578.json
-
-  - name: grafana-dashboards-15760
-    namespace: monitoring
-    files:
-      - base/monitoring/grafana/dashboards/15760.json
-
-  - name: grafana-dashboards-15757
-    namespace: monitoring
-    files:
-      - base/monitoring/grafana/dashboards/15757.json
-
-  - name: grafana-dashboards-15661
-    namespace: monitoring
-    files:
-      - base/monitoring/grafana/dashboards/15661.json
-
-secretGenerator:
-  - name: spot-secrets
-    namespace: spot
-    envs:
-      - ../../.env
-    options:
-      disableNameSuffixHash: true
-
-
-generatorOptions:
-  disableNameSuffixHash: true
+  - base/
+  - apps/
+  - monitoring/

infra/k8s/monitoring/kustomization.yaml

@@ -0,0 +1,31 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+  - name: grafana-dashboards-spot
+    namespace: monitoring
+    files:
+      - ../base/monitoring/grafana/dashboards/spot-logs.json
+
+  - name: grafana-dashboards-9578
+    namespace: monitoring
+    files:
+      - ../base/monitoring/grafana/dashboards/9578.json
+
+  - name: grafana-dashboards-15760
+    namespace: monitoring
+    files:
+      - ../base/monitoring/grafana/dashboards/15760.json
+
+  - name: grafana-dashboards-15757
+    namespace: monitoring
+    files:
+      - ../base/monitoring/grafana/dashboards/15757.json
+
+  - name: grafana-dashboards-15661
+    namespace: monitoring
+    files:
+      - ../base/monitoring/grafana/dashboards/15661.json
+
+generatorOptions:
+  disableNameSuffixHash: true

run_k3d.sh

@@ -0,0 +1,2 @@
+./run_k3d_infra.sh
+./run_k3d_app.sh

run_k3d_app.sh

@@ -126,29 +126,27 @@ build_and_push_images() {
 install_strimzi() {
   log_info "Installing Strimzi Kafka Operator via Helm..."
 
-  kubectl create namespace strimzi --dry-run=client -o yaml | kubectl apply -f -
   kubectl create namespace spot --dry-run=client -o yaml | kubectl apply -f -
-  
+
   helm repo add strimzi https://strimzi.io/charts/ >/dev/null 2>&1 || true
   helm repo update
 
-  helm upgrade --install strimzi-operator strimzi/strimzi-kafka-operator \
-    -n strimzi \
-    --set watchNamespaces={spot} \
-    --wait
+  helm install strimzi-operator strimzi/strimzi-kafka-operator \
+    --namespace kafka \
+    --create-namespace \
+    --set crds.enabled=true
 
   log_info "Strimzi Operator installed successfully!"
 }
 
-deploy_all() {
-    log_info "Deploying all resources using Kustomize..."
+deploy_infra() {
+    log_info "Deploying infra resources (Kafka, Temporal)..."
 
     # Ingress Controller 설치
     kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.14.3/deploy/static/provider/cloud/deploy.yaml
     kubectl wait --for=condition=ready pod -n ingress-nginx --selector=app.kubernetes.io/component=controller --timeout=120s
 
-    # Kustomize 배포
-    kustomize build "$SCRIPT_DIR/infra/k8s/" --load-restrictor LoadRestrictionsNone | kubectl apply -f -
+    kustomize build "$SCRIPT_DIR/infra/k8s/base/" --load-restrictor LoadRestrictionsNone | kubectl apply -f -
 
     log_info "Waiting for Kafka Cluster (KRaft)..."
     kubectl wait --for=condition=Ready kafka/spot-cluster -n spot --timeout=300s
@@ -158,12 +156,20 @@ deploy_all() {
 
     log_info "Waiting for Kafka UI..."
     kubectl wait --for=condition=available deployment/kafka-ui -n spot --timeout=180s
-  
+
     log_info "Waiting for Temporal..."
     kubectl wait --for=condition=available deployment/temporal -n spot --timeout=180s
     kubectl wait --for=condition=available deployment/temporal-ui -n spot --timeout=180s
 
-    log_info "Infrastructure deployed successfully!"
+    log_info "Infra deployed successfully!"
+}
+
+deploy_apps() {
+    log_info "Deploying Spot app resources..."
+
+    kustomize build "$SCRIPT_DIR/infra/k8s/apps/" --load-restrictor LoadRestrictionsNone | kubectl apply -f -
+
+    log_info "Spot apps deployed successfully!"
 }
 
 
@@ -197,7 +203,8 @@ main() {
             exit 0
             ;;
         --deploy-only)
-            deploy_all
+            deploy_infra
+            deploy_apps
             exit 0
             ;;
     esac
@@ -207,8 +214,9 @@ main() {
     create_cluster
     build_and_push_images
     install_strimzi
-    deploy_all
+    deploy_infra
+    deploy_apps
     show_status
 }
 
-main "$@"
+main "$@"

run_k3d_infra.sh

@@ -127,6 +127,9 @@ deploy_monitoring() {
     log_info "Waiting for Fluent-bit to be ready..."
     kubectl rollout status daemonset/fluent-bit-daemon -n monitoring --timeout=180s
 
+    log_info "Applying Grafana dashboard ConfigMaps..."
+    kustomize build "$SCRIPT_DIR/infra/k8s/monitoring/" --load-restrictor LoadRestrictionsNone | kubectl apply -f -
+
     log_info "Monitoring stack deployed successfully!"
 }
 
@@ -207,4 +210,4 @@ main() {
     show_status
 }
 
-main "$@"
+main "$@"