diff --git a/clusters/wb/infrastructure/kustomization.yaml b/clusters/wb/infrastructure/kustomization.yaml index 62cfde2..bba712a 100644 --- a/clusters/wb/infrastructure/kustomization.yaml +++ b/clusters/wb/infrastructure/kustomization.yaml @@ -10,7 +10,6 @@ resources: - ../../../infrastructure/goalert - ../../../infrastructure/kafka-exporter - ../../../infrastructure/postgres-exporter - - ./secrets.yaml patches: - path: ./patches/glitchtip.yaml target: diff --git a/clusters/wb/infrastructure/patches/glitchtip.yaml b/clusters/wb/infrastructure/patches/glitchtip.yaml index 69eaa2f..3d5dea9 100644 --- a/clusters/wb/infrastructure/patches/glitchtip.yaml +++ b/clusters/wb/infrastructure/patches/glitchtip.yaml @@ -42,8 +42,7 @@ spec: _default: https://glitchtip-srx.wb.ru glitchtip: secret: - create: false - name: glitchtip-secret + create: true migrate: enabled: true env: diff --git a/clusters/wb/infrastructure/patches/goalert.yaml b/clusters/wb/infrastructure/patches/goalert.yaml index baf67b5..7aeae7f 100644 --- a/clusters/wb/infrastructure/patches/goalert.yaml +++ b/clusters/wb/infrastructure/patches/goalert.yaml @@ -12,11 +12,6 @@ spec: tag: 0.32.0 pullPolicy: IfNotPresent goalert: - existingSecret: - name: goalert-secret - keys: - GOALERT_DB_URL: GOALERT_DB_URL - GOALERT_DATA_ENCRYPTION_KEY: GOALERT_DATA_ENCRYPTION_KEY environment: GOALERT_HTTP_PREFIX: "" postgresql: @@ -24,7 +19,6 @@ spec: auth: database: goalert username: goalert - password: uO/9PHoznDImghirkrNicFQ3EwFmUX0s sslmode: disable primary: persistence: diff --git a/clusters/wb/infrastructure/patches/openobserve.yaml b/clusters/wb/infrastructure/patches/openobserve.yaml index f291bda..b60b1b7 100644 --- a/clusters/wb/infrastructure/patches/openobserve.yaml +++ b/clusters/wb/infrastructure/patches/openobserve.yaml @@ -25,8 +25,7 @@ spec: _default: "false" openobserve: secret: - create: false - name: openobserve-secret + create: true nats: enabled: false otelCollector: diff --git a/clusters/wb/infrastructure/patches/opentelemetry-collector.yaml b/clusters/wb/infrastructure/patches/opentelemetry-collector.yaml index 29b4031..3ea14a9 100644 --- a/clusters/wb/infrastructure/patches/opentelemetry-collector.yaml +++ b/clusters/wb/infrastructure/patches/opentelemetry-collector.yaml @@ -37,8 +37,6 @@ spec: exporters: otlphttp/openobserve: endpoint: http://openobserve.openobserve.svc.cluster.local:5080/api/default - headers: - Authorization: Basic YWRtaW5AZ3JhZmFuYS1zcngud2IucnU6NERoc2ZobnBvNTRIQkZkKzFUMzZkUDFUUUhJa3NjWDU= tls: insecure: true service: diff --git a/clusters/wb/infrastructure/patches/postgres-exporter.yaml b/clusters/wb/infrastructure/patches/postgres-exporter.yaml index 8cd9b7d..600d1ce 100644 --- a/clusters/wb/infrastructure/patches/postgres-exporter.yaml +++ b/clusters/wb/infrastructure/patches/postgres-exporter.yaml @@ -20,6 +20,3 @@ spec: port: "5432" database: postgres sslmode: disable - datasourceSecret: - name: postgres-exporter-secret - key: data_source_name diff --git a/clusters/wb/infrastructure/patches/prometheus-stack.yaml b/clusters/wb/infrastructure/patches/prometheus-stack.yaml index e03ea1e..dbedcdf 100644 --- a/clusters/wb/infrastructure/patches/prometheus-stack.yaml +++ b/clusters/wb/infrastructure/patches/prometheus-stack.yaml @@ -19,15 +19,11 @@ spec: prometheusOperator: enabled: true kubeStateMetrics: - enabled: true + enabled: false nodeExporter: - enabled: true + enabled: false grafana: enabled: true - admin: - existingSecret: grafana-admin - userKey: admin-user - passwordKey: admin-password persistence: enabled: true type: sts