From 2153e479b284f1b7efcf189f05b42dcfba8ded35 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Wed, 10 Jan 2024 19:44:20 -0600 Subject: [PATCH 1/2] Bump GCP terraform provider to latest --- upup/pkg/fi/cloudup/terraform/target_hcl2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/terraform/target_hcl2.go b/upup/pkg/fi/cloudup/terraform/target_hcl2.go index 763668fbe8..9c3f7e7b3d 100644 --- a/upup/pkg/fi/cloudup/terraform/target_hcl2.go +++ b/upup/pkg/fi/cloudup/terraform/target_hcl2.go @@ -245,7 +245,7 @@ func (t *TerraformTarget) writeTerraform(buf *bytes.Buffer) { }, "google": { "source": "hashicorp/google", - "version": ">= 2.19.0", + "version": ">= 5.11.0", }, "hcloud": { "source": "hetznercloud/hcloud", From eaf4174c5430e12031844bf8eb3b48e67a73a8ff Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Wed, 10 Jan 2024 19:44:37 -0600 Subject: [PATCH 2/2] ./hack/update-expected.sh --- tests/integration/update_cluster/ha_gce/kubernetes.tf | 2 +- tests/integration/update_cluster/many-addons-gce/kubernetes.tf | 2 +- tests/integration/update_cluster/minimal_gce/kubernetes.tf | 2 +- .../update_cluster/minimal_gce_dns-none/kubernetes.tf | 2 +- tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf | 2 +- .../minimal_gce_ilb_longclustername/kubernetes.tf | 2 +- .../update_cluster/minimal_gce_longclustername/kubernetes.tf | 2 +- tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf | 2 +- .../update_cluster/minimal_gce_private/kubernetes.tf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf index 962dabbd0d..34b1f05bb9 100644 --- a/tests/integration/update_cluster/ha_gce/kubernetes.tf +++ b/tests/integration/update_cluster/ha_gce/kubernetes.tf @@ -823,7 +823,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf index 736e8d80a3..8f80778ff2 100644 --- a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf @@ -603,7 +603,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce/kubernetes.tf b/tests/integration/update_cluster/minimal_gce/kubernetes.tf index ec264a1b04..374637e44d 100644 --- a/tests/integration/update_cluster/minimal_gce/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce/kubernetes.tf @@ -579,7 +579,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf index f79d5ad0e3..9ff78b3675 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf @@ -673,7 +673,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf index 6255a7d983..fbc9707fe9 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf @@ -642,7 +642,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf index 04a4c34db7..f8ce229511 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf @@ -642,7 +642,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf index 5ce5d30844..4419c4c64f 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf @@ -579,7 +579,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf index 694265796e..73988dbe90 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf @@ -632,7 +632,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } } diff --git a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf index e656a11cc7..2c53d1a15d 100644 --- a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf @@ -592,7 +592,7 @@ terraform { } google = { "source" = "hashicorp/google" - "version" = ">= 2.19.0" + "version" = ">= 5.11.0" } } }