Fix edgecontainer cluster upgrade endpoint and update the machine con…

…figuration in internal test (#9337) (#16347) [upstream:041ab8cf5c440e58849f5e4512f210cec9b1ded9] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Oct 24, 2023 · 2c358d7 · 2c358d7
1 parent 5dca1f5
commit 2c358d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.changelog/9337.txt b/.changelog/9337.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+edgecontainer: fixed an issue where the update endpoint for `google_edgecontainer_cluster` was incorrect.
+```
diff --git a/google/services/edgecontainer/resource_edgecontainer_cluster.go b/google/services/edgecontainer/resource_edgecontainer_cluster.go
@@ -964,7 +964,7 @@ func resourceEdgecontainerClusterUpdate(d *schema.ResourceData, meta interface{}
 			obj["targetVersion"] = targetVersionProp
 		}
 
-		url, err := tpgresource.ReplaceVars(d, config, "{{EdgecontainerBasePath}}projects/{{project}}/locations/{{region}}/instances/{{name}}:upgrade")
+		url, err := tpgresource.ReplaceVars(d, config, "{{EdgecontainerBasePath}}projects/{{project}}/locations/{{location}}/clusters/{{name}}:upgrade")
 		if err != nil {
 			return err
 		}

diff --git a/google/services/edgecontainer/resource_edgecontainer_node_pool_generated_test.go b/google/services/edgecontainer/resource_edgecontainer_node_pool_generated_test.go
@@ -69,21 +69,21 @@ resource "google_edgecontainer_cluster" "cluster" {
   }
 
   networking {
-    cluster_ipv4_cidr_blocks = ["10.96.0.0/17"]
-    services_ipv4_cidr_blocks = ["10.0.0.0/21"]
+    cluster_ipv4_cidr_blocks = ["10.16.0.0/16"]
+    services_ipv4_cidr_blocks = ["10.17.0.0/16"]
   }
 
   fleet {
     project = "projects/${data.google_project.project.number}"
   }
 
-  external_load_balancer_ipv4_address_pools = ["10.100.68.100-10.100.68.102"]
+  external_load_balancer_ipv4_address_pools = ["172.17.34.97-172.17.34.99"]
 
   control_plane {
     local {
-      node_location = "us-central1-edge-den29"
+      node_location = "us-central1-edge-den25349"
       node_count = 1
-      machine_filter = "den29-06"
+      machine_filter = "den25349-01"
       shared_deployment_policy = "ALLOWED"
     }
   }
@@ -93,8 +93,8 @@ resource "google_edgecontainer_node_pool" "default" {
   name = "nodepool-1"
   cluster = google_edgecontainer_cluster.cluster.name
   location = "us-central1"
-  node_location = "us-central1-edge-den29"
-  machine_filter = "NOT name:den29-01"
+  node_location = "us-central1-edge-den25349"
+  machine_filter = "den25349-02"
   node_count = 1
 }