diff --git a/code-server/kustomization.yaml b/code-server/kustomization.yaml index 7c84236..ddb951e 100644 --- a/code-server/kustomization.yaml +++ b/code-server/kustomization.yaml @@ -4,10 +4,7 @@ kind: Kustomization namespace: code-server resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/code-server.yaml - # Namespace with Goldilocks label - namespace.yaml - vault/code-server-password.yaml diff --git a/docusaurus/.gitignore b/docusaurus/asset/.gitignore similarity index 100% rename from docusaurus/.gitignore rename to docusaurus/asset/.gitignore diff --git a/docusaurus/docs/getting-started/architecture.md b/docusaurus/asset/docs/getting-started/architecture.md similarity index 100% rename from docusaurus/docs/getting-started/architecture.md rename to docusaurus/asset/docs/getting-started/architecture.md diff --git a/docusaurus/docs/getting-started/overview.md b/docusaurus/asset/docs/getting-started/overview.md similarity index 100% rename from docusaurus/docs/getting-started/overview.md rename to docusaurus/asset/docs/getting-started/overview.md diff --git a/docusaurus/docs/intro.md b/docusaurus/asset/docs/intro.md similarity index 100% rename from docusaurus/docs/intro.md rename to docusaurus/asset/docs/intro.md diff --git a/docusaurus/docs/services/argocd.md b/docusaurus/asset/docs/services/argocd.md similarity index 100% rename from docusaurus/docs/services/argocd.md rename to docusaurus/asset/docs/services/argocd.md diff --git a/docusaurus/docs/services/kubernetes.md b/docusaurus/asset/docs/services/kubernetes.md similarity index 100% rename from docusaurus/docs/services/kubernetes.md rename to docusaurus/asset/docs/services/kubernetes.md diff --git a/docusaurus/docs/services/monitoring.md b/docusaurus/asset/docs/services/monitoring.md similarity index 100% rename from docusaurus/docs/services/monitoring.md rename to docusaurus/asset/docs/services/monitoring.md diff --git a/docusaurus/docusaurus.config.js b/docusaurus/asset/docusaurus.config.js similarity index 100% rename from docusaurus/docusaurus.config.js rename to docusaurus/asset/docusaurus.config.js diff --git a/docusaurus/package.json b/docusaurus/asset/package.json similarity index 100% rename from docusaurus/package.json rename to docusaurus/asset/package.json diff --git a/docusaurus/sidebars.js b/docusaurus/asset/sidebars.js similarity index 100% rename from docusaurus/sidebars.js rename to docusaurus/asset/sidebars.js diff --git a/docusaurus/src/css/custom.css b/docusaurus/asset/src/css/custom.css similarity index 100% rename from docusaurus/src/css/custom.css rename to docusaurus/asset/src/css/custom.css diff --git a/docusaurus/deployment.yaml b/docusaurus/deployment.yaml index d87e742..6ea7179 100644 --- a/docusaurus/deployment.yaml +++ b/docusaurus/deployment.yaml @@ -26,7 +26,7 @@ spec: apk add --no-cache git echo "Cloning repository..." git clone https://gitea0213.kro.kr/bluemayne/applications.git /tmp/repo - cd /tmp/repo/docusaurus + cd /tmp/repo/docusaurus/asset echo "Installing dependencies..." npm install --legacy-peer-deps echo "Building Docusaurus site..." diff --git a/docusaurus/kustomization.yaml b/docusaurus/kustomization.yaml index 5a1cd59..d7cc8b7 100644 --- a/docusaurus/kustomization.yaml +++ b/docusaurus/kustomization.yaml @@ -2,12 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/docusaurus.yaml - # Namespace with Goldilocks label - namespace.yaml - - deployment.yaml - service.yaml - ingress.yaml diff --git a/gitea/kustomization.yaml b/gitea/kustomization.yaml index 6c9abdb..9762e0d 100644 --- a/gitea/kustomization.yaml +++ b/gitea/kustomization.yaml @@ -2,13 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # Namespace with Goldilocks label - namespace.yaml - # Gitea Runner - deployment.yaml - # Vault secrets - vault/gitea-admin-secret.yaml - vault/gitea-postgres-password.yaml - vault/gitea-runner-token.yaml diff --git a/homer/deployment.yaml b/homer/deployment.yaml index 7fd3a1d..dda6413 100644 --- a/homer/deployment.yaml +++ b/homer/deployment.yaml @@ -1,4 +1,3 @@ ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -60,61 +59,10 @@ spec: resources: requests: memory: "64Mi" - cpu: "5m" # Reduced from 50m based on actual usage (1m) + cpu: "5m" volumes: - name: config configMap: name: homer-config - name: www emptyDir: {} ---- -apiVersion: v1 -kind: Service -metadata: - name: homer - namespace: homer -spec: - type: ClusterIP - ports: - - name: http - port: 80 - targetPort: 8080 - selector: - app: homer ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: homer-ingress - namespace: homer - annotations: - nginx.ingress.kubernetes.io/ssl-redirect: "true" - cert-manager.io/cluster-issuer: "letsencrypt-prod" -spec: - ingressClassName: haproxy - tls: - - hosts: - - mayne.kro.kr - - www.mayne.kro.kr - secretName: homer-tls - rules: - - host: mayne.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: homer - port: - number: 80 - - host: www.mayne.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: homer - port: - number: 80 diff --git a/homer/homer.yaml b/homer/homer.yaml deleted file mode 100644 index 7fd3a1d..0000000 --- a/homer/homer.yaml +++ /dev/null @@ -1,120 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: homer - namespace: homer - labels: - app: homer -spec: - replicas: 1 - selector: - matchLabels: - app: homer - template: - metadata: - labels: - app: homer - spec: - initContainers: - - name: copy-homer-files - image: b4bz/homer:latest - command: ['sh', '-c'] - args: - - | - # Homer의 기본 파일들을 emptyDir로 복사 - cp -r /www/* /tmp/www/ - volumeMounts: - - name: www - mountPath: /tmp/www - - name: copy-assets - image: alpine/git:latest - command: ['sh', '-c'] - args: - - | - # Git에서 assets 복사 - git clone --depth 1 --branch main https://gitea0213.kro.kr/bluemayne/applications.git /tmp/repo - # assets 폴더 덮어쓰기 - rm -rf /www/assets - cp -r /tmp/repo/homer/assets /www/assets - # config.yml 복사 - cp /config/config.yml /www/assets/config.yml - # lighttpd 사용자(uid=1000)가 읽을 수 있도록 권한 변경 - chmod -R 755 /www/assets - chown -R 1000:65533 /www/assets - volumeMounts: - - name: config - mountPath: /config - - name: www - mountPath: /www - containers: - - name: homer - image: b4bz/homer:latest - imagePullPolicy: IfNotPresent - ports: - - containerPort: 8080 - name: http - volumeMounts: - - name: www - mountPath: "/www" - resources: - requests: - memory: "64Mi" - cpu: "5m" # Reduced from 50m based on actual usage (1m) - volumes: - - name: config - configMap: - name: homer-config - - name: www - emptyDir: {} ---- -apiVersion: v1 -kind: Service -metadata: - name: homer - namespace: homer -spec: - type: ClusterIP - ports: - - name: http - port: 80 - targetPort: 8080 - selector: - app: homer ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: homer-ingress - namespace: homer - annotations: - nginx.ingress.kubernetes.io/ssl-redirect: "true" - cert-manager.io/cluster-issuer: "letsencrypt-prod" -spec: - ingressClassName: haproxy - tls: - - hosts: - - mayne.kro.kr - - www.mayne.kro.kr - secretName: homer-tls - rules: - - host: mayne.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: homer - port: - number: 80 - - host: www.mayne.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: homer - port: - number: 80 diff --git a/homer/ingress.yaml b/homer/ingress.yaml new file mode 100644 index 0000000..5b06d55 --- /dev/null +++ b/homer/ingress.yaml @@ -0,0 +1,35 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: homer-ingress + namespace: homer + annotations: + cert-manager.io/cluster-issuer: "letsencrypt-prod" +spec: + ingressClassName: haproxy + tls: + - hosts: + - mayne.kro.kr + - www.mayne.kro.kr + secretName: homer-tls + rules: + - host: mayne.kro.kr + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: homer + port: + number: 80 + - host: www.mayne.kro.kr + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: homer + port: + number: 80 diff --git a/homer/kustomization.yaml b/homer/kustomization.yaml index b82a3f2..0fda00b 100644 --- a/homer/kustomization.yaml +++ b/homer/kustomization.yaml @@ -2,15 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/homer.yaml - - # Namespace with Goldilocks label - namespace.yaml - - deployment.yaml + - service.yaml + - ingress.yaml -# ConfigMap 생성: config.yml만 포함 (assets는 InitContainer에서 Git에서 복사) configMapGenerator: - name: homer-config namespace: homer diff --git a/homer/service.yaml b/homer/service.yaml new file mode 100644 index 0000000..46df59c --- /dev/null +++ b/homer/service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: homer + namespace: homer +spec: + type: ClusterIP + ports: + - name: http + port: 80 + targetPort: 8080 + selector: + app: homer diff --git a/umami/kustomization.yaml b/umami/kustomization.yaml index 0e8b500..25efff4 100644 --- a/umami/kustomization.yaml +++ b/umami/kustomization.yaml @@ -2,11 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/umami.yaml - - # Namespace with Goldilocks label - namespace.yaml - - vault/umami-password.yaml - ingress.yaml