Skip to content

Commit 2d2e4fe

Browse files
morgantemorgante
authored
Merge branch 'master' into feature/beta-cluster
2 parents 26c520d + 88eb7b0 commit 2d2e4fe

File tree

11 files changed

+17
-58
lines changed

11 files changed

+17
-58
lines changed

‎.dockerignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.git
2+
.terraform
3+
.terraform.d
4+
.kitchen
5+
terraform.tfstate.d
6+
test/fixtures/*/.terraform
7+
test/fixtures/*/terraform.tfstate.d
8+
examples/.kitchen
9+
examples/*/.terraform
10+
examples/*/terraform.tfstate.d

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ docker_run:
125125
-e SERVICE_ACCOUNT_JSON \
126126
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
127127
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
128-
-v $(CURDIR):/cft/workdir \
128+
-v "$(CURDIR)":/cft/workdir \
129129
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
130130
/bin/bash -c "source test/ci_integration.sh && setup_environment && exec /bin/bash"
131131

@@ -139,7 +139,7 @@ docker_create: docker_build_kitchen_terraform
139139
-e SERVICE_ACCOUNT_JSON \
140140
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
141141
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
142-
-v $(CURDIR):/cft/workdir \
142+
-v "$(CURDIR)":/cft/workdir \
143143
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
144144
/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen create"
145145

@@ -153,7 +153,7 @@ docker_converge:
153153
-e SERVICE_ACCOUNT_JSON \
154154
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
155155
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
156-
-v $(CURDIR):/cft/workdir \
156+
-v "$(CURDIR)":/cft/workdir \
157157
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
158158
/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen converge && kitchen converge"
159159

@@ -167,7 +167,7 @@ docker_verify:
167167
-e SERVICE_ACCOUNT_JSON \
168168
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
169169
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
170-
-v $(CURDIR):/cft/workdir \
170+
-v "$(CURDIR)":/cft/workdir \
171171
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
172172
/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen verify"
173173

@@ -181,7 +181,7 @@ docker_destroy:
181181
-e SERVICE_ACCOUNT_JSON \
182182
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
183183
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
184-
-v $(CURDIR):/cft/workdir \
184+
-v "$(CURDIR)":/cft/workdir \
185185
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
186186
/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen destroy"
187187

@@ -193,6 +193,6 @@ test_integration_docker:
193193
-e REGION \
194194
-e ZONES \
195195
-e SERVICE_ACCOUNT_JSON \
196-
-v $(CURDIR):/cft/workdir \
196+
-v "$(CURDIR)":/cft/workdir \
197197
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
198198
/bin/bash -c "test/ci_integration.sh"

‎autogen/cluster_regional.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ resource "google_container_node_pool" "pools" {
163163
"${concat(var.node_pools_oauth_scopes["all"],
164164
var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
165165
]
166-
167-
guest_accelerator {
168-
type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
169-
count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
170-
}
171166
}
172167

173168
lifecycle {

‎autogen/cluster_zonal.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ resource "google_container_node_pool" "zonal_pools" {
163163
"${concat(var.node_pools_oauth_scopes["all"],
164164
var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
165165
]
166-
167-
guest_accelerator {
168-
type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
169-
count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
170-
}
171166
}
172167

173168
lifecycle {

‎cluster_regional.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@ resource "google_container_node_pool" "pools" {
144144
"${concat(var.node_pools_oauth_scopes["all"],
145145
var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
146146
]
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-
}
152147
}
153148

154149
lifecycle {

‎cluster_zonal.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@ resource "google_container_node_pool" "zonal_pools" {
144144
"${concat(var.node_pools_oauth_scopes["all"],
145145
var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
146146
]
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-
}
152147
}
153148

154149
lifecycle {

‎examples/node_pool/main.tf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ module "gke" {
5757
max_count = 2
5858
disk_size_gb = 30
5959
disk_type = "pd-standard"
60-
accelerator_count = 1
61-
accelerator_type = "nvidia-tesla-p4"
6260
image_type = "COS"
6361
auto_repair = false
6462
service_account = "${var.compute_engine_service_account}"

‎modules/private-cluster/cluster_regional.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ resource "google_container_node_pool" "pools" {
152152
"${concat(var.node_pools_oauth_scopes["all"],
153153
var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
154154
]
155-
156-
guest_accelerator {
157-
type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
158-
count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
159-
}
160155
}
161156

162157
lifecycle {

‎modules/private-cluster/cluster_zonal.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ resource "google_container_node_pool" "zonal_pools" {
152152
"${concat(var.node_pools_oauth_scopes["all"],
153153
var.node_pools_oauth_scopes[lookup(var.node_pools[count.index], "name")])}",
154154
]
155-
156-
guest_accelerator {
157-
type = "${lookup(var.node_pools[count.index], "accelerator_type", "")}"
158-
count = "${lookup(var.node_pools[count.index], "accelerator_count", 0)}"
159-
}
160155
}
161156

162157
lifecycle {

‎test/integration/node_pool/controls/gcloud.rb‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
location = attribute('location')
1717
cluster_name = attribute('cluster_name')
1818

19-
expected_accelerators_count = "1"
20-
expected_accelerators_type = "nvidia-tesla-p4"
2119

2220
control "gcloud" do
2321
title "Google Compute Engine GKE configuration"
@@ -204,18 +202,6 @@
204202
)
205203
end
206204

207-
it "has the expected accelerators" do
208-
expect(data['nodePools']).to include(
209-
including(
210-
"name" => "pool-02",
211-
"config" => including(
212-
"accelerators" => [{"acceleratorCount" => expected_accelerators_count,
213-
"acceleratorType" => expected_accelerators_type}],
214-
),
215-
)
216-
)
217-
end
218-
219205
it "has the expected disk size" do
220206
expect(data['nodePools']).to include(
221207
including(

0 commit comments

Comments
 (0)