diff --git a/infra/apps/core/accounts/base/helmrelease.yaml b/apps/core/accounts/base/helmrelease.yaml similarity index 100% rename from infra/apps/core/accounts/base/helmrelease.yaml rename to apps/core/accounts/base/helmrelease.yaml diff --git a/infra/apps/core/accounts/base/kustomization.yaml b/apps/core/accounts/base/kustomization.yaml similarity index 100% rename from infra/apps/core/accounts/base/kustomization.yaml rename to apps/core/accounts/base/kustomization.yaml diff --git a/infra/apps/core/accounts/base/oci-repository.yaml b/apps/core/accounts/base/oci-repository.yaml similarity index 100% rename from infra/apps/core/accounts/base/oci-repository.yaml rename to apps/core/accounts/base/oci-repository.yaml diff --git a/infra/apps/core/accounts/base/values.yaml b/apps/core/accounts/base/values.yaml similarity index 100% rename from infra/apps/core/accounts/base/values.yaml rename to apps/core/accounts/base/values.yaml diff --git a/infra/apps/core/accounts/pre/externalsecret.yaml b/apps/core/accounts/pre/externalsecret.yaml similarity index 100% rename from infra/apps/core/accounts/pre/externalsecret.yaml rename to apps/core/accounts/pre/externalsecret.yaml diff --git a/infra/apps/core/accounts/pre/ingress.yaml b/apps/core/accounts/pre/ingress.yaml similarity index 100% rename from infra/apps/core/accounts/pre/ingress.yaml rename to apps/core/accounts/pre/ingress.yaml diff --git a/infra/apps/core/accounts/pre/kustomization.yaml b/apps/core/accounts/pre/kustomization.yaml similarity index 100% rename from infra/apps/core/accounts/pre/kustomization.yaml rename to apps/core/accounts/pre/kustomization.yaml diff --git a/infra/apps/core/accounts/pre/values.yaml b/apps/core/accounts/pre/values.yaml similarity index 100% rename from infra/apps/core/accounts/pre/values.yaml rename to apps/core/accounts/pre/values.yaml diff --git a/infra/apps/core/accounts/prod/externalsecret.yaml b/apps/core/accounts/prod/externalsecret.yaml similarity index 100% rename from infra/apps/core/accounts/prod/externalsecret.yaml rename to apps/core/accounts/prod/externalsecret.yaml diff --git a/infra/apps/core/accounts/prod/ingress.yaml b/apps/core/accounts/prod/ingress.yaml similarity index 100% rename from infra/apps/core/accounts/prod/ingress.yaml rename to apps/core/accounts/prod/ingress.yaml diff --git a/infra/apps/core/accounts/prod/kustomization.yaml b/apps/core/accounts/prod/kustomization.yaml similarity index 100% rename from infra/apps/core/accounts/prod/kustomization.yaml rename to apps/core/accounts/prod/kustomization.yaml diff --git a/infra/apps/core/accounts/prod/values.yaml b/apps/core/accounts/prod/values.yaml similarity index 100% rename from infra/apps/core/accounts/prod/values.yaml rename to apps/core/accounts/prod/values.yaml diff --git a/infra/apps/core/console/base/helmrelease.yaml b/apps/core/console/base/helmrelease.yaml similarity index 100% rename from infra/apps/core/console/base/helmrelease.yaml rename to apps/core/console/base/helmrelease.yaml diff --git a/infra/apps/core/console/base/kustomization.yaml b/apps/core/console/base/kustomization.yaml similarity index 100% rename from infra/apps/core/console/base/kustomization.yaml rename to apps/core/console/base/kustomization.yaml diff --git a/infra/apps/core/console/base/oci-repository.yaml b/apps/core/console/base/oci-repository.yaml similarity index 100% rename from infra/apps/core/console/base/oci-repository.yaml rename to apps/core/console/base/oci-repository.yaml diff --git a/infra/apps/core/console/base/values.yaml b/apps/core/console/base/values.yaml similarity index 100% rename from infra/apps/core/console/base/values.yaml rename to apps/core/console/base/values.yaml diff --git a/infra/apps/core/console/pre/externalsecret.yaml b/apps/core/console/pre/externalsecret.yaml similarity index 100% rename from infra/apps/core/console/pre/externalsecret.yaml rename to apps/core/console/pre/externalsecret.yaml diff --git a/infra/apps/core/console/pre/ingress.yaml b/apps/core/console/pre/ingress.yaml similarity index 100% rename from infra/apps/core/console/pre/ingress.yaml rename to apps/core/console/pre/ingress.yaml diff --git a/infra/apps/core/console/pre/kustomization.yaml b/apps/core/console/pre/kustomization.yaml similarity index 100% rename from infra/apps/core/console/pre/kustomization.yaml rename to apps/core/console/pre/kustomization.yaml diff --git a/infra/apps/core/console/pre/values.yaml b/apps/core/console/pre/values.yaml similarity index 100% rename from infra/apps/core/console/pre/values.yaml rename to apps/core/console/pre/values.yaml diff --git a/infra/apps/core/console/prod/externalsecret.yaml b/apps/core/console/prod/externalsecret.yaml similarity index 100% rename from infra/apps/core/console/prod/externalsecret.yaml rename to apps/core/console/prod/externalsecret.yaml diff --git a/infra/apps/core/console/prod/ingress.yaml b/apps/core/console/prod/ingress.yaml similarity index 100% rename from infra/apps/core/console/prod/ingress.yaml rename to apps/core/console/prod/ingress.yaml diff --git a/infra/apps/core/console/prod/kustomization.yaml b/apps/core/console/prod/kustomization.yaml similarity index 100% rename from infra/apps/core/console/prod/kustomization.yaml rename to apps/core/console/prod/kustomization.yaml diff --git a/infra/apps/core/console/prod/values.yaml b/apps/core/console/prod/values.yaml similarity index 100% rename from infra/apps/core/console/prod/values.yaml rename to apps/core/console/prod/values.yaml diff --git a/infra/observability/observability-stack/helmrelease.yaml b/apps/monitor/observability-stack/helmrelease.yaml similarity index 100% rename from infra/observability/observability-stack/helmrelease.yaml rename to apps/monitor/observability-stack/helmrelease.yaml diff --git a/infra/observability/observability-stack/kustomization.yaml b/apps/monitor/observability-stack/kustomization.yaml similarity index 100% rename from infra/observability/observability-stack/kustomization.yaml rename to apps/monitor/observability-stack/kustomization.yaml diff --git a/infra/observability/observability-stack/oci-repository.yaml b/apps/monitor/observability-stack/oci-repository.yaml similarity index 100% rename from infra/observability/observability-stack/oci-repository.yaml rename to apps/monitor/observability-stack/oci-repository.yaml diff --git a/infra/observability/observability-stack/values.yaml b/apps/monitor/observability-stack/values.yaml similarity index 100% rename from infra/observability/observability-stack/values.yaml rename to apps/monitor/observability-stack/values.yaml diff --git a/infra/platform/external-secrets/helmrelease.yaml b/apps/platform/external-secrets/helmrelease.yaml similarity index 100% rename from infra/platform/external-secrets/helmrelease.yaml rename to apps/platform/external-secrets/helmrelease.yaml diff --git a/infra/platform/external-secrets/kustomization.yaml b/apps/platform/external-secrets/kustomization.yaml similarity index 100% rename from infra/platform/external-secrets/kustomization.yaml rename to apps/platform/external-secrets/kustomization.yaml diff --git a/infra/platform/k3s-platform/helmrelease.yaml b/apps/platform/k3s-platform/helmrelease.yaml similarity index 100% rename from infra/platform/k3s-platform/helmrelease.yaml rename to apps/platform/k3s-platform/helmrelease.yaml diff --git a/infra/platform/k3s-platform/kustomization.yaml b/apps/platform/k3s-platform/kustomization.yaml similarity index 100% rename from infra/platform/k3s-platform/kustomization.yaml rename to apps/platform/k3s-platform/kustomization.yaml diff --git a/infra/platform/k3s-platform/oci-repository.yaml b/apps/platform/k3s-platform/oci-repository.yaml similarity index 100% rename from infra/platform/k3s-platform/oci-repository.yaml rename to apps/platform/k3s-platform/oci-repository.yaml diff --git a/infra/platform/k3s-platform/values.yaml b/apps/platform/k3s-platform/values.yaml similarity index 100% rename from infra/platform/k3s-platform/values.yaml rename to apps/platform/k3s-platform/values.yaml diff --git a/infra/platform/kustomization.yaml b/apps/platform/kustomization.yaml similarity index 100% rename from infra/platform/kustomization.yaml rename to apps/platform/kustomization.yaml diff --git a/infra/platform/reloader/helmrelease.yaml b/apps/platform/reloader/helmrelease.yaml similarity index 100% rename from infra/platform/reloader/helmrelease.yaml rename to apps/platform/reloader/helmrelease.yaml diff --git a/infra/platform/reloader/kustomization.yaml b/apps/platform/reloader/kustomization.yaml similarity index 100% rename from infra/platform/reloader/kustomization.yaml rename to apps/platform/reloader/kustomization.yaml diff --git a/infra/platform/repositories.yaml b/apps/platform/repositories.yaml similarity index 100% rename from infra/platform/repositories.yaml rename to apps/platform/repositories.yaml diff --git a/clusters/k3s-local/kustomization.yaml b/clusters/k3s-local/kustomization.yaml index 3c9aa61..fe93864 100644 --- a/clusters/k3s-local/kustomization.yaml +++ b/clusters/k3s-local/kustomization.yaml @@ -4,8 +4,8 @@ resources: - namespace.yaml - repository.yaml - ../../apps/itsm-dev/ - - ../../apps/redis/ - - ../../apps/mysql/ - - ../../apps/postgresql/ - - ../../apps/mongodb/ - - ../../apps/minio/ + - ../../services/cache/redis/ + - ../../services/database/mysql/ + - ../../services/database/postgresql/ + - ../../services/database/mongodb/ + - ../../services/object-storage/minio/ diff --git a/infra/infrastructure/postgresql/externalsecret.yaml b/databases/postgresql/externalsecret.yaml similarity index 100% rename from infra/infrastructure/postgresql/externalsecret.yaml rename to databases/postgresql/externalsecret.yaml diff --git a/infra/infrastructure/postgresql/helmrelease.yaml b/databases/postgresql/helmrelease.yaml similarity index 100% rename from infra/infrastructure/postgresql/helmrelease.yaml rename to databases/postgresql/helmrelease.yaml diff --git a/infra/infrastructure/postgresql/initdb-configmap.yaml b/databases/postgresql/initdb-configmap.yaml similarity index 100% rename from infra/infrastructure/postgresql/initdb-configmap.yaml rename to databases/postgresql/initdb-configmap.yaml diff --git a/infra/infrastructure/postgresql/kustomization.yaml b/databases/postgresql/kustomization.yaml similarity index 100% rename from infra/infrastructure/postgresql/kustomization.yaml rename to databases/postgresql/kustomization.yaml diff --git a/infra/infrastructure/postgresql/oci-repository.yaml b/databases/postgresql/oci-repository.yaml similarity index 100% rename from infra/infrastructure/postgresql/oci-repository.yaml rename to databases/postgresql/oci-repository.yaml diff --git a/infra/infrastructure/postgresql/stunnel-externalsecret.yaml b/databases/postgresql/stunnel-externalsecret.yaml similarity index 100% rename from infra/infrastructure/postgresql/stunnel-externalsecret.yaml rename to databases/postgresql/stunnel-externalsecret.yaml diff --git a/infra/infrastructure/postgresql/values.yaml b/databases/postgresql/values.yaml similarity index 100% rename from infra/infrastructure/postgresql/values.yaml rename to databases/postgresql/values.yaml diff --git a/infra/clusters/pre/accounts-pre-kustomization.yaml b/infra/clusters/pre/accounts-pre-kustomization.yaml index 7e13f87..aad2ac9 100644 --- a/infra/clusters/pre/accounts-pre-kustomization.yaml +++ b/infra/clusters/pre/accounts-pre-kustomization.yaml @@ -10,4 +10,4 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/apps/core/accounts/pre + path: ./apps/core/accounts/pre diff --git a/infra/clusters/pre/console-pre-kustomization.yaml b/infra/clusters/pre/console-pre-kustomization.yaml index 99051cf..59e3987 100644 --- a/infra/clusters/pre/console-pre-kustomization.yaml +++ b/infra/clusters/pre/console-pre-kustomization.yaml @@ -10,4 +10,4 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/apps/core/console/pre + path: ./apps/core/console/pre diff --git a/infra/clusters/prod/accounts-prod-kustomization.yaml b/infra/clusters/prod/accounts-prod-kustomization.yaml index a5cffea..d33b303 100644 --- a/infra/clusters/prod/accounts-prod-kustomization.yaml +++ b/infra/clusters/prod/accounts-prod-kustomization.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/apps/core/accounts/prod + path: ./apps/core/accounts/prod dependsOn: - name: platform-k3s - name: infrastructure-stack diff --git a/infra/clusters/prod/console-prod-kustomization.yaml b/infra/clusters/prod/console-prod-kustomization.yaml index 5b9d1d6..b040f15 100644 --- a/infra/clusters/prod/console-prod-kustomization.yaml +++ b/infra/clusters/prod/console-prod-kustomization.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/apps/core/console/prod + path: ./apps/core/console/prod dependsOn: - name: platform-k3s - name: infrastructure-stack diff --git a/infra/clusters/prod/infrastructure-kustomization.yaml b/infra/clusters/prod/infrastructure-kustomization.yaml index eb4b10e..cc71861 100644 --- a/infra/clusters/prod/infrastructure-kustomization.yaml +++ b/infra/clusters/prod/infrastructure-kustomization.yaml @@ -11,6 +11,6 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/infrastructure + path: ./databases/postgresql dependsOn: - name: platform-k3s diff --git a/infra/clusters/prod/observability-kustomization.yaml b/infra/clusters/prod/observability-kustomization.yaml index 64fc5cd..92751ab 100644 --- a/infra/clusters/prod/observability-kustomization.yaml +++ b/infra/clusters/prod/observability-kustomization.yaml @@ -11,6 +11,6 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/observability + path: ./apps/monitor/observability-stack dependsOn: - name: platform-k3s diff --git a/infra/clusters/prod/platform-kustomization.yaml b/infra/clusters/prod/platform-kustomization.yaml index 8bef793..5a28220 100644 --- a/infra/clusters/prod/platform-kustomization.yaml +++ b/infra/clusters/prod/platform-kustomization.yaml @@ -11,4 +11,4 @@ spec: sourceRef: kind: GitRepository name: platform-config - path: ./infra/platform + path: ./apps/platform diff --git a/infra/infrastructure/kustomization.yaml b/infra/infrastructure/kustomization.yaml index 3551d76..fda7505 100644 --- a/infra/infrastructure/kustomization.yaml +++ b/infra/infrastructure/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - repositories.yaml - - postgresql + - ../../databases/postgresql diff --git a/apps/minio/kustomization.yaml b/services/cache/redis/kustomization.yaml similarity index 100% rename from apps/minio/kustomization.yaml rename to services/cache/redis/kustomization.yaml diff --git a/apps/redis/release.yaml b/services/cache/redis/release.yaml similarity index 100% rename from apps/redis/release.yaml rename to services/cache/redis/release.yaml diff --git a/apps/mongodb/kustomization.yaml b/services/database/mongodb/kustomization.yaml similarity index 100% rename from apps/mongodb/kustomization.yaml rename to services/database/mongodb/kustomization.yaml diff --git a/apps/mongodb/release.yaml b/services/database/mongodb/release.yaml similarity index 100% rename from apps/mongodb/release.yaml rename to services/database/mongodb/release.yaml diff --git a/apps/mysql/kustomization.yaml b/services/database/mysql/kustomization.yaml similarity index 100% rename from apps/mysql/kustomization.yaml rename to services/database/mysql/kustomization.yaml diff --git a/apps/postgresql/kustomization.yaml b/services/database/postgresql/kustomization.yaml similarity index 100% rename from apps/postgresql/kustomization.yaml rename to services/database/postgresql/kustomization.yaml diff --git a/apps/redis/kustomization.yaml b/services/object-storage/minio/kustomization.yaml similarity index 100% rename from apps/redis/kustomization.yaml rename to services/object-storage/minio/kustomization.yaml diff --git a/apps/minio/release.yaml b/services/object-storage/minio/release.yaml similarity index 100% rename from apps/minio/release.yaml rename to services/object-storage/minio/release.yaml