fix: remove datapath provider from Autopilot modules (terraform-google-modules#1556)

mastersingh24 · bharathkkb · web-flow · commit ea012f5c57a7 · 2023-02-03T13:25:12.000-06:00
Signed-off-by: Gari Singh &lt;gari.r.singh@gmail.com&gt;
Co-authored-by: Bharath KKB &lt;bharathkrishnakb@gmail.com&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -298,8 +298,10 @@ resource "google_container_cluster" "primary" {
     }
     {% endif %}
   }
-
+  {% if autopilot_cluster != true %}
+  
   datapath_provider = var.datapath_provider
+  {% endif %}
 
   {% if beta_cluster %}
   networking_mode = "VPC_NATIVE"
diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -119,8 +119,6 @@ resource "google_container_cluster" "primary" {
 
   }
 
-  datapath_provider = var.datapath_provider
-
   networking_mode = "VPC_NATIVE"
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
diff --git a/modules/beta-autopilot-public-cluster/cluster.tf b/modules/beta-autopilot-public-cluster/cluster.tf
@@ -119,8 +119,6 @@ resource "google_container_cluster" "primary" {
 
   }
 
-  datapath_provider = var.datapath_provider
-
   networking_mode = "VPC_NATIVE"
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods

Original file line number	Diff line number	Diff line change
`@@ -298,8 +298,10 @@ resource "google_container_cluster" "primary" {`
`298`	`298`	`}`
`299`	`299`	`{% endif %}`
`300`	`300`	`}`
`301`		`-`
	`301`	`+ {% if autopilot_cluster != true %}`
	`302`	`+`
`302`	`303`	`datapath_provider = var.datapath_provider`
	`304`	`+ {% endif %}`
`303`	`305`
`304`	`306`	`{% if beta_cluster %}`
`305`	`307`	`networking_mode = "VPC_NATIVE"`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,6 @@ resource "google_container_cluster" "primary" {`
`119`	`119`
`120`	`120`	`}`
`121`	`121`
`122`		`- datapath_provider = var.datapath_provider`
`123`		`-`
`124`	`122`	`networking_mode = "VPC_NATIVE"`
`125`	`123`	`ip_allocation_policy {`
`126`	`124`	`cluster_secondary_range_name = var.ip_range_pods`