Skip to content

Commit d75120d

Browse files
committed
Add submodule and tests for private clusters
1 parent 3f7527e commit d75120d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2928
-53
lines changed

.kitchen.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,19 @@ suites:
7676
backend: local
7777
provisioner:
7878
name: terraform
79+
- name: "simple_regional_private"
80+
driver:
81+
name: "terraform"
82+
command_timeout: 1800
83+
root_module_directory: test/fixtures/simple_regional_private
84+
verifier:
85+
name: terraform
86+
color: false
87+
systems:
88+
- name: simple_regional_private
89+
backend: local
90+
provisioner:
91+
name: terraform
7992
- name: "simple_zonal"
8093
driver:
8194
name: "terraform"
@@ -89,6 +102,19 @@ suites:
89102
backend: local
90103
provisioner:
91104
name: terraform
105+
- name: "simple_zonal_private"
106+
driver:
107+
name: "terraform"
108+
command_timeout: 1800
109+
root_module_directory: test/fixtures/simple_zonal_private
110+
verifier:
111+
name: terraform
112+
color: false
113+
systems:
114+
- name: simple_zonal_private
115+
backend: local
116+
provisioner:
117+
name: terraform
92118
- name: "stub_domains"
93119
driver:
94120
name: "terraform"

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +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.
4-
3+
This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.
54
The resources/services/activations/deletions that this module will create/trigger are:
65
- Create a GKE cluster with the provided addons
76
- Create GKE Node Pool(s) with provided configuration and attach to cluster
@@ -173,7 +172,6 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
173172
### Terraform plugins
174173
- [Terraform](https://www.terraform.io/downloads.html) 0.10.x
175174
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v1.8.0
176-
177175
### Configure a Service Account
178176
In order to execute this module you must have a Service Account with the
179177
following project roles:
@@ -209,9 +207,9 @@ The project has the following folders and files:
209207

210208
## Templating
211209

212-
To more cleanly handle cases where desired functionality would require complex duplication of Terraform resources (i.e. [PR 51](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/51)), this repository is largely generated from the [`autogen`](./autogen) directory.
210+
To more cleanly handle cases where desired functionality would require complex duplication of Terraform resources (i.e. [PR 51](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/51)), this repository is largely generated from the [`autogen`](/autogen) directory.
213211

214-
The root module is generated by running `make generate`. Changes to this repository should be made in the [`autogen`](./autogen) directory where appropriate.
212+
The root module is generated by running `make generate`. Changes to this repository should be made in the [`autogen`](/autogen) directory where appropriate.
215213

216214
## Testing
217215

@@ -320,4 +318,4 @@ are as follows:
320318
is a compiled language so there is no standard linter.
321319
* Terraform - terraform has a built-in linter in the 'terraform validate'
322320
command.
323-
* Dockerfiles - hadolint. Can be found in homebrew
321+
* Dockerfiles - hadolint. Can be found in homebrew

auth.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/******************************************
2020
Retrieve authentication token
2121
*****************************************/
22-
data "google_client_config" "default" {}
22+
data "google_client_config" "default" {
23+
provider = "google"
24+
}
2325

2426
/******************************************
2527
Configure provider

0 commit comments

Comments
 (0)