bump gcp providers and remove incorrect annotations

Author: upodroid

hack/generate-staging-builds-sa.sh

@@ -60,18 +60,14 @@ function generate() {
 # Prow build service accounts for ${PROJECT} registries.
 EOF
 
-    local name gsa
+    local name
     while read -r name; do
-        # google_service_account.build_sa uses account_id = substr(name, 0, 27)
-        gsa="${name:0:27}-sa"
         cat <<EOF
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: ${name}
-  annotations:
-    iam.gke.io/gcp-service-account: ${gsa}@${PROJECT}.iam.gserviceaccount.com
 EOF
     done < <(registry_names)
 }

infra/gcp/terraform/k8s-infra-releases-prod/.terraform.lock.hcl

@@ -20,7 +20,7 @@ See: https://cloud.google.com/storage/docs/audit-logging
 */
 module "audit_log_config" {
   source  = "terraform-google-modules/iam/google//modules/audit_config"
-  version = "~> 8.1"
+  version = "~> 8.2"
 
   project = module.project.project_id
 
@@ -35,7 +35,7 @@ module "audit_log_config" {
 
 module "iam" {
   source  = "terraform-google-modules/iam/google//modules/projects_iam"
-  version = "~> 8"
+  version = "~> 8.2"
 
   projects = [module.project.project_id]
 

infra/gcp/terraform/k8s-infra-releases-prod/iam.tf

@@ -30,11 +30,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 7.8.0"
+      version = "~> 7.42.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 7.8.0"
+      version = "~> 7.42.0"
     }
   }
 }

infra/gcp/terraform/k8s-infra-releases-prod/providers.tf

@@ -16,7 +16,7 @@ limitations under the License.
 
 module "iam" {
   source  = "terraform-google-modules/iam/google//modules/organizations_iam"
-  version = "~> 8.1"
+  version = "~> 8.2"
 
   organizations = [data.google_organization.org.org_id]
 

infra/gcp/terraform/k8s-infra-seed/iam.tf

@@ -21,7 +21,7 @@ provider "google-beta" {
 }
 
 terraform {
-  required_version = "1.10.5"
+  required_version = "1.12.2"
 
   backend "gcs" {
     bucket = "k8s-infra-terraform"
@@ -30,10 +30,12 @@ terraform {
 
   required_providers {
     google = {
-      version = "6.26.0"
+      source  = "hashicorp/google"
+      version = "~> 7.42.0"
     }
     google-beta = {
-      version = "6.26.0"
+      source  = "hashicorp/google-beta"
+      version = "~> 7.42.0"
     }
   }
 }

infra/gcp/terraform/k8s-infra-seed/provider.tf

@@ -16,7 +16,7 @@ limitations under the License.
 
 module "gcb_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 8.0"
+  version = "~> 11.1"
 
   name       = "k8s-release-gcb"
   project_id = module.project.project_id
@@ -36,7 +36,7 @@ module "gcb_bucket" {
 
 module "mock_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 8.0"
+  version = "~> 11.1"
 
   name       = "5d7373bbdcb8270361b96548387bf2a9ad0d48758c35"
   project_id = module.project.project_id
@@ -62,7 +62,7 @@ module "mock_bucket" {
 
 module "release_dev" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 8.0"
+  version = "~> 11.1"
 
   name              = "k8s-release-dev"
   project_id        = module.project.project_id
@@ -96,7 +96,7 @@ module "release_dev" {
 module "release" {
   // WE NEED TO DELETE THIS BUCKET, it exists as with a hashed name in k8s-infra-releases-prod and served via Fastly
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 8.0"
+  version = "~> 11.1"
 
   name       = "k8s-release"
   project_id = module.project.project_id

infra/gcp/terraform/k8s-release/buckets.tf

@@ -16,7 +16,7 @@ limitations under the License.
 
 module "iam" {
   source  = "terraform-google-modules/iam/google//modules/projects_iam"
-  version = "~> 8"
+  version = "~> 8.2"
 
   projects = [module.project.project_id]
 

infra/gcp/terraform/k8s-release/iam.tf

@@ -16,7 +16,7 @@ limitations under the License.
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.1"
+  version = "~> 18.2"
 
   name            = "k8s-release"
   project_id      = "k8s-release"

infra/gcp/terraform/k8s-release/main.tf

@@ -25,11 +25,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 6.12.0"
+      version = "~> 7.42.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 6.12.0"
+      version = "~> 7.42.0"
     }
   }
 }