diff --git a/argocd-apps/mailu.yaml b/argocd-apps/mailu.yaml index b82c64c..dfa7d42 100644 --- a/argocd-apps/mailu.yaml +++ b/argocd-apps/mailu.yaml @@ -8,10 +8,9 @@ spec: source: repoURL: 'https://git.dvirlabs.com/dvirlabs/mail-services.git' targetRevision: HEAD - path: charts/mailu - helm: - valueFiles: - - ../../manifests/mailu/values.yaml + path: deploy/mailu + directory: + recurse: true # ✅ Enables applying all YAMLs in this directory destination: server: https://kubernetes.default.svc namespace: mail-services diff --git a/deploy/mailu/certificate.yaml b/deploy/mailu/certificate.yaml new file mode 100644 index 0000000..6cc5353 --- /dev/null +++ b/deploy/mailu/certificate.yaml @@ -0,0 +1,13 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: mailu-certificates + namespace: mail-services +spec: + secretName: mailu-certificates + issuerRef: + name: letsencrypt + kind: ClusterIssuer + commonName: mail.dvirlabs.com + dnsNames: + - mail.dvirlabs.com diff --git a/deploy/mailu/clusterissuer.yaml b/deploy/mailu/clusterissuer.yaml new file mode 100644 index 0000000..385e861 --- /dev/null +++ b/deploy/mailu/clusterissuer.yaml @@ -0,0 +1,14 @@ +apiVersion: cert-manager.io/v1 +kind: ClusterIssuer +metadata: + name: letsencrypt +spec: + acme: + server: https://acme-v02.api.letsencrypt.org/directory + email: your@email.com # 🔁 change this to your real email + privateKeySecretRef: + name: letsencrypt-account-key + solvers: + - http01: + ingress: + class: traefik diff --git a/charts/mailu/CHANGELOG.md b/deploy/mailu/helm-chart/mailu/CHANGELOG.md similarity index 100% rename from charts/mailu/CHANGELOG.md rename to deploy/mailu/helm-chart/mailu/CHANGELOG.md diff --git a/charts/mailu/Chart.lock b/deploy/mailu/helm-chart/mailu/Chart.lock similarity index 100% rename from charts/mailu/Chart.lock rename to deploy/mailu/helm-chart/mailu/Chart.lock diff --git a/charts/mailu/Chart.yaml b/deploy/mailu/helm-chart/mailu/Chart.yaml similarity index 100% rename from charts/mailu/Chart.yaml rename to deploy/mailu/helm-chart/mailu/Chart.yaml diff --git a/charts/mailu/MIGRATION_GUIDE.md b/deploy/mailu/helm-chart/mailu/MIGRATION_GUIDE.md similarity index 100% rename from charts/mailu/MIGRATION_GUIDE.md rename to deploy/mailu/helm-chart/mailu/MIGRATION_GUIDE.md diff --git a/charts/mailu/README.md b/deploy/mailu/helm-chart/mailu/README.md similarity index 100% rename from charts/mailu/README.md rename to deploy/mailu/helm-chart/mailu/README.md diff --git a/charts/mailu/ci/helm-lint-values.yaml b/deploy/mailu/helm-chart/mailu/ci/helm-lint-values.yaml similarity index 100% rename from charts/mailu/ci/helm-lint-values.yaml rename to deploy/mailu/helm-chart/mailu/ci/helm-lint-values.yaml diff --git a/charts/mailu/linter_values.yaml b/deploy/mailu/helm-chart/mailu/linter_values.yaml similarity index 100% rename from charts/mailu/linter_values.yaml rename to deploy/mailu/helm-chart/mailu/linter_values.yaml diff --git a/charts/mailu/templates/NOTES.txt b/deploy/mailu/helm-chart/mailu/templates/NOTES.txt similarity index 100% rename from charts/mailu/templates/NOTES.txt rename to deploy/mailu/helm-chart/mailu/templates/NOTES.txt diff --git a/charts/mailu/templates/_claims.tpl b/deploy/mailu/helm-chart/mailu/templates/_claims.tpl similarity index 100% rename from charts/mailu/templates/_claims.tpl rename to deploy/mailu/helm-chart/mailu/templates/_claims.tpl diff --git a/charts/mailu/templates/_database.tpl b/deploy/mailu/helm-chart/mailu/templates/_database.tpl similarity index 100% rename from charts/mailu/templates/_database.tpl rename to deploy/mailu/helm-chart/mailu/templates/_database.tpl diff --git a/charts/mailu/templates/_helpers.tpl b/deploy/mailu/helm-chart/mailu/templates/_helpers.tpl similarity index 100% rename from charts/mailu/templates/_helpers.tpl rename to deploy/mailu/helm-chart/mailu/templates/_helpers.tpl diff --git a/charts/mailu/templates/_secrets.tpl b/deploy/mailu/helm-chart/mailu/templates/_secrets.tpl similarity index 100% rename from charts/mailu/templates/_secrets.tpl rename to deploy/mailu/helm-chart/mailu/templates/_secrets.tpl diff --git a/charts/mailu/templates/_services.tpl b/deploy/mailu/helm-chart/mailu/templates/_services.tpl similarity index 100% rename from charts/mailu/templates/_services.tpl rename to deploy/mailu/helm-chart/mailu/templates/_services.tpl diff --git a/charts/mailu/templates/admin/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/admin/deployment.yaml similarity index 100% rename from charts/mailu/templates/admin/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/admin/deployment.yaml diff --git a/charts/mailu/templates/admin/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/admin/pvc.yaml similarity index 100% rename from charts/mailu/templates/admin/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/admin/pvc.yaml diff --git a/charts/mailu/templates/admin/service.yaml b/deploy/mailu/helm-chart/mailu/templates/admin/service.yaml similarity index 100% rename from charts/mailu/templates/admin/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/admin/service.yaml diff --git a/charts/mailu/templates/clamav/service-headless.yaml b/deploy/mailu/helm-chart/mailu/templates/clamav/service-headless.yaml similarity index 100% rename from charts/mailu/templates/clamav/service-headless.yaml rename to deploy/mailu/helm-chart/mailu/templates/clamav/service-headless.yaml diff --git a/charts/mailu/templates/clamav/service.yaml b/deploy/mailu/helm-chart/mailu/templates/clamav/service.yaml similarity index 100% rename from charts/mailu/templates/clamav/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/clamav/service.yaml diff --git a/charts/mailu/templates/clamav/statefulset.yaml b/deploy/mailu/helm-chart/mailu/templates/clamav/statefulset.yaml similarity index 100% rename from charts/mailu/templates/clamav/statefulset.yaml rename to deploy/mailu/helm-chart/mailu/templates/clamav/statefulset.yaml diff --git a/charts/mailu/templates/dovecot/configmap.yaml b/deploy/mailu/helm-chart/mailu/templates/dovecot/configmap.yaml similarity index 100% rename from charts/mailu/templates/dovecot/configmap.yaml rename to deploy/mailu/helm-chart/mailu/templates/dovecot/configmap.yaml diff --git a/charts/mailu/templates/dovecot/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/dovecot/deployment.yaml similarity index 100% rename from charts/mailu/templates/dovecot/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/dovecot/deployment.yaml diff --git a/charts/mailu/templates/dovecot/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/dovecot/pvc.yaml similarity index 100% rename from charts/mailu/templates/dovecot/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/dovecot/pvc.yaml diff --git a/charts/mailu/templates/dovecot/service.yaml b/deploy/mailu/helm-chart/mailu/templates/dovecot/service.yaml similarity index 100% rename from charts/mailu/templates/dovecot/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/dovecot/service.yaml diff --git a/charts/mailu/templates/envvars-configmap.yaml b/deploy/mailu/helm-chart/mailu/templates/envvars-configmap.yaml similarity index 100% rename from charts/mailu/templates/envvars-configmap.yaml rename to deploy/mailu/helm-chart/mailu/templates/envvars-configmap.yaml diff --git a/charts/mailu/templates/fetchmail/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/fetchmail/deployment.yaml similarity index 100% rename from charts/mailu/templates/fetchmail/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/fetchmail/deployment.yaml diff --git a/charts/mailu/templates/fetchmail/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/fetchmail/pvc.yaml similarity index 100% rename from charts/mailu/templates/fetchmail/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/fetchmail/pvc.yaml diff --git a/charts/mailu/templates/front/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/front/deployment.yaml similarity index 100% rename from charts/mailu/templates/front/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/front/deployment.yaml diff --git a/charts/mailu/templates/front/ingress.yaml b/deploy/mailu/helm-chart/mailu/templates/front/ingress.yaml similarity index 100% rename from charts/mailu/templates/front/ingress.yaml rename to deploy/mailu/helm-chart/mailu/templates/front/ingress.yaml diff --git a/charts/mailu/templates/front/service-external.yaml b/deploy/mailu/helm-chart/mailu/templates/front/service-external.yaml similarity index 100% rename from charts/mailu/templates/front/service-external.yaml rename to deploy/mailu/helm-chart/mailu/templates/front/service-external.yaml diff --git a/charts/mailu/templates/front/service.yaml b/deploy/mailu/helm-chart/mailu/templates/front/service.yaml similarity index 100% rename from charts/mailu/templates/front/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/front/service.yaml diff --git a/charts/mailu/templates/network-policies.yaml b/deploy/mailu/helm-chart/mailu/templates/network-policies.yaml similarity index 100% rename from charts/mailu/templates/network-policies.yaml rename to deploy/mailu/helm-chart/mailu/templates/network-policies.yaml diff --git a/charts/mailu/templates/oletools/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/oletools/deployment.yaml similarity index 100% rename from charts/mailu/templates/oletools/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/oletools/deployment.yaml diff --git a/charts/mailu/templates/oletools/service.yaml b/deploy/mailu/helm-chart/mailu/templates/oletools/service.yaml similarity index 100% rename from charts/mailu/templates/oletools/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/oletools/service.yaml diff --git a/charts/mailu/templates/postfix/configmap.yaml b/deploy/mailu/helm-chart/mailu/templates/postfix/configmap.yaml similarity index 100% rename from charts/mailu/templates/postfix/configmap.yaml rename to deploy/mailu/helm-chart/mailu/templates/postfix/configmap.yaml diff --git a/charts/mailu/templates/postfix/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/postfix/deployment.yaml similarity index 100% rename from charts/mailu/templates/postfix/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/postfix/deployment.yaml diff --git a/charts/mailu/templates/postfix/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/postfix/pvc.yaml similarity index 100% rename from charts/mailu/templates/postfix/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/postfix/pvc.yaml diff --git a/charts/mailu/templates/postfix/service.yaml b/deploy/mailu/helm-chart/mailu/templates/postfix/service.yaml similarity index 100% rename from charts/mailu/templates/postfix/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/postfix/service.yaml diff --git a/charts/mailu/templates/pv-hostpath.yaml b/deploy/mailu/helm-chart/mailu/templates/pv-hostpath.yaml similarity index 100% rename from charts/mailu/templates/pv-hostpath.yaml rename to deploy/mailu/helm-chart/mailu/templates/pv-hostpath.yaml diff --git a/charts/mailu/templates/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/pvc.yaml similarity index 100% rename from charts/mailu/templates/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/pvc.yaml diff --git a/charts/mailu/templates/rspamd/configmap.yaml b/deploy/mailu/helm-chart/mailu/templates/rspamd/configmap.yaml similarity index 100% rename from charts/mailu/templates/rspamd/configmap.yaml rename to deploy/mailu/helm-chart/mailu/templates/rspamd/configmap.yaml diff --git a/charts/mailu/templates/rspamd/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/rspamd/deployment.yaml similarity index 100% rename from charts/mailu/templates/rspamd/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/rspamd/deployment.yaml diff --git a/charts/mailu/templates/rspamd/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/rspamd/pvc.yaml similarity index 100% rename from charts/mailu/templates/rspamd/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/rspamd/pvc.yaml diff --git a/charts/mailu/templates/rspamd/service.yaml b/deploy/mailu/helm-chart/mailu/templates/rspamd/service.yaml similarity index 100% rename from charts/mailu/templates/rspamd/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/rspamd/service.yaml diff --git a/charts/mailu/templates/secret-api.yaml b/deploy/mailu/helm-chart/mailu/templates/secret-api.yaml similarity index 100% rename from charts/mailu/templates/secret-api.yaml rename to deploy/mailu/helm-chart/mailu/templates/secret-api.yaml diff --git a/charts/mailu/templates/secret-external-db.yaml b/deploy/mailu/helm-chart/mailu/templates/secret-external-db.yaml similarity index 100% rename from charts/mailu/templates/secret-external-db.yaml rename to deploy/mailu/helm-chart/mailu/templates/secret-external-db.yaml diff --git a/charts/mailu/templates/secret-external-relay.yaml b/deploy/mailu/helm-chart/mailu/templates/secret-external-relay.yaml similarity index 100% rename from charts/mailu/templates/secret-external-relay.yaml rename to deploy/mailu/helm-chart/mailu/templates/secret-external-relay.yaml diff --git a/charts/mailu/templates/secret-initial-account.yaml b/deploy/mailu/helm-chart/mailu/templates/secret-initial-account.yaml similarity index 100% rename from charts/mailu/templates/secret-initial-account.yaml rename to deploy/mailu/helm-chart/mailu/templates/secret-initial-account.yaml diff --git a/charts/mailu/templates/secret-key-secret.yaml b/deploy/mailu/helm-chart/mailu/templates/secret-key-secret.yaml similarity index 100% rename from charts/mailu/templates/secret-key-secret.yaml rename to deploy/mailu/helm-chart/mailu/templates/secret-key-secret.yaml diff --git a/charts/mailu/templates/secrets-tls.yaml b/deploy/mailu/helm-chart/mailu/templates/secrets-tls.yaml similarity index 100% rename from charts/mailu/templates/secrets-tls.yaml rename to deploy/mailu/helm-chart/mailu/templates/secrets-tls.yaml diff --git a/charts/mailu/templates/tika/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/tika/deployment.yaml similarity index 100% rename from charts/mailu/templates/tika/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/tika/deployment.yaml diff --git a/charts/mailu/templates/tika/service.yaml b/deploy/mailu/helm-chart/mailu/templates/tika/service.yaml similarity index 100% rename from charts/mailu/templates/tika/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/tika/service.yaml diff --git a/charts/mailu/templates/webdav/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/webdav/deployment.yaml similarity index 100% rename from charts/mailu/templates/webdav/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/webdav/deployment.yaml diff --git a/charts/mailu/templates/webdav/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/webdav/pvc.yaml similarity index 100% rename from charts/mailu/templates/webdav/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/webdav/pvc.yaml diff --git a/charts/mailu/templates/webdav/service.yaml b/deploy/mailu/helm-chart/mailu/templates/webdav/service.yaml similarity index 100% rename from charts/mailu/templates/webdav/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/webdav/service.yaml diff --git a/charts/mailu/templates/webmail/deployment.yaml b/deploy/mailu/helm-chart/mailu/templates/webmail/deployment.yaml similarity index 100% rename from charts/mailu/templates/webmail/deployment.yaml rename to deploy/mailu/helm-chart/mailu/templates/webmail/deployment.yaml diff --git a/charts/mailu/templates/webmail/pvc.yaml b/deploy/mailu/helm-chart/mailu/templates/webmail/pvc.yaml similarity index 100% rename from charts/mailu/templates/webmail/pvc.yaml rename to deploy/mailu/helm-chart/mailu/templates/webmail/pvc.yaml diff --git a/charts/mailu/templates/webmail/secret.yaml b/deploy/mailu/helm-chart/mailu/templates/webmail/secret.yaml similarity index 100% rename from charts/mailu/templates/webmail/secret.yaml rename to deploy/mailu/helm-chart/mailu/templates/webmail/secret.yaml diff --git a/charts/mailu/templates/webmail/service.yaml b/deploy/mailu/helm-chart/mailu/templates/webmail/service.yaml similarity index 100% rename from charts/mailu/templates/webmail/service.yaml rename to deploy/mailu/helm-chart/mailu/templates/webmail/service.yaml diff --git a/charts/mailu/values.yaml b/deploy/mailu/helm-chart/mailu/values.yaml similarity index 100% rename from charts/mailu/values.yaml rename to deploy/mailu/helm-chart/mailu/values.yaml diff --git a/manifests/mailu/values.yaml b/manifests/mailu/values.yaml index f0a01f5..c5ecca8 100644 --- a/manifests/mailu/values.yaml +++ b/manifests/mailu/values.yaml @@ -8,8 +8,6 @@ ingress: annotations: traefik.ingress.kubernetes.io/router.entrypoints: websecure traefik.ingress.kubernetes.io/router.tls: "true" - cert-manager.io/cluster-issuer: letsencrypt - cert-manager.io/secret-name: mailu-certificates tls: certresolver: letsencrypt