Commit 12475c08 authored by John Skarbek's avatar John Skarbek

Merge branch 'jarv/remove-iap-dashboards' into 'master'

Remove IAP for dashboards.

See merge request !520
parents b1481d5e 978d6ad7
......@@ -219,7 +219,7 @@ module "alerts" {
#
#######################################################
module "dashboards-iap" {
module "dashboards-internal" {
environment = "${var.environment}"
source = "../../modules/google/web-iap"
name = "dashboards"
......@@ -227,7 +227,7 @@ module "dashboards-iap" {
region = "${var.region}"
gitlab_zone_id = "${var.gitlab_net_zone_id}"
cert_link = "${var.dashboards_gitlab_net_cert_link}"
backend_service_link = "${module.dashboards.google_compute_backend_service_self_link}"
backend_service_link = "${module.dashboards.google_compute_backend_service_noiap_self_link}"
web_ip_fqdn = "dashboards.gitlab.net"
service_ports = ["80", "443"]
}
......@@ -239,6 +239,7 @@ module "dashboards" {
data_disk_size = 100
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
enable_iap = false
environment = "${var.environment}"
health_check = "http"
health_check_port = 80
......@@ -246,13 +247,11 @@ module "dashboards" {
machine_type = "${var.machine_types["dashboards"]}"
name = "dashboards"
node_count = 1
oauth2_client_id = "${var.oauth2_client_id_dashboards}"
oauth2_client_secret = "${var.oauth2_client_secret_dashboards}"
persistent_disk_path = "/var/lib/grafana"
project = "${var.project}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_path = "/"
service_path = "/api/health"
service_port = 80
source = "../../modules/google/monitoring-with-count"
tier = "inf"
......@@ -293,8 +292,6 @@ module "dashboards-com" {
machine_type = "${var.machine_types["monitor"]}"
name = "dashboards-com"
node_count = 1
oauth2_client_id = "${var.oauth2_client_id_dashboards}"
oauth2_client_secret = "${var.oauth2_client_secret_dashboards}"
persistent_disk_path = "/var/lib/grafana"
project = "${var.project}"
region = "${var.region}"
......
......@@ -57,11 +57,13 @@ variable "health_check" {
}
variable "oauth2_client_id" {
type = "string"
type = "string"
default = ""
}
variable "oauth2_client_secret" {
type = "string"
type = "string"
default = ""
}
variable "service_port" {
......
......@@ -286,26 +286,26 @@ module "geo-postgres" {
module "redis" {
allow_stopping_for_update = true
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-redis-server-single]\""
data_disk_size = 52
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
project = "${var.project}"
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "../../modules/google/generic-stor"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
bootstrap_version = 6
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-redis-server-single]\""
data_disk_size = 52
data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
project = "${var.project}"
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "../../modules/google/generic-stor"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
module "redis-cache" {
......
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