From 50c3ad5e9ea2b42c8e7fa67fb1a80d9228593ded Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Mon, 29 Dec 2025 15:11:19 +0900 Subject: [PATCH] REFACTOR(minio): arrange folder structure for Longhorn and MinIO - Reorganize folder structure - Clean up configuration files --- .../{argocd/longhorn.yaml => argocd.yaml} | 2 +- .../longhorn.yaml => helm-values.yaml} | 0 .../longhorn-ingress.yaml => ingress.yaml} | 0 longhorn/kustomization.yaml | 3 +- longhorn/namespace.yaml | 6 ++++ minio/{argocd/minio.yaml => argocd.yaml} | 2 +- .../minio.yaml => helm-values.yaml} | 0 minio/ingress-api.yaml | 28 ------------------ minio/{ingress-console.yaml => ingress.yaml} | 29 +++++++++++++++++++ minio/kustomization.yaml | 6 ++-- minio/namespace.yaml | 6 ++++ 11 files changed, 47 insertions(+), 35 deletions(-) rename longhorn/{argocd/longhorn.yaml => argocd.yaml} (98%) rename longhorn/{helm-values/longhorn.yaml => helm-values.yaml} (100%) rename longhorn/{ingress/longhorn-ingress.yaml => ingress.yaml} (100%) create mode 100644 longhorn/namespace.yaml rename minio/{argocd/minio.yaml => argocd.yaml} (95%) rename minio/{helm-values/minio.yaml => helm-values.yaml} (100%) delete mode 100644 minio/ingress-api.yaml rename minio/{ingress-console.yaml => ingress.yaml} (53%) create mode 100644 minio/namespace.yaml diff --git a/longhorn/argocd/longhorn.yaml b/longhorn/argocd.yaml similarity index 98% rename from longhorn/argocd/longhorn.yaml rename to longhorn/argocd.yaml index fde9d1a..4e8eefd 100644 --- a/longhorn/argocd/longhorn.yaml +++ b/longhorn/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 1.7.2 helm: valueFiles: - - $values/longhorn/helm-values/longhorn.yaml + - $values/longhorn/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/databases.git targetRevision: main diff --git a/longhorn/helm-values/longhorn.yaml b/longhorn/helm-values.yaml similarity index 100% rename from longhorn/helm-values/longhorn.yaml rename to longhorn/helm-values.yaml diff --git a/longhorn/ingress/longhorn-ingress.yaml b/longhorn/ingress.yaml similarity index 100% rename from longhorn/ingress/longhorn-ingress.yaml rename to longhorn/ingress.yaml diff --git a/longhorn/kustomization.yaml b/longhorn/kustomization.yaml index 0953ada..6836d2c 100644 --- a/longhorn/kustomization.yaml +++ b/longhorn/kustomization.yaml @@ -4,7 +4,8 @@ kind: Kustomization namespace: longhorn-system resources: - - ingress/longhorn-ingress.yaml + - namespace.yaml + - ingress.yaml - nodes/mayne-vcn.yaml - nodes/mayne-worker-1.yaml - nodes/mayne-worker-2.yaml diff --git a/longhorn/namespace.yaml b/longhorn/namespace.yaml new file mode 100644 index 0000000..8a9e178 --- /dev/null +++ b/longhorn/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: longhorn-system + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/minio/argocd/minio.yaml b/minio/argocd.yaml similarity index 95% rename from minio/argocd/minio.yaml rename to minio/argocd.yaml index e4b94cd..9b59715 100644 --- a/minio/argocd/minio.yaml +++ b/minio/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 5.2.0 helm: valueFiles: - - $values/minio/helm-values/minio.yaml + - $values/minio/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/databases.git targetRevision: main diff --git a/minio/helm-values/minio.yaml b/minio/helm-values.yaml similarity index 100% rename from minio/helm-values/minio.yaml rename to minio/helm-values.yaml diff --git a/minio/ingress-api.yaml b/minio/ingress-api.yaml deleted file mode 100644 index e27d682..0000000 --- a/minio/ingress-api.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: minio-api - namespace: minio - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/proxy-read-timeout: "600" - nginx.ingress.kubernetes.io/proxy-send-timeout: "600" - nginx.ingress.kubernetes.io/ssl-redirect: "true" -spec: - ingressClassName: haproxy - tls: - - hosts: - - s3.minio0213.kro.kr - secretName: minio-api-tls - rules: - - host: s3.minio0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: minio-service - port: - number: 9000 diff --git a/minio/ingress-console.yaml b/minio/ingress.yaml similarity index 53% rename from minio/ingress-console.yaml rename to minio/ingress.yaml index 201c847..35a694c 100644 --- a/minio/ingress-console.yaml +++ b/minio/ingress.yaml @@ -1,5 +1,34 @@ apiVersion: networking.k8s.io/v1 kind: Ingress +metadata: + name: minio-api + namespace: minio + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/proxy-body-size: "0" + nginx.ingress.kubernetes.io/proxy-read-timeout: "600" + nginx.ingress.kubernetes.io/proxy-send-timeout: "600" + nginx.ingress.kubernetes.io/ssl-redirect: "true" +spec: + ingressClassName: haproxy + tls: + - hosts: + - s3.minio0213.kro.kr + secretName: minio-api-tls + rules: + - host: s3.minio0213.kro.kr + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: minio-service + port: + number: 9000 +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress metadata: name: minio-console namespace: minio diff --git a/minio/kustomization.yaml b/minio/kustomization.yaml index 28ba8ce..a12d846 100644 --- a/minio/kustomization.yaml +++ b/minio/kustomization.yaml @@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/minio.yaml + - namespace.yaml - vault/minio-root-password.yaml - - ingress-api.yaml - - ingress-console.yaml + - ingress.yaml diff --git a/minio/namespace.yaml b/minio/namespace.yaml new file mode 100644 index 0000000..89e75c8 --- /dev/null +++ b/minio/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: minio + labels: + goldilocks.fairwinds.com/enabled: "true"