Compare commits

...

3 Commits

Author SHA1 Message Date
emelinda
2f33a4bdb3 refactor(d8-ugmk-prod): move istio-config to per-cluster overlay
Relocated `istio-config` from `clusters/d8-ugmk-prod/infrastructure` into `infrastructure/istio-config/d8-ugmk-prod` overlay. Updated kustomization files to reference the new overlay structure. Removed unused patches and flattened resource definitions.
2026-07-15 12:09:49 +03:00
emelinda
69c484abe3 Merge branch 'master' of gitlab.sarex.io:infra/iac into refactoring/d8-ugmk-prod
# Conflicts:
#	clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
2026-07-15 12:04:00 +03:00
emelinda
1e1971317d refactor(d8-ugmk-prod): move infrastructure patches into per-module overlays
Relocate patches from clusters/d8-ugmk-prod/infrastructure/patches into
infrastructure/<module>/d8-ugmk-prod/ overlays (base + patches), matching
the apps/<app>/<cluster> and existing yc-k8s-test layout.

clusters/d8-ugmk-prod/infrastructure/kustomization.yaml now just references
the kafka, rabbitmq, camunda, vault, postgresql and zitadel overlays, with
no patches block. The patches/ directory is removed.

No rendered change: HelmRelease, namespace patches are preserved 1:1.
2026-07-15 12:01:32 +03:00
22 changed files with 79 additions and 112 deletions

View File

@ -1,111 +0,0 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../../infrastructure/kafka
- ../../../infrastructure/rabbitmq
- ../../../infrastructure/camunda
- ../../../infrastructure/vault
- ../../../infrastructure/postgresql
- ../../../infrastructure/zitadel
- ../../../infrastructure/istio-config
patches:
- path: ./patches/kafka.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: kafka
namespace: kafka
- path: ./patches/kafka-namespace.yaml
target:
version: v1
kind: Namespace
name: kafka
- path: ./patches/rabbitmq.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: rabbitmq
namespace: rabbitmq
- path: ./patches/rabbitmq-namespace.yaml
target:
version: v1
kind: Namespace
name: rabbitmq
- path: ./patches/camunda.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: camunda
namespace: camunda
- path: ./patches/camunda-namespace.yaml
target:
version: v1
kind: Namespace
name: camunda
- path: ./patches/vault.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: vault
namespace: vault
- path: ./patches/vault-namespace.yaml
target:
version: v1
kind: Namespace
name: vault
- path: ./patches/postgresql.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: postgresql
namespace: postgresql
- patch: |-
- op: replace
path: /metadata/namespace
value: zitadel
- op: replace
path: /spec/values/primary/nodeSelector
value:
dedicated: null
node.deckhouse.io/group: generic
- op: replace
path: /spec/values/primary/tolerations
value:
- key: dedicated.deckhouse.io
operator: Equal
value: generic
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: postgresql
namespace: postgresql
- path: ./patches/postgresql-namespace-delete.yaml
target:
version: v1
kind: Namespace
name: postgresql
- path: ./patches/zitadel.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: zitadel
namespace: zitadel
- path: ./patches/zitadel-namespace.yaml
target:
version: v1
kind: Namespace
name: zitadel
- path: ./patches/istio-config.yaml
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: istio-config
namespace: default

View File

@ -3,5 +3,14 @@ kind: Kustomization
resources:
- ./flux-system
- ./helm-repositories.yaml
- ./infrastructure
# infrastructure
- ../../infrastructure/kafka/d8-ugmk-prod
- ../../infrastructure/rabbitmq/d8-ugmk-prod
- ../../infrastructure/camunda/d8-ugmk-prod
- ../../infrastructure/vault/d8-ugmk-prod
- ../../infrastructure/postgresql/d8-ugmk-prod
- ../../infrastructure/zitadel/d8-ugmk-prod
- ../../infrastructure/istio-config/d8-ugmk-prod
- ./bootstrap-jobs

View File

@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: namespace.yaml
- path: camunda.yaml

View File

@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: istio-config.yaml

View File

@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: namespace.yaml
- path: kafka.yaml

View File

@ -0,0 +1,28 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: postgresql.yaml
- path: namespace.yaml
- patch: |-
- op: replace
path: /metadata/namespace
value: zitadel
- op: replace
path: /spec/values/primary/nodeSelector
value:
dedicated: null
node.deckhouse.io/group: generic
- op: replace
path: /spec/values/primary/tolerations
value:
- key: dedicated.deckhouse.io
operator: Equal
value: generic
target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: postgresql
namespace: postgresql

View File

@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: namespace.yaml
- path: rabbitmq.yaml

View File

@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: namespace.yaml
- path: vault.yaml

View File

@ -0,0 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../base
patches:
- path: namespace.yaml
- path: zitadel.yaml