Merge pull request #197 from marko7460/add_guest_accelerator

morgante · web-flow · commit cd9bed48d078 · 2019-06-27T14:05:00.000-04:00
Adding back guest_accelerator
diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
@@ -169,6 +169,11 @@ resource "google_container_node_pool" "pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/autogen/cluster_zonal.tf b/autogen/cluster_zonal.tf
@@ -170,6 +170,11 @@ resource "google_container_node_pool" "zonal_pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -144,6 +144,11 @@ resource "google_container_node_pool" "pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -145,6 +145,11 @@ resource "google_container_node_pool" "zonal_pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,12 +19,12 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.7.0"
+  version = "~> 2.9.0"
   region  = "${var.region}"
 }
 
 provider "google-beta" {
-  version = "~> 2.7.0"
+  version = "~> 2.9.0"
   region  = "${var.region}"
 }
 
@@ -57,6 +57,8 @@ module "gke" {
       max_count         = 2
       disk_size_gb      = 30
       disk_type         = "pd-standard"
+      accelerator_count = 1
+      accelerator_type  = "nvidia-tesla-p4"
       image_type        = "COS"
       auto_repair       = false
       service_account   = "${var.compute_engine_service_account}"
diff --git a/modules/beta-private-cluster/cluster_regional.tf b/modules/beta-private-cluster/cluster_regional.tf
@@ -161,6 +161,11 @@ resource "google_container_node_pool" "pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/modules/beta-private-cluster/cluster_zonal.tf b/modules/beta-private-cluster/cluster_zonal.tf
@@ -162,6 +162,11 @@ resource "google_container_node_pool" "zonal_pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster/cluster_regional.tf b/modules/beta-public-cluster/cluster_regional.tf
@@ -155,6 +155,11 @@ resource "google_container_node_pool" "pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/modules/beta-public-cluster/cluster_zonal.tf b/modules/beta-public-cluster/cluster_zonal.tf
@@ -156,6 +156,11 @@ resource "google_container_node_pool" "zonal_pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/modules/private-cluster/cluster_regional.tf b/modules/private-cluster/cluster_regional.tf
@@ -150,6 +150,11 @@ resource "google_container_node_pool" "pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/modules/private-cluster/cluster_zonal.tf b/modules/private-cluster/cluster_zonal.tf
@@ -151,6 +151,11 @@ resource "google_container_node_pool" "zonal_pools" {
       "${concat(var.node_pools_oauth_scopes["all"],
       var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
     ]
+
+    guest_accelerator {
+      type  = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
+      count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
+    }
   }
 
   lifecycle {
diff --git a/test/integration/node_pool/controls/gcloud.rb b/test/integration/node_pool/controls/gcloud.rb
@@ -16,6 +16,8 @@
 location = attribute('location')
 cluster_name = attribute('cluster_name')
 
+expected_accelerators_count = "1"
+expected_accelerators_type = "nvidia-tesla-p4"
 
 control "gcloud" do
   title "Google Compute Engine GKE configuration"
@@ -202,6 +204,18 @@
           )
         end
 
+        it "has the expected accelerators" do
+          expect(data['nodePools']).to include(
+            including(
+              "name" => "pool-02",
+              "config" => including(
+                "accelerators" => [{"acceleratorCount" => expected_accelerators_count,
+                                    "acceleratorType" => expected_accelerators_type}],
+              ),
+            )
+          )
+        end
+
         it "has the expected disk size" do
           expect(data['nodePools']).to include(
             including(

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,11 @@ resource "google_container_node_pool" "pools" {`
`169`	`169`	`"${concat(var.node_pools_oauth_scopes["all"],`
`170`	`170`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`171`	`171`	`]`
	`172`	`+`
	`173`	`+ guest_accelerator {`
	`174`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`175`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`176`	`+ }`
`172`	`177`	`}`
`173`	`178`
`174`	`179`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,11 @@ resource "google_container_node_pool" "zonal_pools" {`
`170`	`170`	`"${concat(var.node_pools_oauth_scopes["all"],`
`171`	`171`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`172`	`172`	`]`
	`173`	`+`
	`174`	`+ guest_accelerator {`
	`175`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`176`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`177`	`+ }`
`173`	`178`	`}`
`174`	`179`
`175`	`180`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,11 @@ resource "google_container_node_pool" "pools" {`
`144`	`144`	`"${concat(var.node_pools_oauth_scopes["all"],`
`145`	`145`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`146`	`146`	`]`
	`147`	`+`
	`148`	`+ guest_accelerator {`
	`149`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`150`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`151`	`+ }`
`147`	`152`	`}`
`148`	`153`
`149`	`154`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,11 @@ resource "google_container_node_pool" "zonal_pools" {`
`145`	`145`	`"${concat(var.node_pools_oauth_scopes["all"],`
`146`	`146`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`147`	`147`	`]`
	`148`	`+`
	`149`	`+ guest_accelerator {`
	`150`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`151`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`152`	`+ }`
`148`	`153`	`}`
`149`	`154`
`150`	`155`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,11 @@ resource "google_container_node_pool" "pools" {`
`161`	`161`	`"${concat(var.node_pools_oauth_scopes["all"],`
`162`	`162`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`163`	`163`	`]`
	`164`	`+`
	`165`	`+ guest_accelerator {`
	`166`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`167`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`168`	`+ }`
`164`	`169`	`}`
`165`	`170`
`166`	`171`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,11 @@ resource "google_container_node_pool" "zonal_pools" {`
`162`	`162`	`"${concat(var.node_pools_oauth_scopes["all"],`
`163`	`163`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`164`	`164`	`]`
	`165`	`+`
	`166`	`+ guest_accelerator {`
	`167`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`168`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`169`	`+ }`
`165`	`170`	`}`
`166`	`171`
`167`	`172`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,11 @@ resource "google_container_node_pool" "pools" {`
`155`	`155`	`"${concat(var.node_pools_oauth_scopes["all"],`
`156`	`156`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`157`	`157`	`]`
	`158`	`+`
	`159`	`+ guest_accelerator {`
	`160`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`161`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`162`	`+ }`
`158`	`163`	`}`
`159`	`164`
`160`	`165`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,11 @@ resource "google_container_node_pool" "zonal_pools" {`
`156`	`156`	`"${concat(var.node_pools_oauth_scopes["all"],`
`157`	`157`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`158`	`158`	`]`
	`159`	`+`
	`160`	`+ guest_accelerator {`
	`161`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`162`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`163`	`+ }`
`159`	`164`	`}`
`160`	`165`
`161`	`166`	`lifecycle {`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,11 @@ resource "google_container_node_pool" "pools" {`
`150`	`150`	`"${concat(var.node_pools_oauth_scopes["all"],`
`151`	`151`	`var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",`
`152`	`152`	`]`
	`153`	`+`
	`154`	`+ guest_accelerator {`
	`155`	`+ type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"`
	`156`	`+ count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"`
	`157`	`+ }`
`153`	`158`	`}`
`154`	`159`
`155`	`160`	`lifecycle {`