Skip to content

Commit 9b767b4

Browse files
nitramiznitramiz
committed
TF: Remove preemptible MIGs
1 parent 4cd0960 commit 9b767b4

File tree

7 files changed

+0
-161
lines changed

7 files changed

+0
-161
lines changed

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ plan_main:
4747
-var "hosts=$HOSTS"
4848
-var "hosts_onion=$HOSTS_ONION"
4949
-var "cluster_size=$NODE_CLUSTER_SIZE"
50-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE"
5150
-var "instance_type=$NODE_INSTANCE_TYPE"
52-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE"
5351
-var "regions=$REGIONS"
5452
-var "zones=$ZONES"
5553
-var "ssl_certs=$SSL_CERTS"
@@ -72,9 +70,7 @@ deploy_main:
7270
-var "hosts=$HOSTS"
7371
-var "hosts_onion=$HOSTS_ONION"
7472
-var "cluster_size=$NODE_CLUSTER_SIZE"
75-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE"
7673
-var "instance_type=$NODE_INSTANCE_TYPE"
77-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE"
7874
-var "regions=$REGIONS"
7975
-var "zones=$ZONES"
8076
-var "ssl_certs=$SSL_CERTS"

‎gitlab/prod.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ plan_bitcoin_mainnet:
99
terraform plan
1010
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
1111
-var "cluster_size=$NODE_CLUSTER_SIZE_BTCM"
12-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_BTCM"
1312
-var "instance_type=$NODE_INSTANCE_TYPE_BTCM"
14-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_BTCM"
1513
-var "regions=$BTC_MAINNET_REGIONS"
1614
-var "zones=$ZONES"
1715
-var "min_ready_sec=300"
@@ -38,9 +36,7 @@ deploy_bitcoin_mainnet:
3836
terraform apply
3937
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
4038
-var "cluster_size=$NODE_CLUSTER_SIZE_BTCM"
41-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_BTCM"
4239
-var "instance_type=$NODE_INSTANCE_TYPE_BTCM"
43-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_BTCM"
4440
-var "regions=$BTC_MAINNET_REGIONS"
4541
-var "zones=$ZONES"
4642
-var "min_ready_sec=300"
@@ -61,9 +57,7 @@ plan_bitcoin_testnet:
6157
terraform plan
6258
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
6359
-var "cluster_size=$NODE_CLUSTER_SIZE_BTCT"
64-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_BTCT"
6560
-var "instance_type=$NODE_INSTANCE_TYPE_BTCT"
66-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_BTCT"
6761
-var "regions=$REGIONS"
6862
-var "zones=$ZONES"
6963
-var "min_ready_sec=60"
@@ -90,9 +84,7 @@ deploy_bitcoin_testnet:
9084
terraform apply
9185
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
9286
-var "cluster_size=$NODE_CLUSTER_SIZE_BTCT"
93-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_BTCT"
9487
-var "instance_type=$NODE_INSTANCE_TYPE_BTCT"
95-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_BTCT"
9688
-var "regions=$REGIONS"
9789
-var "zones=$ZONES"
9890
-var "min_ready_sec=60"
@@ -113,9 +105,7 @@ plan_liquid_mainnet:
113105
terraform plan
114106
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
115107
-var "cluster_size=$NODE_CLUSTER_SIZE_LQM"
116-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_LQM"
117108
-var "instance_type=$NODE_INSTANCE_TYPE_LQM"
118-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_LQM"
119109
-var "regions=$REGIONS"
120110
-var "zones=$ZONES"
121111
-var "min_ready_sec=60"
@@ -142,9 +132,7 @@ deploy_liquid_mainnet:
142132
terraform apply
143133
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
144134
-var "cluster_size=$NODE_CLUSTER_SIZE_LQM"
145-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_LQM"
146135
-var "instance_type=$NODE_INSTANCE_TYPE_LQM"
147-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_LQM"
148136
-var "regions=$REGIONS"
149137
-var "zones=$ZONES"
150138
-var "min_ready_sec=60"
@@ -165,9 +153,7 @@ plan_liquid_testnet:
165153
terraform plan
166154
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
167155
-var "cluster_size=$NODE_CLUSTER_SIZE_LQT"
168-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_LQT"
169156
-var "instance_type=$NODE_INSTANCE_TYPE_LQT"
170-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_LQT"
171157
-var "regions=$REGIONS"
172158
-var "zones=$ZONES"
173159
-var "min_ready_sec=60"
@@ -194,9 +180,7 @@ deploy_liquid_testnet:
194180
terraform apply
195181
-var "docker_tag_explorer=blockstream/esplora:$CI_COMMIT_SHA"
196182
-var "cluster_size=$NODE_CLUSTER_SIZE_LQT"
197-
-var "preemptible_cluster_size=$NODE_PREEMPTIBLE_CLUSTER_SIZE_LQT"
198183
-var "instance_type=$NODE_INSTANCE_TYPE_LQT"
199-
-var "preemptible_instance_type=$NODE_PREEMPTIBLE_INSTANCE_TYPE_LQT"
200184
-var "regions=$REGIONS"
201185
-var "zones=$ZONES"
202186
-var "min_ready_sec=60"

‎terraform/main.tf‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ module "bitcoin-testnet" {
8888
network = "testnet"
8989
disk_type = var.disk_type
9090
instance_type = var.instance_type
91-
preemptible_instance_type = var.preemptible_instance_type
9291
size = var.cluster_size
93-
preemptible_size = var.preemptible_cluster_size
9492
project = var.project
9593
service_account_prom = terraform.workspace == "main" ? module.prometheus.service_account : data.terraform_remote_state.main.outputs.prometheus_service_account
9694
docker_tag_node_exporter = var.docker_tag_node_exporter
@@ -114,9 +112,7 @@ module "bitcoin-mainnet" {
114112
mempooldat = var.mempooldat
115113
fullurl = var.fullurl
116114
instance_type = var.instance_type
117-
preemptible_instance_type = var.preemptible_instance_type
118115
size = var.cluster_size
119-
preemptible_size = var.preemptible_cluster_size
120116
project = var.project
121117
service_account_prom = terraform.workspace == "main" ? module.prometheus.service_account : data.terraform_remote_state.main.outputs.prometheus_service_account
122118
docker_tag_node_exporter = var.docker_tag_node_exporter
@@ -140,9 +136,7 @@ module "liquid-mainnet" {
140136
mempooldat = var.mempooldat
141137
fullurl = var.fullurl
142138
instance_type = var.instance_type
143-
preemptible_instance_type = var.preemptible_instance_type
144139
size = var.cluster_size
145-
preemptible_size = var.preemptible_cluster_size
146140
project = var.project
147141
service_account_prom = terraform.workspace == "main" ? module.prometheus.service_account : data.terraform_remote_state.main.outputs.prometheus_service_account
148142
docker_tag_node_exporter = var.docker_tag_node_exporter
@@ -166,9 +160,7 @@ module "liquid-testnet" {
166160
mempooldat = var.mempooldat
167161
fullurl = var.fullurl
168162
instance_type = var.instance_type
169-
preemptible_instance_type = var.preemptible_instance_type
170163
size = var.cluster_size
171-
preemptible_size = var.preemptible_cluster_size
172164
project = var.project
173165
service_account_prom = terraform.workspace == "main" ? module.prometheus.service_account : data.terraform_remote_state.main.outputs.prometheus_service_account
174166
docker_tag_node_exporter = var.docker_tag_node_exporter

‎terraform/modules/daemon/network.tf‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ resource "google_compute_backend_service" "daemon" {
5353
}
5454
}
5555

56-
dynamic "backend" {
57-
for_each = google_compute_region_instance_group_manager.preemptible-daemon
58-
iterator = group
59-
content {
60-
group = group.value.instance_group
61-
max_utilization = 0.8
62-
}
63-
}
64-
6556
health_checks = [google_compute_http_health_check.daemon[0].self_link]
6657
count = var.create_resources
6758
}
@@ -81,15 +72,6 @@ resource "google_compute_backend_service" "daemon-electrs" {
8172
}
8273
}
8374

84-
dynamic "backend" {
85-
for_each = google_compute_region_instance_group_manager.preemptible-daemon
86-
iterator = group
87-
content {
88-
group = group.value.instance_group
89-
max_utilization = 0.8
90-
}
91-
}
92-
9375
health_checks = [google_compute_health_check.daemon-electrs[0].self_link]
9476
count = var.create_resources
9577
}

‎terraform/modules/daemon/preemptible.tf‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎terraform/modules/daemon/variables.tf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,10 @@ variable "instance_type" {
2828
default = ""
2929
}
3030

31-
variable "preemptible_instance_type" {
32-
type = string
33-
default = ""
34-
}
35-
3631
variable "size" {
3732
type = string
3833
}
3934

40-
variable "preemptible_size" {
41-
type = string
42-
}
43-
4435
variable "boot-image" {
4536
type = string
4637
default = "cos-cloud/cos-stable"

‎terraform/variables.tf‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ variable "cluster_size" {
6868
default = "overwritten_by_ci"
6969
}
7070

71-
variable "preemptible_cluster_size" {
72-
type = string
73-
default = "overwritten_by_ci"
74-
}
75-
7671
# lists overwritten by ci
7772
variable "regions" {
7873
type = list(any)
@@ -94,11 +89,6 @@ variable "instance_type" {
9489
default = ""
9590
}
9691

97-
variable "preemptible_instance_type" {
98-
type = string
99-
default = ""
100-
}
101-
10292
variable "hosts" {
10393
type = list(any)
10494
default = [""]

0 commit comments

Comments
 (0)