Commit de9bfe33 authored by Craig Furman's avatar Craig Furman

Upgrade dr to Terraform 0.12

Bring in bumped modules. Major versions can be bumped with:

`perl -i -pe 's/([\w\-]+\.git\?ref=v)(\d+)\.\d+.\d+/${1}.(${2}+1).".0.0"/e' main.tf`

I then ran `tfenv use latest`, which automatically bumps
`.terraform-version`. I then ran `tf init && 0.12upgrade`, after which a
subsequent `tf init && tf plan` will display the final errors to work
through.

Had to bump the AWS provider which was previously pinned. We don't pin
this provider in gprd currently, so unpinned here.
parent 46c8883c
......@@ -4,8 +4,8 @@
# services
resource "google_compute_url_map" "monitoring-lb" {
name = "${format("%v-monitoring-lb", var.environment)}"
default_service = "${module.prometheus.google_compute_backend_service_self_link}"
name = format("%v-monitoring-lb", var.environment)
default_service = module.prometheus.google_compute_backend_service_self_link
host_rule {
hosts = ["prometheus.dr.gitlab.net"]
......@@ -14,11 +14,11 @@ resource "google_compute_url_map" "monitoring-lb" {
path_matcher {
name = "prometheus"
default_service = "${module.prometheus.google_compute_backend_service_self_link}"
default_service = module.prometheus.google_compute_backend_service_self_link
path_rule {
paths = ["/*"]
service = "${module.prometheus.google_compute_backend_service_self_link}"
service = module.prometheus.google_compute_backend_service_self_link
}
}
......@@ -30,11 +30,12 @@ resource "google_compute_url_map" "monitoring-lb" {
}
path_matcher {
name = "prometheus-app"
default_service = "${module.prometheus-app.google_compute_backend_service_self_link}"
default_service = module.prometheus-app.google_compute_backend_service_self_link
path_rule {
paths = ["/*"]
service = "${module.prometheus-app.google_compute_backend_service_self_link}"
service = module.prometheus-app.google_compute_backend_service_self_link
}
}
}
This diff is collapsed.
This diff is collapsed.
terraform {
required_version = ">= 0.12"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment