From 6a13a5292439a50fc10a13c18016ed0875063277 Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Tue, 6 Jan 2026 01:56:50 +0900 Subject: [PATCH] REFACTOR(storage): integrate ingress in values - longhorn: move ingress to helm-values, nodes to manifests - velero: move ingress to velero-ui inline values --- longhorn/helm-values.yaml | 9 ++++++- longhorn/ingress.yaml | 24 ------------------ longhorn/kustomization.yaml | 4 ++- longhorn/{nodes => manifests}/mayne-vcn.yaml | 0 .../{nodes => manifests}/mayne-worker-1.yaml | 0 .../{nodes => manifests}/mayne-worker-2.yaml | 0 velero/argocd.yaml | 16 ++++++++++++ velero/ingress.yaml | 25 ------------------- velero/kustomization.yaml | 1 - 9 files changed, 27 insertions(+), 52 deletions(-) delete mode 100644 longhorn/ingress.yaml rename longhorn/{nodes => manifests}/mayne-vcn.yaml (100%) rename longhorn/{nodes => manifests}/mayne-worker-1.yaml (100%) rename longhorn/{nodes => manifests}/mayne-worker-2.yaml (100%) delete mode 100644 velero/ingress.yaml diff --git a/longhorn/helm-values.yaml b/longhorn/helm-values.yaml index 35d97b0..cca228a 100644 --- a/longhorn/helm-values.yaml +++ b/longhorn/helm-values.yaml @@ -84,7 +84,14 @@ csi: # Ingress for Longhorn UI ingress: - enabled: false # We'll create a separate Ingress resource + enabled: true + ingressClassName: traefik + host: longhorn0213.kro.kr + tls: true + tlsSecret: longhorn-tls + path: / + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod # Service configuration service: diff --git a/longhorn/ingress.yaml b/longhorn/ingress.yaml deleted file mode 100644 index d515164..0000000 --- a/longhorn/ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: longhorn-ingress - namespace: longhorn - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod -spec: - ingressClassName: traefik - tls: - - hosts: - - longhorn0213.kro.kr - secretName: longhorn-tls - rules: - - host: longhorn0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: longhorn-frontend - port: - number: 80 diff --git a/longhorn/kustomization.yaml b/longhorn/kustomization.yaml index 2e3fbb2..f738f5b 100644 --- a/longhorn/kustomization.yaml +++ b/longhorn/kustomization.yaml @@ -2,4 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: longhorn resources: -- ingress.yaml +- manifests/mayne-vcn.yaml +- manifests/mayne-worker-1.yaml +- manifests/mayne-worker-2.yaml diff --git a/longhorn/nodes/mayne-vcn.yaml b/longhorn/manifests/mayne-vcn.yaml similarity index 100% rename from longhorn/nodes/mayne-vcn.yaml rename to longhorn/manifests/mayne-vcn.yaml diff --git a/longhorn/nodes/mayne-worker-1.yaml b/longhorn/manifests/mayne-worker-1.yaml similarity index 100% rename from longhorn/nodes/mayne-worker-1.yaml rename to longhorn/manifests/mayne-worker-1.yaml diff --git a/longhorn/nodes/mayne-worker-2.yaml b/longhorn/manifests/mayne-worker-2.yaml similarity index 100% rename from longhorn/nodes/mayne-worker-2.yaml rename to longhorn/manifests/mayne-worker-2.yaml diff --git a/velero/argocd.yaml b/velero/argocd.yaml index 3767d09..58463fe 100644 --- a/velero/argocd.yaml +++ b/velero/argocd.yaml @@ -101,6 +101,22 @@ spec: serviceAccount: create: true name: velero-ui + + ingress: + enabled: true + className: traefik + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd + hosts: + - host: velero0213.kro.kr + paths: + - path: / + pathType: Prefix + tls: + - secretName: velero-ui-tls + hosts: + - velero0213.kro.kr destination: server: https://kubernetes.default.svc namespace: velero diff --git a/velero/ingress.yaml b/velero/ingress.yaml deleted file mode 100644 index cdbda53..0000000 --- a/velero/ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: velero-ui-ingress - namespace: velero - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod - traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd -spec: - ingressClassName: traefik - tls: - - hosts: - - velero0213.kro.kr - secretName: velero-ui-tls - rules: - - host: velero0213.kro.kr - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: velero-ui - port: - number: 3000 diff --git a/velero/kustomization.yaml b/velero/kustomization.yaml index 3ae7c9f..15c4244 100644 --- a/velero/kustomization.yaml +++ b/velero/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - vault/velero-secrets.yaml -- ingress.yaml