From 1c3525fc1b6a97873de37c9da88ec1b3b0b0b40d Mon Sep 17 00:00:00 2001 From: Kochetkov S Date: Wed, 28 Oct 2026 11:15:41 +0300 Subject: [PATCH] ++ stand platform layer zitadel --- clusters/stand/30-platform/kustomization.yaml | 4 + clusters/stand/layers.yaml | 19 +++ .../contour-template/kustomization.yaml | 6 + .../zitadel/contour-template/zitadel.yaml | 157 ++++++++++++++++++ 4 files changed, 186 insertions(+) create mode 100644 clusters/stand/30-platform/kustomization.yaml create mode 100644 infrastructure/zitadel/contour-template/kustomization.yaml create mode 100644 infrastructure/zitadel/contour-template/zitadel.yaml diff --git a/clusters/stand/30-platform/kustomization.yaml b/clusters/stand/30-platform/kustomization.yaml new file mode 100644 index 0000000..c85a9e1 --- /dev/null +++ b/clusters/stand/30-platform/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../../infrastructure/zitadel/contour-template diff --git a/clusters/stand/layers.yaml b/clusters/stand/layers.yaml index 5b6200e..87a6fd0 100644 --- a/clusters/stand/layers.yaml +++ b/clusters/stand/layers.yaml @@ -53,3 +53,22 @@ spec: substituteFrom: - kind: ConfigMap name: contour-vars +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: 30-platform + namespace: flux-system +spec: + interval: 10m0s + timeout: 20m0s + path: ./clusters/stand/30-platform + prune: true + wait: true + sourceRef: + kind: GitRepository + name: flux-system + postBuild: + substituteFrom: + - kind: ConfigMap + name: contour-vars diff --git a/infrastructure/zitadel/contour-template/kustomization.yaml b/infrastructure/zitadel/contour-template/kustomization.yaml new file mode 100644 index 0000000..17fee7c --- /dev/null +++ b/infrastructure/zitadel/contour-template/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: zitadel.yaml diff --git a/infrastructure/zitadel/contour-template/zitadel.yaml b/infrastructure/zitadel/contour-template/zitadel.yaml new file mode 100644 index 0000000..ba42a20 --- /dev/null +++ b/infrastructure/zitadel/contour-template/zitadel.yaml @@ -0,0 +1,157 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: zitadel + namespace: zitadel +spec: + interval: 5m + timeout: 10m + dependsOn: + - name: postgresql + namespace: postgresql + postRenderers: + - kustomize: + patches: + - target: + group: apps + version: v1 + kind: Deployment + name: zitadel-idp-contour + patch: |- + - op: add + path: /spec/template/spec/nodeSelector + value: + dedicated: generic + - op: add + path: /spec/template/spec/tolerations + value: [] + - op: replace + path: /spec/template/metadata/annotations/vault.hashicorp.com~1agent-inject-template-zitadel-vault-config.yaml + value: |- + {{- with secret "secrets/data/zitadel/postgresql" -}} + Database: + postgres: + User: + Password: |- + {{ index .Data.data "password" }} + Admin: + Password: |- + {{ index .Data.data "password" }} + FirstInstance: + Org: + Human: + Password: |- + {{ index .Data.data "humanPassword" }} + {{- end -}} + - target: + group: batch + version: v1 + kind: Job + name: zitadel-idp-contour-init + patch: |- + - op: add + path: /spec/template/spec/nodeSelector + value: + dedicated: generic + - op: add + path: /spec/template/spec/tolerations + value: [] + - op: replace + path: /spec/template/metadata/annotations/vault.hashicorp.com~1agent-inject-template-zitadel-vault-config.yaml + value: |- + {{- with secret "secrets/data/zitadel/postgresql" -}} + Database: + postgres: + User: + Password: |- + {{ index .Data.data "password" }} + Admin: + Password: |- + {{ index .Data.data "password" }} + FirstInstance: + Org: + Human: + Password: |- + {{ index .Data.data "humanPassword" }} + {{- end -}} + - target: + group: batch + version: v1 + kind: Job + name: zitadel-idp-contour-setup + patch: |- + - op: add + path: /spec/template/spec/nodeSelector + value: + dedicated: generic + - op: add + path: /spec/template/spec/tolerations + value: [] + - op: replace + path: /spec/template/metadata/annotations/vault.hashicorp.com~1agent-inject-template-zitadel-vault-config.yaml + value: |- + {{- with secret "secrets/data/zitadel/postgresql" -}} + Database: + postgres: + User: + Password: |- + {{ index .Data.data "password" }} + Admin: + Password: |- + {{ index .Data.data "password" }} + FirstInstance: + Org: + Human: + Password: |- + {{ index .Data.data "humanPassword" }} + {{- end -}} + values: + zitadel: + configmapConfig: + ExternalDomain: ${HOST_LOGIN} + ExternalSecure: true + debug: + enabled: false + postgresqlSecret: + create: false + vault: + enabled: true + role: zitadel + authPath: auth/kubernetes + secretPath: secrets/data/zitadel/postgresql + secretKey: password + kvVersion: 2 + fileName: zitadel-vault-config.yaml + serviceAccount: + create: true + name: zitadel-idp-contour + replicaCount: 1 + pdb: + enabled: false + env: + - name: ZITADEL_DEFAULTINSTANCE_FEATURES_LOGINV2_REQUIRED + value: "false" + - name: ZITADEL_SYSTEMDEFAULTS_PASSWORDHASHER_VERIFIERS + value: "bcrypt,pbkdf2" + - name: ZITADEL_MACHINE_IDENTIFICATION_HOSTNAME_ENABLED + value: "true" + - name: ZITADEL_DATABASE_POSTGRES_HOST + value: "postgresql.postgresql.svc.cluster.local" + - name: ZITADEL_DATABASE_POSTGRES_PORT + value: "5432" + - name: ZITADEL_DATABASE_POSTGRES_USER_USERNAME + value: "zitadel" + - name: ZITADEL_DATABASE_POSTGRES_ADMIN_EXISTINGDATABASE + value: "zitadel" + - name: ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME + value: "zitadel" + - name: ZITADEL_DATABASE_POSTGRES_DATABASE + value: "zitadel" + - name: ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE + value: "disable" + - name: ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE + value: "disable" + - name: ZITADEL_DEFAULTINSTANCE_ORG_HUMAN_USERNAME + value: "zitadel-admin" + - name: ZITADEL_DEFAULTINSTANCE_ORG_NAME + value: "Sarex"