Merge branch 'jarv/update-google-provider' into 'master'

Jarv/update google provider

See merge request !772

environments/gprd/.terraform-version

-0.11.7
+0.11.13

environments/gstg/.terraform-version

-0.11.7
+0.11.13

environments/ops/main.tf

@@ -996,3 +996,17 @@ module "postgres-backup" {
   source                              = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/database-backup-bucket.git?ref=v1.0.0"
   retention_days                      = "${var.postgres_backup_retention_days}"
 }
+
+##################################
+#
+#  Service accounts
+#
+##################################
+
+## Service account used for granting ops
+## write access to asset buckets
+
+resource "google_service_account" "assets" {
+  account_id   = "asset-uploader"
+  display_name = "Service account that allows ops to write to assets buckets in other projects"
+}

environments/pre/main.tf

@@ -14,7 +14,7 @@ variable "gitlab_net_zone_id" {}
 ## Google
 
 provider "google" {
-  version = "~> 2.5.0"
+  version = "~> 2.6.0"
   project = "${var.project}"
   region  = "${var.region}"
 }
@@ -222,17 +222,10 @@ module "bastion" {
 
 module "storage" {
   environment                       = "${var.environment}"
-  versioning                        = "${var.versioning}"
-  artifact_age                      = "${var.artifact_age}"
-  lfs_object_age                    = "${var.lfs_object_age}"
-  package_repo_age                  = "${var.package_repo_age}"
-  upload_age                        = "${var.upload_age}"
-  storage_log_age                   = "${var.storage_log_age}"
-  storage_class                     = "${var.storage_class}"
   service_account_email             = "${var.service_account_email}"
   gcs_service_account_email         = "${var.gcs_service_account_email}"
   gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}"
-  source                            = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.0.0"
+  source                            = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.2.0"
 }
 
 ##################################
@@ -249,7 +242,7 @@ module "gke-runner" {
   environment           = "${var.environment}"
   name                  = "gke-runner"
   vpc                   = "${module.network.self_link}"
-  source                = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v1.0.2"
+  source                = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v1.0.3"
   initial_node_count    = 1
   ip_cidr_range         = "${var.subnetworks["gke-runner"]}"
   dns_zone_name         = "${var.dns_zone_name}"
@@ -272,7 +265,7 @@ 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"
+  source                = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v1.0.3"
   initial_node_count    = 1
   ip_cidr_range         = "${var.subnetworks["gke-pre"]}"
   dns_zone_name         = "${var.dns_zone_name}"

environments/pre/web-puma.tf

@@ -30,7 +30,7 @@ module "web-puma" {
   region                = "${var.region}"
   service_account_email = "${var.service_account_email}"
   service_port          = 443
-  source                = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
+  source                = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
   tier                  = "sv"
   use_new_node_name     = true
   use_external_ip       = true