TF: cleanup unused postgres service

.gitlab-ci.yml

@@ -120,8 +120,6 @@ plan_satapi:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS"
          -var "k8s_autossh_lb=$GKE_LB"
@@ -212,8 +210,6 @@ plan_staging:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS"
          -var "k8s_autossh_lb=$GKE_LB"
@@ -247,8 +243,6 @@ deploy_staging:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS"
          -var "k8s_autossh_lb=$GKE_LB"
@@ -281,8 +275,6 @@ plan_production:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS"
          -var "k8s_autossh_lb=$GKE_LB"
@@ -316,8 +308,6 @@ deploy_production:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS"
          -var "k8s_autossh_lb=$GKE_LB"
@@ -349,8 +339,6 @@ plan_production_testnet:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS_TESTNET"
          -var "k8s_autossh_lb=$GKE_LB"
@@ -381,8 +369,6 @@ deploy_production_testnet:
          -var "public_bucket_url=$PUBLIC_BUCKET_URL"
          -var "private_bucket=$PRIVATE_BUCKET"
          -var "letsencrypt_email=$LE_EMAIL"
-         -var "pguser=$PGUSER"
-         -var "pgpass=$PGPASS"
          -var "charge_token=$CHARGE_TOKEN"
          -var "rpcpass=$RPCPASS_TESTNET"
          -var "k8s_autossh_lb=$GKE_LB"

terraform/main.tf

@@ -7,7 +7,7 @@ terraform {
       source = "hashicorp/google-beta"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
 
   backend "gcs" {
     bucket = "terraform-bs-source"
@@ -34,7 +34,6 @@ module "blc-mainnet" {
   ionosphere_docker     = var.ionosphere_docker
   ionosphere_sse_docker = var.ionosphere_sse_docker
   node_exporter_docker  = var.node_exporter_docker
-  postgres_docker       = var.postgres_docker
   autossh_docker        = var.autossh_docker
   certbot_docker        = var.certbot_docker
   net                   = "mainnet"
@@ -53,8 +52,6 @@ module "blc-mainnet" {
   prom_service_acct = var.prom_service_acct
   opsgenie_key      = var.opsgenie_key
   rpcpass           = var.rpcpass
-  pguser            = var.pguser
-  pgpass            = var.pgpass
   charge_token      = var.charge_token
   k8s_autossh_lb    = var.k8s_autossh_lb
   private_bucket    = var.private_bucket
@@ -71,7 +68,6 @@ module "blc-testnet" {
   ionosphere_docker     = var.ionosphere_docker
   ionosphere_sse_docker = var.ionosphere_sse_docker
   node_exporter_docker  = var.node_exporter_docker
-  postgres_docker       = var.postgres_docker
   autossh_docker        = var.autossh_docker
   certbot_docker        = var.certbot_docker
   net                   = "testnet"
@@ -90,8 +86,6 @@ module "blc-testnet" {
   prom_service_acct = var.prom_service_acct
   opsgenie_key      = var.opsgenie_key
   rpcpass           = var.rpcpass
-  pguser            = var.pguser
-  pgpass            = var.pgpass
   charge_token      = var.charge_token
   k8s_autossh_lb    = var.k8s_autossh_lb
   private_bucket    = var.private_bucket

terraform/modules/blc/cloud-init/blc.yaml

@@ -94,33 +94,6 @@ write_files:
         ExecStopPost=/usr/bin/docker rm node-exporter
         ExecStopPost=/sbin/iptables -D INPUT -m tcp -p tcp --dport 9100 -j ACCEPT
 
-  - path: /etc/systemd/system/postgres.service
-    permissions: 0644
-    owner: root
-    content: |
-        [Unit]
-        Description=PostgreSQL Server
-        Wants=gcr-online.target docker.service
-        After=gcr-online.service docker.service
-
-        [Service]
-        Restart=always
-        RestartSec=3
-        Environment=HOME=/home/bs
-        ExecStartPre=/usr/bin/docker pull ${postgres_docker}
-        ExecStartPre=/sbin/iptables -A INPUT -p tcp -s localhost --dport 5432 -j ACCEPT
-        ExecStart=/usr/bin/docker run \
-            --name=postgres \
-            --network=host \
-            -v /mnt/disks/data/postgres:/var/lib/postgresql/data/pgdata \
-            -e "PGDATA=/var/lib/postgresql/data/pgdata" \
-            -e "POSTGRES_USER=${pguser}" \
-            -e "POSTGRES_PASSWORD=${pgpass}" \
-            "${postgres_docker}" postgres
-        ExecStop=/usr/bin/docker stop postgres
-        ExecStopPost=/usr/bin/docker rm postgres
-        ExecStopPost=/sbin/iptables -D INPUT -p tcp -s localhost --dport 5432 -j ACCEPT
-
   - path: /etc/systemd/system/autossh-key-downloader.service
     permissions: 0644
     owner: root
@@ -355,7 +328,6 @@ runcmd:
   - systemctl enable --now autossh-key-downloader.service
   - systemctl enable --now k8s-autossh.service
   - systemctl enable --now lightning.service
-#  - systemctl enable --now postgres.service
   - systemctl enable --now redis.service
   - systemctl enable --now ionosphere.service
   - systemctl enable --now ionosphere-tx.service

terraform/modules/blc/data.tf

@@ -21,11 +21,8 @@ data "template_file" "blc" {
     ionosphere_docker     = var.ionosphere_docker
     ionosphere_sse_docker = var.ionosphere_sse_docker
     node_exporter_docker  = var.node_exporter_docker
-    postgres_docker       = var.postgres_docker
     autossh_docker        = var.autossh_docker
     certbot_docker        = var.certbot_docker
-    pguser                = var.pguser
-    pgpass                = var.pgpass
     opsgenie_key          = var.opsgenie_key
     k8s_autossh_lb        = var.k8s_autossh_lb
     rpcpass               = var.rpcpass

terraform/modules/blc/variables.tf

@@ -60,14 +60,6 @@ variable "lb_svc_acct" {
   type = string
 }
 
-variable "pguser" {
-  type = string
-}
-
-variable "pgpass" {
-  type = string
-}
-
 variable "k8s_autossh_lb" {
   type = string
 }
@@ -108,10 +100,6 @@ variable "node_exporter_docker" {
   type = string
 }
 
-variable "postgres_docker" {
-  type = string
-}
-
 variable "autossh_docker" {
   type = string
 }

terraform/variables.tf

@@ -12,6 +12,12 @@ locals {
       create_testnet = 0
       create_misc    = 0
     }
+    "testnet-staging" = {
+      env            = "staging"
+      create_mainnet = 0
+      create_testnet = 1
+      create_misc    = 0
+    }
     "testnet-prod" = {
       env            = "prod"
       create_mainnet = 0
@@ -157,16 +163,6 @@ variable "health_check" {
   default = ""
 }
 
-variable "pguser" {
-  type    = string
-  default = ""
-}
-
-variable "pgpass" {
-  type    = string
-  default = ""
-}
-
 variable "k8s_autossh_lb" {
   type    = string
   default = ""
@@ -260,11 +256,6 @@ variable "certbot_docker" {
   default = "blockstream/certbot-gcs@sha256:fc5d7cb31bcf04169f37cbebd74c3bde49651f79e54e1ff3c3eaf6ec47b9f6d0"
 }
 
-variable "postgres_docker" {
-  type    = string
-  default = "postgres@sha256:077793cc0ed31fd0568ce468d85d0843b8dea37c9ef74eb81b4ccf0fe9539e2e"
-}
-
 variable "autossh_docker" {
   type    = string
   default = "blockstream/autossh@sha256:5e30a60d6ef17aeafdde63bb859238e132fadef174af4092a435bc7325430ebd"