diff --git a/clusters/brusnika-stage/infrastructure/kustomization.yaml b/clusters/brusnika-stage/infrastructure/kustomization.yaml index dcf5124..d57bd25 100644 --- a/clusters/brusnika-stage/infrastructure/kustomization.yaml +++ b/clusters/brusnika-stage/infrastructure/kustomization.yaml @@ -3,128 +3,19 @@ kind: Kustomization resources: - ../../../infrastructure/istio-base - ../../../infrastructure/istio-pilot - - ../../../infrastructure/istio-gateway - - ../../../infrastructure/istio-config - - ../../../infrastructure/vault - - ../../../infrastructure/rabbitmq - - ../../../infrastructure/zitadel - - ../../../infrastructure/openobserve - - ../../../infrastructure/vmstack - - ../../../infrastructure/prometheus-stack - - ../../../infrastructure/opentelemetry-operator - - ../../../infrastructure/opentelemetry-collector - - ../../../infrastructure/goalert - - ../../../infrastructure/kafka-exporter - - ../../../infrastructure/postgres-exporter - - ./lb-service-override.yaml - - ./vault-ingress.yaml + - ../../../infrastructure/istio-gateway/brusnika-stage + - ../../../infrastructure/istio-config/brusnika-stage + - ../../../infrastructure/vault/brusnika-stage + - ../../../infrastructure/rabbitmq/brusnika-stage + - ../../../infrastructure/zitadel/brusnika-stage + - ../../../infrastructure/openobserve/brusnika-stage + - ../../../infrastructure/vmstack/brusnika-stage + - ../../../infrastructure/prometheus-stack/brusnika-stage + - ../../../infrastructure/opentelemetry-operator/brusnika-stage + - ../../../infrastructure/opentelemetry-collector/brusnika-stage + - ../../../infrastructure/goalert/brusnika-stage + - ../../../infrastructure/kafka-exporter/brusnika-stage + - ../../../infrastructure/postgres-exporter/brusnika-stage + - ../../../infrastructure/failed-pod-cleanup/brusnika-stage - ./clusterissuer-letsencrypt.yaml - - ./node-exporter-vmnodescrape.yaml - - ./istio-gateway-stats-scrape.yaml - - ./istio-dashboard-compat-vmrule.yaml - ./camunda-servicemonitors.yaml - - ./rabbitmq-exporter.yaml - - ./kafka-exporter-yc.yaml - - ./kafka-exporter-yc-rules.yaml - - ./kafka-exporter-yc-dashboard.yaml - - ../../../infrastructure/failed-pod-cleanup -patches: - - path: ./patches/istio-gateway.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: ingressgateway - namespace: istio-system - - path: ./patches/istio-config.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: istio-config - namespace: default - - path: ./patches/vault.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: vault - namespace: vault - - path: ./patches/rabbitmq.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: rabbitmq - namespace: rabbitmq - - path: ./patches/zitadel.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: zitadel - namespace: zitadel - - path: ./patches/openobserve.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: openobserve - namespace: openobserve - - path: ./patches/vmstack.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: vmstack - namespace: vmstack - - path: ./patches/prometheus-stack.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: prometheus-stack - namespace: prometheus-stack - - path: ./patches/opentelemetry-operator.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: opentelemetry-operator - namespace: opentelemetry-operator - - path: ./patches/opentelemetry-collector.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: opentelemetry-collector - namespace: opentelemetry-collector - - path: ./patches/goalert.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: goalert - namespace: goalert - - path: ./patches/kafka-exporter.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: kafka-exporter - namespace: kafka-exporter - - path: ./patches/postgres-exporter.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: postgres-exporter - namespace: postgres-exporter - - - path: ./patches/failed-pod-cleanup.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: failed-pod-cleanup - namespace: default diff --git a/clusters/brusnika-stage/infrastructure/patches/failed-pod-cleanup.yaml b/infrastructure/failed-pod-cleanup/brusnika-stage/failed-pod-cleanup.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/failed-pod-cleanup.yaml rename to infrastructure/failed-pod-cleanup/brusnika-stage/failed-pod-cleanup.yaml diff --git a/infrastructure/failed-pod-cleanup/brusnika-stage/kustomization.yaml b/infrastructure/failed-pod-cleanup/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..2858620 --- /dev/null +++ b/infrastructure/failed-pod-cleanup/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./failed-pod-cleanup.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: failed-pod-cleanup + namespace: default diff --git a/clusters/brusnika-stage/infrastructure/patches/goalert.yaml b/infrastructure/goalert/brusnika-stage/goalert.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/goalert.yaml rename to infrastructure/goalert/brusnika-stage/goalert.yaml diff --git a/infrastructure/goalert/brusnika-stage/kustomization.yaml b/infrastructure/goalert/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..d4aea85 --- /dev/null +++ b/infrastructure/goalert/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./goalert.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: goalert + namespace: goalert diff --git a/clusters/brusnika-stage/infrastructure/patches/istio-config.yaml b/infrastructure/istio-config/brusnika-stage/istio-config.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/istio-config.yaml rename to infrastructure/istio-config/brusnika-stage/istio-config.yaml diff --git a/infrastructure/istio-config/brusnika-stage/kustomization.yaml b/infrastructure/istio-config/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..d4679f4 --- /dev/null +++ b/infrastructure/istio-config/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./istio-config.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: istio-config + namespace: default diff --git a/clusters/brusnika-stage/infrastructure/istio-dashboard-compat-vmrule.yaml b/infrastructure/istio-gateway/brusnika-stage/istio-dashboard-compat-vmrule.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/istio-dashboard-compat-vmrule.yaml rename to infrastructure/istio-gateway/brusnika-stage/istio-dashboard-compat-vmrule.yaml diff --git a/clusters/brusnika-stage/infrastructure/istio-gateway-stats-scrape.yaml b/infrastructure/istio-gateway/brusnika-stage/istio-gateway-stats-scrape.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/istio-gateway-stats-scrape.yaml rename to infrastructure/istio-gateway/brusnika-stage/istio-gateway-stats-scrape.yaml diff --git a/clusters/brusnika-stage/infrastructure/patches/istio-gateway.yaml b/infrastructure/istio-gateway/brusnika-stage/istio-gateway.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/istio-gateway.yaml rename to infrastructure/istio-gateway/brusnika-stage/istio-gateway.yaml diff --git a/infrastructure/istio-gateway/brusnika-stage/kustomization.yaml b/infrastructure/istio-gateway/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..e9ba26a --- /dev/null +++ b/infrastructure/istio-gateway/brusnika-stage/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base + - ./istio-gateway-stats-scrape.yaml + - ./istio-dashboard-compat-vmrule.yaml + - ./lb-service-override.yaml +patches: + - path: ./istio-gateway.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: ingressgateway + namespace: istio-system diff --git a/clusters/brusnika-stage/infrastructure/lb-service-override.yaml b/infrastructure/istio-gateway/brusnika-stage/lb-service-override.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/lb-service-override.yaml rename to infrastructure/istio-gateway/brusnika-stage/lb-service-override.yaml diff --git a/clusters/brusnika-stage/infrastructure/kafka-exporter-yc-dashboard.yaml b/infrastructure/kafka-exporter/brusnika-stage/kafka-exporter-yc-dashboard.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/kafka-exporter-yc-dashboard.yaml rename to infrastructure/kafka-exporter/brusnika-stage/kafka-exporter-yc-dashboard.yaml diff --git a/clusters/brusnika-stage/infrastructure/kafka-exporter-yc-rules.yaml b/infrastructure/kafka-exporter/brusnika-stage/kafka-exporter-yc-rules.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/kafka-exporter-yc-rules.yaml rename to infrastructure/kafka-exporter/brusnika-stage/kafka-exporter-yc-rules.yaml diff --git a/clusters/brusnika-stage/infrastructure/kafka-exporter-yc.yaml b/infrastructure/kafka-exporter/brusnika-stage/kafka-exporter-yc.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/kafka-exporter-yc.yaml rename to infrastructure/kafka-exporter/brusnika-stage/kafka-exporter-yc.yaml diff --git a/clusters/brusnika-stage/infrastructure/patches/kafka-exporter.yaml b/infrastructure/kafka-exporter/brusnika-stage/kafka-exporter.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/kafka-exporter.yaml rename to infrastructure/kafka-exporter/brusnika-stage/kafka-exporter.yaml diff --git a/infrastructure/kafka-exporter/brusnika-stage/kustomization.yaml b/infrastructure/kafka-exporter/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..a80a531 --- /dev/null +++ b/infrastructure/kafka-exporter/brusnika-stage/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base + - ./kafka-exporter-yc.yaml + - ./kafka-exporter-yc-rules.yaml + - ./kafka-exporter-yc-dashboard.yaml +patches: + - path: ./kafka-exporter.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: kafka-exporter + namespace: kafka-exporter diff --git a/infrastructure/openobserve/brusnika-stage/kustomization.yaml b/infrastructure/openobserve/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..f95323b --- /dev/null +++ b/infrastructure/openobserve/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./openobserve.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: openobserve + namespace: openobserve diff --git a/clusters/brusnika-stage/infrastructure/patches/openobserve.yaml b/infrastructure/openobserve/brusnika-stage/openobserve.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/openobserve.yaml rename to infrastructure/openobserve/brusnika-stage/openobserve.yaml diff --git a/infrastructure/opentelemetry-collector/brusnika-stage/kustomization.yaml b/infrastructure/opentelemetry-collector/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..7c0cd7a --- /dev/null +++ b/infrastructure/opentelemetry-collector/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./opentelemetry-collector.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: opentelemetry-collector + namespace: opentelemetry-collector diff --git a/clusters/brusnika-stage/infrastructure/patches/opentelemetry-collector.yaml b/infrastructure/opentelemetry-collector/brusnika-stage/opentelemetry-collector.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/opentelemetry-collector.yaml rename to infrastructure/opentelemetry-collector/brusnika-stage/opentelemetry-collector.yaml diff --git a/infrastructure/opentelemetry-operator/brusnika-stage/kustomization.yaml b/infrastructure/opentelemetry-operator/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..4809976 --- /dev/null +++ b/infrastructure/opentelemetry-operator/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./opentelemetry-operator.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: opentelemetry-operator + namespace: opentelemetry-operator diff --git a/clusters/brusnika-stage/infrastructure/patches/opentelemetry-operator.yaml b/infrastructure/opentelemetry-operator/brusnika-stage/opentelemetry-operator.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/opentelemetry-operator.yaml rename to infrastructure/opentelemetry-operator/brusnika-stage/opentelemetry-operator.yaml diff --git a/infrastructure/postgres-exporter/brusnika-stage/kustomization.yaml b/infrastructure/postgres-exporter/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..59add8d --- /dev/null +++ b/infrastructure/postgres-exporter/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./postgres-exporter.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: postgres-exporter + namespace: postgres-exporter diff --git a/clusters/brusnika-stage/infrastructure/patches/postgres-exporter.yaml b/infrastructure/postgres-exporter/brusnika-stage/postgres-exporter.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/postgres-exporter.yaml rename to infrastructure/postgres-exporter/brusnika-stage/postgres-exporter.yaml diff --git a/infrastructure/prometheus-stack/brusnika-stage/kustomization.yaml b/infrastructure/prometheus-stack/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..a23bcc0 --- /dev/null +++ b/infrastructure/prometheus-stack/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./prometheus-stack.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: prometheus-stack + namespace: prometheus-stack diff --git a/clusters/brusnika-stage/infrastructure/patches/prometheus-stack.yaml b/infrastructure/prometheus-stack/brusnika-stage/prometheus-stack.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/prometheus-stack.yaml rename to infrastructure/prometheus-stack/brusnika-stage/prometheus-stack.yaml diff --git a/infrastructure/rabbitmq/brusnika-stage/kustomization.yaml b/infrastructure/rabbitmq/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..5cd8762 --- /dev/null +++ b/infrastructure/rabbitmq/brusnika-stage/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base + - ./rabbitmq-exporter.yaml +patches: + - path: ./rabbitmq.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: rabbitmq + namespace: rabbitmq diff --git a/clusters/brusnika-stage/infrastructure/rabbitmq-exporter.yaml b/infrastructure/rabbitmq/brusnika-stage/rabbitmq-exporter.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/rabbitmq-exporter.yaml rename to infrastructure/rabbitmq/brusnika-stage/rabbitmq-exporter.yaml diff --git a/clusters/brusnika-stage/infrastructure/patches/rabbitmq.yaml b/infrastructure/rabbitmq/brusnika-stage/rabbitmq.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/rabbitmq.yaml rename to infrastructure/rabbitmq/brusnika-stage/rabbitmq.yaml diff --git a/infrastructure/vault/brusnika-stage/kustomization.yaml b/infrastructure/vault/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..0be6d42 --- /dev/null +++ b/infrastructure/vault/brusnika-stage/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base + - ./vault-ingress.yaml +patches: + - path: ./vault.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: vault + namespace: vault diff --git a/clusters/brusnika-stage/infrastructure/vault-ingress.yaml b/infrastructure/vault/brusnika-stage/vault-ingress.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/vault-ingress.yaml rename to infrastructure/vault/brusnika-stage/vault-ingress.yaml diff --git a/clusters/brusnika-stage/infrastructure/patches/vault.yaml b/infrastructure/vault/brusnika-stage/vault.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/vault.yaml rename to infrastructure/vault/brusnika-stage/vault.yaml diff --git a/infrastructure/vmstack/brusnika-stage/kustomization.yaml b/infrastructure/vmstack/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..a4e096c --- /dev/null +++ b/infrastructure/vmstack/brusnika-stage/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base + - ./node-exporter-vmnodescrape.yaml +patches: + - path: ./vmstack.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: vmstack + namespace: vmstack diff --git a/clusters/brusnika-stage/infrastructure/node-exporter-vmnodescrape.yaml b/infrastructure/vmstack/brusnika-stage/node-exporter-vmnodescrape.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/node-exporter-vmnodescrape.yaml rename to infrastructure/vmstack/brusnika-stage/node-exporter-vmnodescrape.yaml diff --git a/clusters/brusnika-stage/infrastructure/patches/vmstack.yaml b/infrastructure/vmstack/brusnika-stage/vmstack.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/vmstack.yaml rename to infrastructure/vmstack/brusnika-stage/vmstack.yaml diff --git a/infrastructure/zitadel/brusnika-stage/kustomization.yaml b/infrastructure/zitadel/brusnika-stage/kustomization.yaml new file mode 100644 index 0000000..28c6bb1 --- /dev/null +++ b/infrastructure/zitadel/brusnika-stage/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: ./zitadel.yaml + target: + group: helm.toolkit.fluxcd.io + version: v2 + kind: HelmRelease + name: zitadel + namespace: zitadel diff --git a/clusters/brusnika-stage/infrastructure/patches/zitadel.yaml b/infrastructure/zitadel/brusnika-stage/zitadel.yaml similarity index 100% rename from clusters/brusnika-stage/infrastructure/patches/zitadel.yaml rename to infrastructure/zitadel/brusnika-stage/zitadel.yaml