diff --git a/clusters/yc-k8s-test/infrastructure/bootstrap-jobs/kustomization.yaml b/clusters/yc-k8s-test/bootstrap-jobs/kustomization.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/bootstrap-jobs/kustomization.yaml rename to clusters/yc-k8s-test/bootstrap-jobs/kustomization.yaml diff --git a/clusters/yc-k8s-test/infrastructure/bootstrap-jobs/service-bootstrap-jobs.yaml b/clusters/yc-k8s-test/bootstrap-jobs/service-bootstrap-jobs.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/bootstrap-jobs/service-bootstrap-jobs.yaml rename to clusters/yc-k8s-test/bootstrap-jobs/service-bootstrap-jobs.yaml diff --git a/clusters/yc-k8s-test/infrastructure/kustomization.yaml b/clusters/yc-k8s-test/infrastructure/kustomization.yaml deleted file mode 100644 index 960364d..0000000 --- a/clusters/yc-k8s-test/infrastructure/kustomization.yaml +++ /dev/null @@ -1,158 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../../infrastructure - - ./bootstrap-jobs -patches: - - path: ./patches/cert-manager.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: cert-manager - namespace: cert-manager - - path: ./patches/istio-base.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: istio-base - namespace: istio-system - - path: ./patches/istio-pilot.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: istiod - namespace: istio-system - - path: ./patches/istio-gateway.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: ingressgateway - namespace: istio-system - - path: ./patches/istio-config.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: istio-config - namespace: default - - path: ./patches/dashboard.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: dashboard - namespace: kubernetes-dashboard - - path: ./patches/clusterissuer-letsencrypt.yaml - target: - group: cert-manager.io - version: v1 - kind: ClusterIssuer - name: letsencrypt-issuer - - path: ./patches/clusterissuer-letsencrypt-istio.yaml - target: - group: cert-manager.io - version: v1 - kind: ClusterIssuer - name: letsencrypt-issuer-istio - - path: ./patches/local-path-provisioner.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: local-path-provisioner - namespace: local-path-provisioner - - path: ./patches/minio.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: minio - namespace: minio - - path: ./patches/glitchtip.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: glitchtip - namespace: glitchtip - - path: ./patches/openobserve.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: openobserve - namespace: openobserve - - path: ./patches/rabbitmq.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: rabbitmq - namespace: rabbitmq - - path: ./patches/kafka.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: kafka - namespace: kafka - - path: ./patches/redis.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: redis - namespace: redis - - path: ./patches/camunda.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: camunda - namespace: camunda - - path: ./patches/s3-proxy.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: s3-proxy - namespace: postgresql - - path: ./patches/postgresql.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: postgresql - namespace: postgresql - - path: ./patches/zitadel.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: zitadel - namespace: zitadel - - path: ./patches/keycloak.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: keycloak - namespace: keycloak - - path: ./patches/openldap.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: openldap - namespace: openldap - - path: ./patches/vault.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: vault - namespace: vault diff --git a/clusters/yc-k8s-test/kustomization.yaml b/clusters/yc-k8s-test/kustomization.yaml index 4b81917..dde9d1f 100644 --- a/clusters/yc-k8s-test/kustomization.yaml +++ b/clusters/yc-k8s-test/kustomization.yaml @@ -3,7 +3,30 @@ kind: Kustomization resources: - ./flux-system - ./helm-repositories.yaml - - ./infrastructure + +# infrastructure + - ../../infrastructure/cert-manager/yc-k8s-test + - ../../infrastructure/istio-base/yc-k8s-test + - ../../infrastructure/istio-pilot/yc-k8s-test + - ../../infrastructure/istio-gateway/yc-k8s-test + - ../../infrastructure/istio-config/yc-k8s-test + - ../../infrastructure/dashboard/yc-k8s-test + - ../../infrastructure/local-path-provisioner/yc-k8s-test + - ../../infrastructure/minio/yc-k8s-test + - ../../infrastructure/glitchtip/yc-k8s-test + - ../../infrastructure/openobserve/yc-k8s-test + - ../../infrastructure/rabbitmq/yc-k8s-test + - ../../infrastructure/kafka/yc-k8s-test + - ../../infrastructure/redis/yc-k8s-test + - ../../infrastructure/camunda/yc-k8s-test + - ../../infrastructure/s3-proxy/yc-k8s-test + - ../../infrastructure/postgresql/yc-k8s-test + - ../../infrastructure/zitadel/yc-k8s-test + - ../../infrastructure/keycloak/yc-k8s-test + - ../../infrastructure/openldap/yc-k8s-test + - ../../infrastructure/vault/yc-k8s-test + - ../../infrastructure/failed-pod-cleanup + - ./bootstrap-jobs # apps - ../../apps/reviews/yc-k8s-test diff --git a/clusters/yc-k8s-test/infrastructure/patches/camunda.yaml b/infrastructure/camunda/yc-k8s-test/camunda.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/camunda.yaml rename to infrastructure/camunda/yc-k8s-test/camunda.yaml diff --git a/infrastructure/camunda/yc-k8s-test/kustomization.yaml b/infrastructure/camunda/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..0c26313 --- /dev/null +++ b/infrastructure/camunda/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: camunda.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/cert-manager.yaml b/infrastructure/cert-manager/yc-k8s-test/cert-manager.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/cert-manager.yaml rename to infrastructure/cert-manager/yc-k8s-test/cert-manager.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/clusterissuer-letsencrypt-istio.yaml b/infrastructure/cert-manager/yc-k8s-test/clusterissuer-letsencrypt-istio.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/clusterissuer-letsencrypt-istio.yaml rename to infrastructure/cert-manager/yc-k8s-test/clusterissuer-letsencrypt-istio.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/clusterissuer-letsencrypt.yaml b/infrastructure/cert-manager/yc-k8s-test/clusterissuer-letsencrypt.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/clusterissuer-letsencrypt.yaml rename to infrastructure/cert-manager/yc-k8s-test/clusterissuer-letsencrypt.yaml diff --git a/infrastructure/cert-manager/yc-k8s-test/kustomization.yaml b/infrastructure/cert-manager/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..7d2ee3b --- /dev/null +++ b/infrastructure/cert-manager/yc-k8s-test/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: cert-manager.yaml + - path: clusterissuer-letsencrypt.yaml + - path: clusterissuer-letsencrypt-istio.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/dashboard.yaml b/infrastructure/dashboard/yc-k8s-test/dashboard.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/dashboard.yaml rename to infrastructure/dashboard/yc-k8s-test/dashboard.yaml diff --git a/infrastructure/dashboard/yc-k8s-test/kustomization.yaml b/infrastructure/dashboard/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..1e73b3b --- /dev/null +++ b/infrastructure/dashboard/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: dashboard.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/glitchtip.yaml b/infrastructure/glitchtip/yc-k8s-test/glitchtip.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/glitchtip.yaml rename to infrastructure/glitchtip/yc-k8s-test/glitchtip.yaml diff --git a/infrastructure/glitchtip/yc-k8s-test/kustomization.yaml b/infrastructure/glitchtip/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..5942157 --- /dev/null +++ b/infrastructure/glitchtip/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: glitchtip.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/istio-base.yaml b/infrastructure/istio-base/yc-k8s-test/istio-base.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/istio-base.yaml rename to infrastructure/istio-base/yc-k8s-test/istio-base.yaml diff --git a/infrastructure/istio-base/yc-k8s-test/kustomization.yaml b/infrastructure/istio-base/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..0bf8d30 --- /dev/null +++ b/infrastructure/istio-base/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: istio-base.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/istio-config.yaml b/infrastructure/istio-config/yc-k8s-test/istio-config.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/istio-config.yaml rename to infrastructure/istio-config/yc-k8s-test/istio-config.yaml diff --git a/infrastructure/istio-config/yc-k8s-test/kustomization.yaml b/infrastructure/istio-config/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..894c51a --- /dev/null +++ b/infrastructure/istio-config/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: istio-config.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/istio-gateway.yaml b/infrastructure/istio-gateway/yc-k8s-test/istio-gateway.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/istio-gateway.yaml rename to infrastructure/istio-gateway/yc-k8s-test/istio-gateway.yaml diff --git a/infrastructure/istio-gateway/yc-k8s-test/kustomization.yaml b/infrastructure/istio-gateway/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..ecc3c36 --- /dev/null +++ b/infrastructure/istio-gateway/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: istio-gateway.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/istio-pilot.yaml b/infrastructure/istio-pilot/yc-k8s-test/istio-pilot.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/istio-pilot.yaml rename to infrastructure/istio-pilot/yc-k8s-test/istio-pilot.yaml diff --git a/infrastructure/istio-pilot/yc-k8s-test/kustomization.yaml b/infrastructure/istio-pilot/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..252e659 --- /dev/null +++ b/infrastructure/istio-pilot/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: istio-pilot.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/kafka.yaml b/infrastructure/kafka/yc-k8s-test/kafka.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/kafka.yaml rename to infrastructure/kafka/yc-k8s-test/kafka.yaml diff --git a/infrastructure/kafka/yc-k8s-test/kustomization.yaml b/infrastructure/kafka/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..f60b1c1 --- /dev/null +++ b/infrastructure/kafka/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: kafka.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/keycloak.yaml b/infrastructure/keycloak/yc-k8s-test/keycloak.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/keycloak.yaml rename to infrastructure/keycloak/yc-k8s-test/keycloak.yaml diff --git a/infrastructure/keycloak/yc-k8s-test/kustomization.yaml b/infrastructure/keycloak/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..ff5985b --- /dev/null +++ b/infrastructure/keycloak/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: keycloak.yaml diff --git a/infrastructure/local-path-provisioner/yc-k8s-test/kustomization.yaml b/infrastructure/local-path-provisioner/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..5be1e3d --- /dev/null +++ b/infrastructure/local-path-provisioner/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: local-path-provisioner.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/local-path-provisioner.yaml b/infrastructure/local-path-provisioner/yc-k8s-test/local-path-provisioner.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/local-path-provisioner.yaml rename to infrastructure/local-path-provisioner/yc-k8s-test/local-path-provisioner.yaml diff --git a/infrastructure/minio/yc-k8s-test/kustomization.yaml b/infrastructure/minio/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..2a83dd9 --- /dev/null +++ b/infrastructure/minio/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: minio.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/minio.yaml b/infrastructure/minio/yc-k8s-test/minio.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/minio.yaml rename to infrastructure/minio/yc-k8s-test/minio.yaml diff --git a/infrastructure/openldap/yc-k8s-test/kustomization.yaml b/infrastructure/openldap/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..8480a7c --- /dev/null +++ b/infrastructure/openldap/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: openldap.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/openldap.yaml b/infrastructure/openldap/yc-k8s-test/openldap.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/openldap.yaml rename to infrastructure/openldap/yc-k8s-test/openldap.yaml diff --git a/infrastructure/openobserve/yc-k8s-test/kustomization.yaml b/infrastructure/openobserve/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..a051eeb --- /dev/null +++ b/infrastructure/openobserve/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: openobserve.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/openobserve.yaml b/infrastructure/openobserve/yc-k8s-test/openobserve.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/openobserve.yaml rename to infrastructure/openobserve/yc-k8s-test/openobserve.yaml diff --git a/infrastructure/postgresql/yc-k8s-test/kustomization.yaml b/infrastructure/postgresql/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..f7fbc19 --- /dev/null +++ b/infrastructure/postgresql/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: postgresql.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/postgresql.yaml b/infrastructure/postgresql/yc-k8s-test/postgresql.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/postgresql.yaml rename to infrastructure/postgresql/yc-k8s-test/postgresql.yaml diff --git a/infrastructure/rabbitmq/yc-k8s-test/kustomization.yaml b/infrastructure/rabbitmq/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..e9a2db5 --- /dev/null +++ b/infrastructure/rabbitmq/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: rabbitmq.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/rabbitmq.yaml b/infrastructure/rabbitmq/yc-k8s-test/rabbitmq.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/rabbitmq.yaml rename to infrastructure/rabbitmq/yc-k8s-test/rabbitmq.yaml diff --git a/infrastructure/redis/yc-k8s-test/kustomization.yaml b/infrastructure/redis/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..5490543 --- /dev/null +++ b/infrastructure/redis/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: redis.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/redis.yaml b/infrastructure/redis/yc-k8s-test/redis.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/redis.yaml rename to infrastructure/redis/yc-k8s-test/redis.yaml diff --git a/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml b/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..8c20cea --- /dev/null +++ b/infrastructure/s3-proxy/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: s3-proxy.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/s3-proxy.yaml b/infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/s3-proxy.yaml rename to infrastructure/s3-proxy/yc-k8s-test/s3-proxy.yaml diff --git a/infrastructure/vault/yc-k8s-test/kustomization.yaml b/infrastructure/vault/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..dd86ecb --- /dev/null +++ b/infrastructure/vault/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: vault.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/vault.yaml b/infrastructure/vault/yc-k8s-test/vault.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/vault.yaml rename to infrastructure/vault/yc-k8s-test/vault.yaml diff --git a/infrastructure/zitadel/yc-k8s-test/kustomization.yaml b/infrastructure/zitadel/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..17fee7c --- /dev/null +++ b/infrastructure/zitadel/yc-k8s-test/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: zitadel.yaml diff --git a/clusters/yc-k8s-test/infrastructure/patches/zitadel.yaml b/infrastructure/zitadel/yc-k8s-test/zitadel.yaml similarity index 100% rename from clusters/yc-k8s-test/infrastructure/patches/zitadel.yaml rename to infrastructure/zitadel/yc-k8s-test/zitadel.yaml