Merge pull request #157 from alexkonkin/feature/101_add_guest_acceler…

…ator GKE 101: added guest_accelerator feature and tests
terraform-google-modules · Jun 3, 2019 · 3011528 · 3011528
2 parents cf2c57e + c5a6fbe
commit 3011528
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 12 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -39,6 +39,9 @@ suites:
       systems:
         - name: deploy_service
           backend: local
+    lifecycle:
+      pre_verify:
+        - sleep 10
     provisioner:
       name: terraform
   - name: "disable_client_cert"

diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
@@ -145,6 +145,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
@@ -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/cluster_regional.tf b/cluster_regional.tf
@@ -137,6 +137,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
@@ -137,6 +137,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/disable_client_cert/README.md b/examples/disable_client_cert/README.md
@@ -37,6 +37,7 @@ This example illustrates how to create a simple cluster and disable deprecated s
 | network |  |
 | project\_id |  |
 | region |  |
+| service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
 | subnetwork |  |
 | zones | List of zones in which the cluster resides |
 

diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -51,15 +51,17 @@ module "gke" {
       auto_upgrade    = true
     },
     {
-      name            = "pool-02"
-      machine_type    = "n1-standard-2"
-      min_count       = 1
-      max_count       = 2
-      disk_size_gb    = 30
-      disk_type       = "pd-standard"
-      image_type      = "COS"
-      auto_repair     = false
-      service_account = "${var.compute_engine_service_account}"
+      name              = "pool-02"
+      machine_type      = "n1-standard-2"
+      min_count         = 1
+      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/helpers/generate_modules/generate_modules.py b/helpers/generate_modules/generate_modules.py
@@ -22,9 +22,9 @@
 
 TEMPLATE_FOLDER = "./autogen"
 BASE_TEMPLATE_OPTIONS = {
-        'autogeneration_note': '// This file was automatically generated ' +
-                               'from a template in {folder}'.format(
-                                   folder=TEMPLATE_FOLDER
+    'autogeneration_note': '// This file was automatically generated ' +
+                           'from a template in {folder}'.format(
+                               folder=TEMPLATE_FOLDER
                                ),
 }
 

diff --git a/modules/private-cluster/cluster_regional.tf b/modules/private-cluster/cluster_regional.tf
@@ -143,6 +143,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
@@ -143,6 +143,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,9 @@
 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"
   describe command("gcloud --project=#{project_id} container clusters --zone=#{location} describe #{cluster_name} --format=json") do
@@ -201,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(

diff --git a/test/integration/node_pool/controls/kubectl.rb b/test/integration/node_pool/controls/kubectl.rb
@@ -79,6 +79,11 @@
               key: "all-pools-example",
               value: "true",
             },
+            {
+              effect: "NoSchedule",
+              key: "nvidia.com/gpu",
+              value: "present",
+            },
           ])
         end
       end