From 83262697c0035802c85a0b8a2a306ed462f1e6c0 Mon Sep 17 00:00:00 2001 From: Kochetkov S Date: Tue, 25 Aug 2026 18:22:55 +0300 Subject: [PATCH] ++ add vault, rabbitmq and istio for vad --- clusters/vad/flux-system/gotk-sync.yaml | 4 +- clusters/vad/kustomization.yaml | 6 ++ .../istio-base/vad/kustomization.yaml | 4 ++ .../istio-gateway/vad/kustomization.yaml | 4 ++ .../istio-pilot/vad/kustomization.yaml | 4 ++ .../rabbitmq/vad/kustomization.yaml | 6 ++ infrastructure/rabbitmq/vad/rabbitmq.yaml | 65 +++++++++++++++++++ infrastructure/vault/vad/kustomization.yaml | 6 ++ infrastructure/vault/vad/vault.yaml | 40 ++++++++++++ 9 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 infrastructure/istio-base/vad/kustomization.yaml create mode 100644 infrastructure/istio-gateway/vad/kustomization.yaml create mode 100644 infrastructure/istio-pilot/vad/kustomization.yaml create mode 100644 infrastructure/rabbitmq/vad/kustomization.yaml create mode 100644 infrastructure/rabbitmq/vad/rabbitmq.yaml create mode 100644 infrastructure/vault/vad/kustomization.yaml create mode 100644 infrastructure/vault/vad/vault.yaml diff --git a/clusters/vad/flux-system/gotk-sync.yaml b/clusters/vad/flux-system/gotk-sync.yaml index a21892d..f69d3c7 100644 --- a/clusters/vad/flux-system/gotk-sync.yaml +++ b/clusters/vad/flux-system/gotk-sync.yaml @@ -9,9 +9,7 @@ spec: interval: 1m0s ref: branch: master - secretRef: - name: flux-system - url: http://192.168.8.141:31361/gitea-admin/iac.git + url: http://192.168.8.141:31361/infra/iac.git --- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization diff --git a/clusters/vad/kustomization.yaml b/clusters/vad/kustomization.yaml index 2102b68..ad0124e 100644 --- a/clusters/vad/kustomization.yaml +++ b/clusters/vad/kustomization.yaml @@ -3,3 +3,9 @@ kind: Kustomization resources: - ./flux-system - ./helm-repositories.yaml + + - ../../infrastructure/istio-base/vad + - ../../infrastructure/istio-pilot/vad + - ../../infrastructure/istio-gateway/vad + - ../../infrastructure/vault/vad + - ../../infrastructure/rabbitmq/vad diff --git a/infrastructure/istio-base/vad/kustomization.yaml b/infrastructure/istio-base/vad/kustomization.yaml new file mode 100644 index 0000000..27bb5cb --- /dev/null +++ b/infrastructure/istio-base/vad/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base diff --git a/infrastructure/istio-gateway/vad/kustomization.yaml b/infrastructure/istio-gateway/vad/kustomization.yaml new file mode 100644 index 0000000..27bb5cb --- /dev/null +++ b/infrastructure/istio-gateway/vad/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base diff --git a/infrastructure/istio-pilot/vad/kustomization.yaml b/infrastructure/istio-pilot/vad/kustomization.yaml new file mode 100644 index 0000000..27bb5cb --- /dev/null +++ b/infrastructure/istio-pilot/vad/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base diff --git a/infrastructure/rabbitmq/vad/kustomization.yaml b/infrastructure/rabbitmq/vad/kustomization.yaml new file mode 100644 index 0000000..e9a2db5 --- /dev/null +++ b/infrastructure/rabbitmq/vad/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: rabbitmq.yaml diff --git a/infrastructure/rabbitmq/vad/rabbitmq.yaml b/infrastructure/rabbitmq/vad/rabbitmq.yaml new file mode 100644 index 0000000..194d7ec --- /dev/null +++ b/infrastructure/rabbitmq/vad/rabbitmq.yaml @@ -0,0 +1,65 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: rabbitmq + namespace: rabbitmq +spec: + interval: 5m + timeout: 10m + postRenderers: + - kustomize: + patches: + - target: + group: apps + version: v1 + kind: StatefulSet + namespace: rabbitmq + patch: |- + - op: add + path: /spec/template/spec/nodeSelector + value: + dedicated: generic + - op: add + path: /spec/template/spec/tolerations + value: [] + values: + global: + security: + allowInsecureImages: true + virtualService: null + gateway: null + certificate: null + metrics: + serviceMonitor: + enabled: false + default: + enabled: false + perObject: + enabled: false + detailed: + enabled: false + extraServiceMonitors: [] + replicaCount: 1 + resources: + requests: + memory: 1Gi + persistence: + storageClass: local-path + size: 10Gi + auth: + securePassword: true + enableLoopbackUser: false + existingPasswordSecret: "" + vault: + enabled: true + role: rabbitmq + authPath: auth/kubernetes + secretPath: secrets/data/rabbitmq/auth + usernameKey: username + passwordKey: password + advancedConfiguration: |- + [ + {rabbit, [ + {loopback_users, []} + ]} + ]. diff --git a/infrastructure/vault/vad/kustomization.yaml b/infrastructure/vault/vad/kustomization.yaml new file mode 100644 index 0000000..dd86ecb --- /dev/null +++ b/infrastructure/vault/vad/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: vault.yaml diff --git a/infrastructure/vault/vad/vault.yaml b/infrastructure/vault/vad/vault.yaml new file mode 100644 index 0000000..7204f37 --- /dev/null +++ b/infrastructure/vault/vad/vault.yaml @@ -0,0 +1,40 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: vault + namespace: vault +spec: + interval: 5m + timeout: 10m + postRenderers: + - kustomize: + patches: + - target: + group: apps + version: v1 + kind: StatefulSet + namespace: vault + name: vault-vault-contour + patch: |- + - op: replace + path: /spec/template/spec/nodeSelector + value: + dedicated: generic + - op: replace + path: /spec/template/spec/tolerations + value: [] + values: + imagePullSecrets: + - name: regcred + backup: + enabled: false + injector: + nodeSelector: + dedicated: generic + tolerations: [] + server: + nodeSelector: + dedicated: generic + tolerations: [] + dataStorage: + storageClass: local-path