Skip to content

Commit a466549

Browse files
committed
Fix linter errors
1 parent 3746115 commit a466549

File tree

35 files changed

+116
-102
lines changed

35 files changed

+116
-102
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99
### Changed
10+
* Add support for private clusters via submodule. #69
1011
* Set `horizontal_pod_autoscaling` to `true` by default. #42
1112
* Add `remove_default_node_pool` set to `false` by default #15
1213
* Allow arbitrary key-value pairs to be set on node pool metadata. #52
13-
* Add `initial_node_count` parameter to node_pool block. #60
14+
* Add `initial_node_count` parameter to node_pool block. #60
1415

1516
## [v0.4.0] - 2018-12-19
1617
### Added

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Terraform Kubernetes Engine Module
22

3-
This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.
3+
This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.
44
The resources/services/activations/deletions that this module will create/trigger are:
55
- Create a GKE cluster with the provided addons
66
- Create GKE Node Pool(s) with provided configuration and attach to cluster
@@ -263,7 +263,7 @@ Alternatively, you can simply run `make test_integration_docker` to run all the
263263
#### Test configuration
264264

265265
Each test-kitchen instance is configured with a `variables.tfvars` file in the test fixture directory, e.g. `test/fixtures/node_pool/terraform.tfvars`.
266-
For convenience, since all of the variables are project-specific, these files have been symlinked to `test/fixtures/shared/terraform.tfvars`.
266+
For convenience, since all of the variables are project-specific, these files have been symlinked to `test/fixtures/shared/terraform.tfvars`.
267267
Similarly, each test fixture has a `variables.tf` to define these variables, and an `outputs.tf` to facilitate providing necessary information for `inspec` to locate and query against created resources.
268268

269269
Each test-kitchen instance creates a GCP Network and Subnetwork fixture to house resources, and may create any other necessary fixture data as needed.
@@ -313,4 +313,4 @@ are as follows:
313313
is a compiled language so there is no standard linter.
314314
* Terraform - terraform has a built-in linter in the 'terraform validate'
315315
command.
316-
* Dockerfiles - hadolint. Can be found in homebrew
316+
* Dockerfiles - hadolint. Can be found in homebrew

auth.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ provider "kubernetes" {
3131
host = "https://${local.cluster_endpoint}"
3232
token = "${data.google_client_config.default.access_token}"
3333
cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
34-
}
34+
}

autogen/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ Alternatively, you can simply run `make test_integration_docker` to run all the
273273
#### Test configuration
274274

275275
Each test-kitchen instance is configured with a `variables.tfvars` file in the test fixture directory, e.g. `test/fixtures/node_pool/terraform.tfvars`.
276-
For convenience, since all of the variables are project-specific, these files have been symlinked to `test/fixtures/shared/terraform.tfvars`.
276+
For convenience, since all of the variables are project-specific, these files have been symlinked to `test/fixtures/shared/terraform.tfvars`.
277277
Similarly, each test fixture has a `variables.tf` to define these variables, and an `outputs.tf` to facilitate providing necessary information for `inspec` to locate and query against created resources.
278278

279279
Each test-kitchen instance creates a GCP Network and Subnetwork fixture to house resources, and may create any other necessary fixture data as needed.

build/docker/kitchen_terraform/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
ARG BASE_IMAGE
1616

17+
# hadolint ignore=DL3006
1718
FROM $BASE_IMAGE
1819

1920
RUN apk add --no-cache \

cluster_regional.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ resource "google_container_cluster" "primary" {
8484
service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
8585
}
8686
}
87+
8788
remove_default_node_pool = "${var.remove_default_node_pool}"
8889
}
8990

@@ -154,4 +155,4 @@ resource "null_resource" "wait_for_regional_cluster" {
154155
}
155156

156157
depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
157-
}
158+
}

cluster_zonal.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ resource "google_container_cluster" "zonal_primary" {
8484
service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
8585
}
8686
}
87+
8788
remove_default_node_pool = "${var.remove_default_node_pool}"
8889
}
8990

@@ -154,4 +155,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
154155
}
155156

156157
depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
157-
}
158+
}

dns.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ EOF
5151
}
5252

5353
depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
54-
}
54+
}

examples/deploy_service/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ To provision this example, run the following from within this directory:
5050
- `terraform init` to get the plugins
5151
- `terraform plan` to see the infrastructure plan
5252
- `terraform apply` to apply the infrastructure build
53-
- `terraform destroy` to destroy the built infrastructure
53+
- `terraform destroy` to destroy the built infrastructure

examples/node_pool/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ To provision this example, run the following from within this directory:
4444
- `terraform init` to get the plugins
4545
- `terraform plan` to see the infrastructure plan
4646
- `terraform apply` to apply the infrastructure build
47-
- `terraform destroy` to destroy the built infrastructure
47+
- `terraform destroy` to destroy the built infrastructure

0 commit comments

Comments
 (0)