Merge remote-tracking branch 'origin/master'

clusters/yc-k8s-test/infrastructure/kustomization.yaml

@@ -134,3 +134,10 @@ patches:
       kind: HelmRelease
       name: openldap
       namespace: openldap
+  - path: ./patches/vault.yaml
+    target:
+      group: helm.toolkit.fluxcd.io
+      version: v2
+      kind: HelmRelease
+      name: vailt
+      namespace: vault    

clusters/yc-k8s-test/infrastructure/patches/kafka.yaml

@@ -25,6 +25,9 @@ spec:
       client:
         protocol: SASL_SSL
     sasl:
+      managedExistingSecret:
+        enabled: true
+      existingSecret: kafka-kafka-contour-user-passwords
       enabledMechanisms: PLAIN,SCRAM-SHA-512
       interBrokerMechanism: PLAIN
       controllerMechanism: PLAIN

clusters/yc-k8s-test/infrastructure/patches/vault.yaml

@@ -0,0 +1,8 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: vault
+  namespace: vault
+spec:
+  interval: 5m
+  timeout: 10m

infrastructure/kafka/base/helmrelease.yaml

@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: kafka-contour
-      version: "0.1.2"
+      version: "0.1.3"
       sourceRef:
         kind: HelmRepository
         name: yc-oci-charts

infrastructure/kustomization.yaml

@@ -19,3 +19,4 @@ resources:
   - istio-pilot
   - istio-gateway
   - zitadel
+  - vault

infrastructure/vault/base/helmrelease.yaml

@@ -0,0 +1,22 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: vault
+  namespace: vault
+spec:
+  interval: 10m
+  chart:
+    spec:
+      chart: vault-contour
+      version: "0.1.0"
+      sourceRef:
+        kind: HelmRepository
+        name: yc-oci-charts
+        namespace: flux-system
+      interval: 10m
+  install:
+    remediation:
+      retries: 3
+  upgrade:
+    remediation:
+      retries: 3

infrastructure/vault/base/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: zitadel
+resources:
+  - helmrelease.yaml
+  - namespace.yaml

infrastructure/vault/base/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: vault
+  labels:
+    istio-injection: enabled

infrastructure/vault/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - base