From f7a58ca99b5f2111f92bc678634cb07812a33fee Mon Sep 17 00:00:00 2001 From: Adam Guderski Date: Sun, 17 Dec 2023 10:54:42 +0100 Subject: [PATCH] remove concept app environment --- .github/ISSUE_TEMPLATE/config.yml | 6 +- .github/ISSUE_TEMPLATE/feature_idea.yml | 2 +- .github/workflows/build-and-deploy.yml | 5 +- .../workflows/test_integration_cypress.yml | 1 - .github/workflows/toggle-maintenance.yml | 5 +- src/.env.example | 3 +- src/docker-compose.preprod.yml | 230 ------------------ src/docker-compose.sanchonet.yml | 8 +- src/terraform/main.tf | 11 - 9 files changed, 13 insertions(+), 258 deletions(-) delete mode 100644 src/docker-compose.preprod.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3353ae86b..207145494 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,13 +1,13 @@ blank_issues_enabled: true contact_links: - name: Contributing guidelines - url: https://github.com/input-output-hk/voltaire-era/blob/master/CONTRIBUTING.md + url: https://github.com/IntersectMBO/govtool/blob/master/CONTRIBUTING.md about: Some rules & processes we honor. - name: Feature ideas - url: https://github.com/input-output-hk/voltaire-era/discussions/categories/ideas + url: https://github.com/IntersectMBO/govtool/discussions/categories/ideas about: Maybe someone else had the same or a similar idea already? - name: All issues - url: https://github.com/input-output-hk/voltaire-era/issues + url: https://github.com/IntersectMBO/govtool/issues about: Check whether your issue is not already covered here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_idea.yml b/.github/ISSUE_TEMPLATE/feature_idea.yml index 985a4c27a..60b5902b0 100644 --- a/.github/ISSUE_TEMPLATE/feature_idea.yml +++ b/.github/ISSUE_TEMPLATE/feature_idea.yml @@ -8,7 +8,7 @@ body: value: | **Thank you for contributing to our project!** :green_heart: - Instead of opening this issue, consider [starting a new idea discussion](https://github.com/input-output-hk/voltaire-era/discussions/new?category=ideas). + Instead of opening this issue, consider [starting a new idea discussion](https://github.com/IntersectMBO/govtool/discussions/new?category=ideas). That way, we can discuss & refine your idea together, before we adopt it as a feature into the roadmap. - type: textarea diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index aecdcf1fe..5f279eb30 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -7,9 +7,8 @@ on: cardano_network: required: true type: choice - default: "preprod" + default: "sanchonet" options: - - "preprod" - "sanchonet" environment: required: true @@ -27,7 +26,7 @@ on: env: ENVIRONMENT: ${{ inputs.environment || 'dev' }} - CARDANO_NETWORK: ${{ inputs.cardano_network || 'preprod' }} + CARDANO_NETWORK: ${{ inputs.cardano_network || 'sanchonet' }} jobs: check_environment_exists: diff --git a/.github/workflows/test_integration_cypress.yml b/.github/workflows/test_integration_cypress.yml index 5378ebd02..d2c0b8cfc 100644 --- a/.github/workflows/test_integration_cypress.yml +++ b/.github/workflows/test_integration_cypress.yml @@ -14,7 +14,6 @@ on: type: choice default: "sanchonet" options: - - "preprod" - "sanchonet" deployment: required: true diff --git a/.github/workflows/toggle-maintenance.yml b/.github/workflows/toggle-maintenance.yml index 4fd2c7518..e8dc2ac3c 100644 --- a/.github/workflows/toggle-maintenance.yml +++ b/.github/workflows/toggle-maintenance.yml @@ -7,9 +7,8 @@ on: cardano_network: required: true type: choice - default: "preprod" + default: "sanchonet" options: - - "preprod" - "sanchonet" environment: required: true @@ -30,7 +29,7 @@ on: env: ENVIRONMENT: ${{ inputs.environment || 'dev' }} - CARDANO_NETWORK: ${{ inputs.cardano_network || 'preprod' }} + CARDANO_NETWORK: ${{ inputs.cardano_network || 'sanchonet' }} jobs: check_environment_exists: diff --git a/src/.env.example b/src/.env.example index e8bc7b232..faab1cf4b 100644 --- a/src/.env.example +++ b/src/.env.example @@ -3,8 +3,7 @@ use nix shell.nix export AWS_PROFILE=vva export ENVIRONMENT="dev" -export INSTANCE="preprod" -export CARDANO_NETWORK="preprod" +export CARDANO_NETWORK="sanchonet" export SLACK_WEBHOOK_URL= export DBSYNC_POSTGRES_USER="postgres" diff --git a/src/docker-compose.preprod.yml b/src/docker-compose.preprod.yml deleted file mode 100644 index e0a761039..000000000 --- a/src/docker-compose.preprod.yml +++ /dev/null @@ -1,230 +0,0 @@ -version: "3.9" - -services: - traefik: - image: traefik:v2.10 - command: - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.myresolver.acme.httpchallenge=true" - - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web" - - "--certificatesresolvers.myresolver.acme.email=${TRAEFIK_LE_EMAIL}" - - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" - - "--log.level=DEBUG" - - "--entryPoints.metrics.address=:8082" - - "--metrics.prometheus=true" - - "--metrics.prometheus.entryPoint=metrics" - - "--metrics.prometheus.buckets=0.1,0.3,1.2,5.0" - ports: - - 80:80 - - 443:443 - volumes: - - letsencrypt:/letsencrypt - - "/var/run/docker.sock:/var/run/docker.sock:ro" - restart: on-failure - logging: &logging - driver: "json-file" - options: - max-size: "200k" - max-file: "10" - labels: - - "traefik.enable=true" - - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" - - "traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)" - - "traefik.http.routers.http-catchall.entrypoints=web" - - "traefik.http.routers.http-catchall.middlewares=redirect-to-https" - - prometheus: - image: prom/prometheus:v2.47.1 - volumes: - - prometheus-data:/prometheus - - /home/ubuntu/config/prometheus.yml:/etc/prometheus/prometheus.yml - extra_hosts: - - "host.docker.internal:host-gateway" - restart: on-failure - logging: *logging - - grafana: - image: grafana/grafana:10.0.8 - volumes: - - grafana-data:/var/lib/grafana - - /home/ubuntu/config/grafana-provisioning:/etc/grafana/provisioning - environment: - - GF_SECURITY_ADMIN_PASSWORD=o4MkVu0elSCFf4dD - - GF_USERS_ALLOW_SIGN_UP=false - - GF_INSTALL_PLUGINS=grafana-piechart-panel - - GF_SERVER_ROOT_URL=https://${SUBDOMAIN:-$ENVIRONMENT-$CARDANO_NETWORK}.govtool.byron.network/grafana - - GF_SERVER_SERVE_FROM_SUB_PATH=true - restart: on-failure - logging: *logging - labels: - - "traefik.enable=true" - - "traefik.http.routers.grafana.rule=Host(`${SUBDOMAIN:-$ENVIRONMENT-$CARDANO_NETWORK}.govtool.byron.network`) && PathPrefix(`/grafana`)" - - "traefik.http.routers.grafana.entrypoints=websecure" - - "traefik.http.routers.grafana.tls.certresolver=myresolver" - - "traefik.http.services.grafana.loadbalancer.server.port=3000" - - postgres: - image: postgres:11.18-alpine - environment: - - POSTGRES_LOGGING=true - - POSTGRES_DB_FILE=/run/secrets/postgres_db - - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password - - POSTGRES_USER_FILE=/run/secrets/postgres_user - secrets: - - postgres_password - - postgres_user - - postgres_db - volumes: - - postgres:/var/lib/postgresql/data - restart: on-failure - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 10s - timeout: 5s - retries: 5 - command: ${POSTGRES_ARGS:--c maintenance_work_mem=1GB -c max_parallel_maintenance_workers=4} - logging: *logging - - cardano-node: - image: inputoutput/cardano-node:8.0.0 - entrypoint: - - "cardano-node" - - "run" - - "--topology" - - "/configuration/topology.json" - - "--database-path" - - "/data/db" - - "--socket-path" - - "/ipc/node.socket" - - "--host-addr" - - "0.0.0.0" - - "--port" - - "3001" - - "--config" - - "/configuration/config.json" - - "+RTS" - - "-N2" - - "-I0" - - "-A16m" - - "-qg" - - "-qb" - - "--disable-delayed-os-memory-return" - - "-RTS" - environment: - - NETWORK=${CARDANO_NETWORK:-preprod} - volumes: - - node-db:/data/db - - node-ipc:/ipc - - /home/ubuntu/config/cardano-node:/configuration - restart: on-failure - healthcheck: - test: ["CMD-SHELL", "curl -f 127.0.0.1:12788 || exit 1"] - interval: 60s - timeout: 10s - retries: 5 - logging: *logging - - cardano-db-sync: - image: inputoutput/cardano-db-sync:13.1.1.2-docker - environment: - - NETWORK=${CARDANO_NETWORK:-preprod} - - POSTGRES_HOST=postgres - - POSTGRES_PORT=5432 - - RESTORE_SNAPSHOT=${RESTORE_SNAPSHOT:-} - - RESTORE_RECREATE_DB=N - - EXTRA_DB_SYNC_ARGS=${EXTRA_DB_SYNC_ARGS:-} - depends_on: - cardano-node: - condition: service_healthy - postgres: - condition: service_healthy - secrets: - - postgres_password - - postgres_user - - postgres_db - volumes: - - db-sync-data:/var/lib/cexplorer - - node-ipc:/node-ipc - restart: on-failure - logging: *logging - - postgres-fakedbsync: - image: postgres:15-alpine - environment: - - POSTGRES_LOGGING=true - - POSTGRES_DB=vva - - POSTGRES_PASSWORD=test - - POSTGRES_USER=postgres - volumes: - - postgres-fakedbsync:/var/lib/postgresql/data - - /home/ubuntu/config/fakedbsync_init.d:/docker-entrypoint-initdb.d - restart: on-failure - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 10s - timeout: 5s - retries: 5 - command: ${POSTGRES_ARGS:--c maintenance_work_mem=1GB -c max_parallel_maintenance_workers=4} - logging: *logging - - vva-be: - image: ${VVA_BE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/backend}:${TAG:-main-dev-preprod} - command: /usr/local/bin/vva-be -c /run/secrets/vva-be-config.json start-app - depends_on: - cardano-node: - condition: service_healthy - postgres: - condition: service_healthy - postgres-fakedbsync: - condition: service_healthy - secrets: - - vva-be-config.json - restart: on-failure - logging: *logging - labels: - - "traefik.enable=true" - - "traefik.http.routers.vva-be.rule=Host(`${SUBDOMAIN:-$ENVIRONMENT-$CARDANO_NETWORK}.govtool.byron.network`) && PathPrefix(`/api`)" - - "traefik.http.middlewares.vva-be-stripprefix.stripprefix.prefixes=/api" - - "traefik.http.routers.vva-be.middlewares=vva-be-stripprefix@docker" - - "traefik.http.routers.vva-be.entrypoints=websecure" - - "traefik.http.routers.vva-be.tls.certresolver=myresolver" - - "traefik.http.services.vva-be.loadbalancer.server.port=9876" - - vva-fe: - image: ${VVA_FE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/frontend}:${TAG:-main-dev-preprod} - depends_on: - cardano-node: - condition: service_healthy - postgres: - condition: service_healthy - restart: on-failure - logging: *logging - labels: - - "traefik.enable=true" - - "traefik.http.routers.vva-fe.rule=Host(`${SUBDOMAIN:-$ENVIRONMENT-$CARDANO_NETWORK}.govtool.byron.network`)" - - "traefik.http.routers.vva-fe.entrypoints=websecure" - - "traefik.http.routers.vva-fe.tls.certresolver=myresolver" - - "traefik.http.services.vva-fe.loadbalancer.server.port=80" - -secrets: - postgres_db: - file: /home/ubuntu/config/dbsync-secrets/postgres_db - postgres_password: - file: /home/ubuntu/config/dbsync-secrets/postgres_password - postgres_user: - file: /home/ubuntu/config/dbsync-secrets/postgres_user - vva-be-config.json: - file: /home/ubuntu/config/vva-be-config.json - -volumes: - letsencrypt: - db-sync-data: - grafana-data: - postgres: - postgres-fakedbsync: - prometheus-data: - node-db: - node-ipc: diff --git a/src/docker-compose.sanchonet.yml b/src/docker-compose.sanchonet.yml index b169789ee..18a737994 100644 --- a/src/docker-compose.sanchonet.yml +++ b/src/docker-compose.sanchonet.yml @@ -129,7 +129,7 @@ services: - "--disable-delayed-os-memory-return" - "-RTS" environment: - - NETWORK=${CARDANO_NETWORK:-preprod} + - NETWORK=${CARDANO_NETWORK:-sanchonet} volumes: - node-db:/data/db - node-ipc:/ipc @@ -145,7 +145,7 @@ services: cardano-db-sync: image: ghcr.io/input-output-hk/cardano-db-sync:sancho-2-3-0-docker environment: - - NETWORK=${CARDANO_NETWORK:-preprod} + - NETWORK=${CARDANO_NETWORK:-sanchonet} - POSTGRES_HOST=postgres - POSTGRES_PORT=5432 - RESTORE_SNAPSHOT=${RESTORE_SNAPSHOT:-} @@ -167,7 +167,7 @@ services: logging: *logging vva-be: - image: ${VVA_BE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/backend}:${TAG:-main-dev-preprod} + image: ${VVA_BE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/backend}:${TAG:-main-dev-sanchonet} command: /usr/local/bin/vva-be -c /run/secrets/vva-be-config.json start-app depends_on: cardano-node: @@ -191,7 +191,7 @@ services: - "traefik.http.services.vva-be.loadbalancer.server.port=9876" vva-fe: - image: ${VVA_FE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/frontend}:${TAG:-main-dev-preprod} + image: ${VVA_FE_REPO:-733019650473.dkr.ecr.eu-west-1.amazonaws.com/frontend}:${TAG:-main-dev-sanchonet} depends_on: cardano-node: condition: service_healthy diff --git a/src/terraform/main.tf b/src/terraform/main.tf index 52083eee1..291e66a89 100644 --- a/src/terraform/main.tf +++ b/src/terraform/main.tf @@ -54,13 +54,6 @@ resource "aws_iam_group_policy_attachment" "cicd" { # duplicate the following block in order to prepare a new environment # make sure that app_env/cardano_network variable pair is unique -module "vva-dev-preprod" { - source = "./modules/vva-ec2" - app_env = "dev" - cardano_network = "preprod" - instance_type = "t3.large" - dns_zone_id = aws_route53_zone.govtool.id -} module "vva-dev-sanchonet" { source = "./modules/vva-ec2" @@ -102,10 +95,6 @@ output "vva-ecr-fe-url" { value = module.vva-ecr-fe.repo_url } -output "vva-dev-preprod-frontend-domain" { - value = module.vva-dev-preprod.frontend_domain -} - output "vva-dev-sanchonet-frontend-domain" { value = module.vva-dev-sanchonet.frontend_domain }