diff --git a/clusters/wb/infrastructure/kustomization.yaml b/clusters/wb/infrastructure/kustomization.yaml index bba712a..0b69ebf 100644 --- a/clusters/wb/infrastructure/kustomization.yaml +++ b/clusters/wb/infrastructure/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../infrastructure/glitchtip - ../../../infrastructure/openobserve - ../../../infrastructure/vmstack - ../../../infrastructure/prometheus-stack @@ -11,13 +10,6 @@ resources: - ../../../infrastructure/kafka-exporter - ../../../infrastructure/postgres-exporter patches: - - path: ./patches/glitchtip.yaml - target: - group: helm.toolkit.fluxcd.io - version: v2 - kind: HelmRelease - name: glitchtip - namespace: glitchtip - path: ./patches/openobserve.yaml target: group: helm.toolkit.fluxcd.io diff --git a/clusters/wb/infrastructure/patches/glitchtip.yaml b/clusters/wb/infrastructure/patches/glitchtip.yaml deleted file mode 100644 index 60fb537..0000000 --- a/clusters/wb/infrastructure/patches/glitchtip.yaml +++ /dev/null @@ -1,193 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: glitchtip - namespace: glitchtip -spec: - interval: 5m - timeout: 10m - values: - universal-chart: - services: - web: - deployment: - replicaCount: - _default: 1 - podAnnotations: - _default: null - command: - _default: [] - args: - _default: [] - envs: - - name: SERVER_ROLE - value: - _default: web - - name: PORT - value: - _default: "8000" - - name: GLITCHTIP_DOMAIN - value: - _default: https://glitchtip-srx.wb.ru - - name: ENABLE_OPEN_USER_REGISTRATION - value: - _default: "false" - secretEnvs: - - name: DATABASE_URL - secretName: - _default: glitchtip-secret - secretKey: DATABASE_URL - - name: PGHOST - secretName: - _default: glitchtip-secret - secretKey: PGHOST - - name: PGPORT - secretName: - _default: glitchtip-secret - secretKey: PGPORT - - name: PGDATABASE - secretName: - _default: glitchtip-secret - secretKey: PGDATABASE - - name: PGUSER - secretName: - _default: glitchtip-secret - secretKey: PGUSER - - name: PGPASSWORD - secretName: - _default: glitchtip-secret - secretKey: PGPASSWORD - - name: PGSSLMODE - secretName: - _default: glitchtip-secret - secretKey: PGSSLMODE - - name: REDIS_URL - secretName: - _default: glitchtip-secret - secretKey: REDIS_URL - - name: SECRET_KEY - secretName: - _default: glitchtip-secret - secretKey: SECRET_KEY - - name: EMAIL_URL - secretName: - _default: glitchtip-secret - secretKey: EMAIL_URL - - name: DEFAULT_FROM_EMAIL - secretName: - _default: glitchtip-secret - secretKey: DEFAULT_FROM_EMAIL - serviceAccount: - enabled: true - name: - _default: glitchtip - worker: - deployment: - replicaCount: - _default: 1 - podAnnotations: - _default: null - command: - _default: [] - args: - _default: [] - envs: - - name: SERVER_ROLE - value: - _default: worker - - name: PORT - value: - _default: "8000" - - name: GLITCHTIP_DOMAIN - value: - _default: https://glitchtip-srx.wb.ru - secretEnvs: - - name: DATABASE_URL - secretName: - _default: glitchtip-secret - secretKey: DATABASE_URL - - name: PGHOST - secretName: - _default: glitchtip-secret - secretKey: PGHOST - - name: PGPORT - secretName: - _default: glitchtip-secret - secretKey: PGPORT - - name: PGDATABASE - secretName: - _default: glitchtip-secret - secretKey: PGDATABASE - - name: PGUSER - secretName: - _default: glitchtip-secret - secretKey: PGUSER - - name: PGPASSWORD - secretName: - _default: glitchtip-secret - secretKey: PGPASSWORD - - name: PGSSLMODE - secretName: - _default: glitchtip-secret - secretKey: PGSSLMODE - - name: REDIS_URL - secretName: - _default: glitchtip-secret - secretKey: REDIS_URL - - name: SECRET_KEY - secretName: - _default: glitchtip-secret - secretKey: SECRET_KEY - - name: EMAIL_URL - secretName: - _default: glitchtip-secret - secretKey: EMAIL_URL - - name: DEFAULT_FROM_EMAIL - secretName: - _default: glitchtip-secret - secretKey: DEFAULT_FROM_EMAIL - serviceAccount: - enabled: false - name: - _default: "" - glitchtip: - secret: - create: true - data: - PGHOST: sarex-vpsql-01.xc.wb.ru - PGPORT: "5432" - PGDATABASE: glitchtip - PGUSER: glitchtip - PGSSLMODE: disable - REDIS_URL: redis://glitchtip-redis:6379/0 - EMAIL_URL: consolemail:// - DEFAULT_FROM_EMAIL: glitchtip@grafana-srx.wb.ru - GLITCHTIP_ADMIN_EMAIL: admin@grafana-srx.wb.ru - migrate: - enabled: true - env: - PORT: "8000" - GLITCHTIP_DOMAIN: https://glitchtip-srx.wb.ru - command: - - /bin/sh - - -ec - - | - python manage.py migrate --noinput - python manage.py shell <<'PY' - import os - from django.contrib.auth import get_user_model - - email = os.environ["GLITCHTIP_ADMIN_EMAIL"] - password = os.environ["GLITCHTIP_ADMIN_PASSWORD"] - - User = get_user_model() - user, _ = User.objects.get_or_create(email=email) - user.is_superuser = True - user.is_staff = True - user.is_active = True - user.set_password(password) - user.save(update_fields=["password", "is_superuser", "is_staff", "is_active"]) - print(f"admin-user-ensured:{email}") - PY - vault: - enabled: false