Merge pull request #8670 from ameukam/oci-proxy-switch-eu-regions

k8s-ci-robot · web-flow · commit d380c9d88ab7 · 2025-10-20T08:42:39.000-07:00
GCP: switch buckets for the prod registry
diff --git a/infra/gcp/terraform/k8s-infra-oci-proxy-prod/provider.tf b/infra/gcp/terraform/k8s-infra-oci-proxy-prod/provider.tf
@@ -29,11 +29,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.84.0"
+      version = "~> 6.50.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.84.0"
+      version = "~> 6.50.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/k8s-infra-oci-proxy/provider.tf b/infra/gcp/terraform/k8s-infra-oci-proxy/provider.tf
@@ -29,11 +29,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.84.0"
+      version = "~> 6.50.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.84.0"
+      version = "~> 6.50.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/modules/monitoring/uptime-alert/versions.tf b/infra/gcp/terraform/modules/monitoring/uptime-alert/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.84.0"
+      version = "~> 6.50.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.84.0"
+      version = "~> 6.50.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/modules/oci-proxy/main.tf b/infra/gcp/terraform/modules/oci-proxy/main.tf
@@ -237,8 +237,8 @@ locals {
       environment_variables = [
         {
           name = "DEFAULT_AWS_BASE_URL",
-          // AWS eu-central-1 is Frankfurt
-          value = "https://prod-registry-k8s-io-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com",
+          // AWS eu-south-1 is Milan
+          value = "https://prod-registry-k8s-io-eu-south-1.s3.dualstack.eu-south-1.amazonaws.com",
         },
         {
           name  = "UPSTREAM_REGISTRY_ENDPOINT",
@@ -255,8 +255,8 @@ locals {
       environment_variables = [
         {
           name = "DEFAULT_AWS_BASE_URL",
-          // AWS eu-west-1 is in Ireland
-          value = "https://prod-registry-k8s-io-eu-west-1.s3.dualstack.eu-west-1.amazonaws.com",
+          // AWS eu-west-3 is in Paris
+          value = "https://prod-registry-k8s-io-eu-west-3.s3.dualstack.eu-west-3.amazonaws.com",
         },
         {
           name  = "UPSTREAM_REGISTRY_ENDPOINT",

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ terraform {`
`29`	`29`	`required_providers {`
`30`	`30`	`google = {`
`31`	`31`	`source = "hashicorp/google"`
`32`		`- version = "~> 4.84.0"`
	`32`	`+ version = "~> 6.50.0"`
`33`	`33`	`}`
`34`	`34`	`google-beta = {`
`35`	`35`	`source = "hashicorp/google-beta"`
`36`		`- version = "~> 4.84.0"`
	`36`	`+ version = "~> 6.50.0"`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ terraform {`
`20`	`20`	`required_providers {`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = "~> 4.84.0"`
	`23`	`+ version = "~> 6.50.0"`
`24`	`24`	`}`
`25`	`25`	`google-beta = {`
`26`	`26`	`source = "hashicorp/google-beta"`
`27`		`- version = "~> 4.84.0"`
	`27`	`+ version = "~> 6.50.0"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,8 @@ locals {`
`237`	`237`	`environment_variables = [`
`238`	`238`	`{`
`239`	`239`	`name = "DEFAULT_AWS_BASE_URL",`
`240`		`- // AWS eu-central-1 is Frankfurt`
`241`		`- value = "https://prod-registry-k8s-io-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com",`
	`240`	`+ // AWS eu-south-1 is Milan`
	`241`	`+ value = "https://prod-registry-k8s-io-eu-south-1.s3.dualstack.eu-south-1.amazonaws.com",`
`242`	`242`	`},`
`243`	`243`	`{`
`244`	`244`	`name = "UPSTREAM_REGISTRY_ENDPOINT",`
`@@ -255,8 +255,8 @@ locals {`
`255`	`255`	`environment_variables = [`
`256`	`256`	`{`
`257`	`257`	`name = "DEFAULT_AWS_BASE_URL",`
`258`		`- // AWS eu-west-1 is in Ireland`
`259`		`- value = "https://prod-registry-k8s-io-eu-west-1.s3.dualstack.eu-west-1.amazonaws.com",`
	`258`	`+ // AWS eu-west-3 is in Paris`
	`259`	`+ value = "https://prod-registry-k8s-io-eu-west-3.s3.dualstack.eu-west-3.amazonaws.com",`
`260`	`260`	`},`
`261`	`261`	`{`
`262`	`262`	`name = "UPSTREAM_REGISTRY_ENDPOINT",`