Commit d1b2aa23 authored by John Jarvis's avatar John Jarvis

Merge branch 'jts/adds-gke-cluster-using-existing-methods' into 'master'

Adds GKE cluster for purposes of testing container registry

See merge request !759
parents 0defb4cd d30f2e04
...@@ -14,7 +14,7 @@ variable "gitlab_net_zone_id" {} ...@@ -14,7 +14,7 @@ variable "gitlab_net_zone_id" {}
## Google ## Google
provider "google" { provider "google" {
version = "~> 1.18.0" version = "~> 2.5.0"
project = "${var.project}" project = "${var.project}"
region = "${var.region}" region = "${var.region}"
} }
...@@ -256,8 +256,32 @@ module "gke-runner" { ...@@ -256,8 +256,32 @@ module "gke-runner" {
machine_type = "${var.machine_types["gke-runner"]}" machine_type = "${var.machine_types["gke-runner"]}"
project = "${var.project}" project = "${var.project}"
region = "${var.region}" region = "${var.region}"
pod_ip_cidr_range = "${var.subnetworks["pod-ip-cidr-range"]}" pod_ip_cidr_range = "${var.subnetworks["gke-runner-pod-cidr"]}"
service_ip_cidr_range = "${var.subnetworks["service-ip-cidr-range"]}" service_ip_cidr_range = "${var.subnetworks["gke-runner-service-cidr"]}"
}
##################################
#
# GKE Cluster for testing
#
##################################
# After provisioning you will need to configure
module "gke-pre" {
environment = "${var.environment}"
name = "gke-pre"
vpc = "${module.network.self_link}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v1.0.1"
initial_node_count = 1
ip_cidr_range = "${var.subnetworks["gke-pre"]}"
dns_zone_name = "${var.dns_zone_name}"
machine_type = "${var.machine_types["gke-pre"]}"
preemptible = "true"
project = "${var.project}"
region = "${var.region}"
pod_ip_cidr_range = "${var.subnetworks["gke-pre-pod-cidr"]}"
service_ip_cidr_range = "${var.subnetworks["gke-pre-service-cidr"]}"
} }
################################## ##################################
......
...@@ -56,6 +56,7 @@ variable "machine_types" { ...@@ -56,6 +56,7 @@ variable "machine_types" {
"gitlab-pre" = "n1-standard-16" "gitlab-pre" = "n1-standard-16"
"monitoring" = "n1-standard-2" "monitoring" = "n1-standard-2"
"sd-exporter" = "n1-standard-1" "sd-exporter" = "n1-standard-1"
"gke-pre" = "n1-standard-1"
"gke-runner" = "n1-standard-2" "gke-runner" = "n1-standard-2"
"web" = "n1-standard-1" "web" = "n1-standard-1"
"git" = "n1-standard-1" "git" = "n1-standard-1"
...@@ -138,16 +139,17 @@ variable "subnetworks" { ...@@ -138,16 +139,17 @@ variable "subnetworks" {
"web-pages" = "10.232.17.0/24" "web-pages" = "10.232.17.0/24"
"gitaly" = "10.232.18.0/24" "gitaly" = "10.232.18.0/24"
"deploy" = "10.232.19.0/24" "deploy" = "10.232.19.0/24"
"gke-pre" = "10.232.20.0/24"
# 10.232.20.0 is skipped until the test "web-puma" = "10.232.21.0/24"
# gke cluster for registry is removed
"web-puma" = "10.232.21.0/24"
# /mnt/storage # /mnt/storage
"filestore-storage" = "10.237.0.0/29" "filestore-storage" = "10.237.0.0/29"
"pod-ip-cidr-range" = "10.238.0.0/16" "gke-runner-pod-cidr" = "10.238.0.0/16"
"service-ip-cidr-range" = "10.239.0.0/16" "gke-runner-service-cidr" = "10.239.0.0/16"
"gke-pre-pod-cidr" = "10.240.0.0/16"
"gke-pre-service-cidr" = "10.241.0.0/16"
} }
} }
......
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