From 63cdb767e66b99d3413cbb9f1583fc31d6da8e91 Mon Sep 17 00:00:00 2001 From: Kochetkov S Date: Wed, 15 Jul 2026 13:00:34 +0300 Subject: [PATCH] ++ move ugmk infrastructure patches to overlays --- .../infrastructure/kustomization.yaml | 114 +----------------- clusters/d8-ugmk-prod/kustomization.yaml | 1 + .../d8-ugmk-prod}/camunda-namespace.yaml | 0 .../camunda/d8-ugmk-prod}/camunda.yaml | 0 .../camunda/d8-ugmk-prod/kustomization.yaml | 7 ++ .../d8-ugmk-prod}/istio-config.yaml | 0 .../d8-ugmk-prod/kustomization.yaml | 6 + .../kafka/d8-ugmk-prod}/kafka-namespace.yaml | 0 .../kafka/d8-ugmk-prod}/kafka.yaml | 0 .../kafka/d8-ugmk-prod/kustomization.yaml | 7 ++ .../d8-ugmk-prod/kustomization.yaml | 28 +++++ .../postgresql-namespace-delete.yaml | 0 .../postgresql/d8-ugmk-prod}/postgresql.yaml | 0 .../rabbitmq/d8-ugmk-prod/kustomization.yaml | 7 ++ .../d8-ugmk-prod}/rabbitmq-namespace.yaml | 0 .../rabbitmq/d8-ugmk-prod}/rabbitmq.yaml | 0 .../vault/d8-ugmk-prod/kustomization.yaml | 7 ++ .../vault/d8-ugmk-prod}/vault-namespace.yaml | 0 .../vault/d8-ugmk-prod}/vault.yaml | 0 .../zitadel/d8-ugmk-prod/kustomization.yaml | 7 ++ .../d8-ugmk-prod}/zitadel-namespace.yaml | 0 .../zitadel/d8-ugmk-prod}/zitadel.yaml | 0 22 files changed, 76 insertions(+), 108 deletions(-) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/camunda/d8-ugmk-prod}/camunda-namespace.yaml (100%) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/camunda/d8-ugmk-prod}/camunda.yaml (100%) create mode 100644 infrastructure/camunda/d8-ugmk-prod/kustomization.yaml rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/istio-config/d8-ugmk-prod}/istio-config.yaml (100%) create mode 100644 infrastructure/istio-config/d8-ugmk-prod/kustomization.yaml rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/kafka/d8-ugmk-prod}/kafka-namespace.yaml (100%) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/kafka/d8-ugmk-prod}/kafka.yaml (100%) create mode 100644 infrastructure/kafka/d8-ugmk-prod/kustomization.yaml create mode 100644 infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/postgresql/d8-ugmk-prod}/postgresql-namespace-delete.yaml (100%) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/postgresql/d8-ugmk-prod}/postgresql.yaml (100%) create mode 100644 infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/rabbitmq/d8-ugmk-prod}/rabbitmq-namespace.yaml (100%) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/rabbitmq/d8-ugmk-prod}/rabbitmq.yaml (100%) create mode 100644 infrastructure/vault/d8-ugmk-prod/kustomization.yaml rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/vault/d8-ugmk-prod}/vault-namespace.yaml (100%) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/vault/d8-ugmk-prod}/vault.yaml (100%) create mode 100644 infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/zitadel/d8-ugmk-prod}/zitadel-namespace.yaml (100%) rename {clusters/d8-ugmk-prod/infrastructure/patches => infrastructure/zitadel/d8-ugmk-prod}/zitadel.yaml (100%) diff --git a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml index 36cac89..07f1f1e 100644 --- a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml +++ b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml @@ -1,111 +1,9 @@ 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 - kubernetes.io/hostname: um-sarex-k8s-master-01 - - op: replace - path: /spec/values/primary/tolerations - value: - - key: node-role.kubernetes.io/control-plane - operator: Exists - effect: NoSchedule - 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 + - ../../../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 diff --git a/clusters/d8-ugmk-prod/kustomization.yaml b/clusters/d8-ugmk-prod/kustomization.yaml index 9e4516b..77f08f9 100644 --- a/clusters/d8-ugmk-prod/kustomization.yaml +++ b/clusters/d8-ugmk-prod/kustomization.yaml @@ -4,5 +4,6 @@ resources: - ./flux-system - ./helm-repositories.yaml - ./infrastructure + - ../../infrastructure/istio-config/d8-ugmk-prod - ./istio-ingress - ./bootstrap-jobs diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/camunda-namespace.yaml b/infrastructure/camunda/d8-ugmk-prod/camunda-namespace.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/camunda-namespace.yaml rename to infrastructure/camunda/d8-ugmk-prod/camunda-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/camunda.yaml b/infrastructure/camunda/d8-ugmk-prod/camunda.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/camunda.yaml rename to infrastructure/camunda/d8-ugmk-prod/camunda.yaml diff --git a/infrastructure/camunda/d8-ugmk-prod/kustomization.yaml b/infrastructure/camunda/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..e80d807 --- /dev/null +++ b/infrastructure/camunda/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: camunda.yaml + - path: camunda-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/istio-config.yaml b/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/istio-config.yaml rename to infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml diff --git a/infrastructure/istio-config/d8-ugmk-prod/kustomization.yaml b/infrastructure/istio-config/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..894c51a --- /dev/null +++ b/infrastructure/istio-config/d8-ugmk-prod/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/d8-ugmk-prod/infrastructure/patches/kafka-namespace.yaml b/infrastructure/kafka/d8-ugmk-prod/kafka-namespace.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/kafka-namespace.yaml rename to infrastructure/kafka/d8-ugmk-prod/kafka-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/kafka.yaml b/infrastructure/kafka/d8-ugmk-prod/kafka.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/kafka.yaml rename to infrastructure/kafka/d8-ugmk-prod/kafka.yaml diff --git a/infrastructure/kafka/d8-ugmk-prod/kustomization.yaml b/infrastructure/kafka/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..0c35bed --- /dev/null +++ b/infrastructure/kafka/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: kafka.yaml + - path: kafka-namespace.yaml diff --git a/infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml b/infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..d5c44f3 --- /dev/null +++ b/infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,28 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: postgresql.yaml + - patch: |- + - op: replace + path: /metadata/namespace + value: zitadel + - op: replace + path: /spec/values/primary/nodeSelector + value: + dedicated: null + kubernetes.io/hostname: um-sarex-k8s-master-01 + - op: replace + path: /spec/values/primary/tolerations + value: + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: postgresql + namespace: postgresql + - path: postgresql-namespace-delete.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/postgresql-namespace-delete.yaml b/infrastructure/postgresql/d8-ugmk-prod/postgresql-namespace-delete.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/postgresql-namespace-delete.yaml rename to infrastructure/postgresql/d8-ugmk-prod/postgresql-namespace-delete.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml b/infrastructure/postgresql/d8-ugmk-prod/postgresql.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml rename to infrastructure/postgresql/d8-ugmk-prod/postgresql.yaml diff --git a/infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml b/infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..961714e --- /dev/null +++ b/infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: rabbitmq.yaml + - path: rabbitmq-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq-namespace.yaml b/infrastructure/rabbitmq/d8-ugmk-prod/rabbitmq-namespace.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq-namespace.yaml rename to infrastructure/rabbitmq/d8-ugmk-prod/rabbitmq-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq.yaml b/infrastructure/rabbitmq/d8-ugmk-prod/rabbitmq.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq.yaml rename to infrastructure/rabbitmq/d8-ugmk-prod/rabbitmq.yaml diff --git a/infrastructure/vault/d8-ugmk-prod/kustomization.yaml b/infrastructure/vault/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..0597d85 --- /dev/null +++ b/infrastructure/vault/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: vault.yaml + - path: vault-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/vault-namespace.yaml b/infrastructure/vault/d8-ugmk-prod/vault-namespace.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/vault-namespace.yaml rename to infrastructure/vault/d8-ugmk-prod/vault-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/vault.yaml b/infrastructure/vault/d8-ugmk-prod/vault.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/vault.yaml rename to infrastructure/vault/d8-ugmk-prod/vault.yaml diff --git a/infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml b/infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..9248de4 --- /dev/null +++ b/infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: zitadel.yaml + - path: zitadel-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/zitadel-namespace.yaml b/infrastructure/zitadel/d8-ugmk-prod/zitadel-namespace.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/zitadel-namespace.yaml rename to infrastructure/zitadel/d8-ugmk-prod/zitadel-namespace.yaml diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml b/infrastructure/zitadel/d8-ugmk-prod/zitadel.yaml similarity index 100% rename from clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml rename to infrastructure/zitadel/d8-ugmk-prod/zitadel.yaml