Commit 6953d229 authored by John Jarvis's avatar John Jarvis

Adds PlantUML reserved IPs for all envs

parent c9ccd1ca
......@@ -1788,6 +1788,21 @@ resource "google_compute_address" "thanos-query-gke" {
address_type = "INTERNAL"
}
# Reserved IP address for plantuml, must be global
resource "google_compute_global_address" "plantuml-gke" {
name = "plantuml-gke-${var.environment}"
description = "plantuml-gke-${var.environment}"
}
resource "aws_route53_record" "plantuml-gke" {
zone_id = var.gitlab_static_net_zone_id
name = "plantuml.gitlab-static.net"
type = "A"
ttl = "300"
records = [google_compute_global_address.plantuml-gke.address]
}
resource "google_compute_router" "nat-router" {
name = "gitlab-gke"
network = module.network.self_link
......
......@@ -4,14 +4,13 @@ variable "oauth2_client_id_monitoring" {
variable "oauth2_client_secret_monitoring" {
}
variable "gitlab_net_zone_id" {
}
variable "gitlab_net_zone_id" {}
variable "gitlab_com_zone_id" {
}
variable "gitlab_com_zone_id" {}
variable "gitlab_io_zone_id" {
}
variable "gitlab_io_zone_id" {}
variable "gitlab_static_net_zone_id" {}
variable "bootstrap_script_version" {
default = 8
......@@ -573,10 +572,6 @@ variable "camoproxy_egress_ports" {
default = ["80", "443"]
}
# Supplied by env var
variable "gitlab_static_net_zone_id" {
}
#######################
# pubsubbeat config
#######################
......
......@@ -1829,6 +1829,21 @@ resource "google_compute_address" "thanos-query-gke" {
address_type = "INTERNAL"
}
# Reserved IP address for plantuml, must be global
resource "google_compute_global_address" "plantuml-gke" {
name = "plantuml-gke-${var.environment}"
description = "plantuml-gke-${var.environment}"
}
resource "aws_route53_record" "plantuml-gke" {
zone_id = var.gitlab_static_net_zone_id
name = "gstg.plantuml.gitlab-static.net"
type = "A"
ttl = "300"
records = [google_compute_global_address.plantuml-gke.address]
}
resource "google_compute_router" "nat-router" {
name = "gitlab-gke"
network = module.network.self_link
......
......@@ -4,14 +4,13 @@ variable "oauth2_client_id_monitoring" {
variable "oauth2_client_secret_monitoring" {
}
variable "gitlab_net_zone_id" {
}
variable "gitlab_net_zone_id" {}
variable "gitlab_com_zone_id" {
}
variable "gitlab_com_zone_id" {}
variable "gitlab_io_zone_id" {
}
variable "gitlab_io_zone_id" {}
variable "gitlab_static_net_zone_id" {}
variable "bootstrap_script_version" {
default = 8
......@@ -558,10 +557,6 @@ variable "camoproxy_egress_ports" {
default = ["80", "443"]
}
# Supplied by env var
variable "gitlab_static_net_zone_id" {
}
#######################
# pubsubbeat config
#######################
......
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