Skip to content

Commit 7b19f3d

Browse files
authored
Merge pull request #19 from truefoundry/cluster-vars-update
Updating cluster variables, versions
2 parents febd3a8 + ec3d68d commit 7b19f3d

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

.github/workflows/lint_clean.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ on:
66
jobs:
77
fmt_and_lint:
88
name: Terraform fmt and tflint
9-
uses: truefoundry/github-workflows-public/.github/workflows/terraform-lint-format.yml@v0.1.1
9+
uses: truefoundry/github-workflows-public/.github/workflows/terraform-lint-format.yml@v0.1.5

.github/workflows/terraform-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ on:
55
jobs:
66
terraform-docs-generator:
77
name: Generate terraform docs
8-
uses: truefoundry/github-workflows-public/.github/workflows/terraform-doc-generator.yml@v0.1.1
8+
uses: truefoundry/github-workflows-public/.github/workflows/terraform-doc-generator.yml@v0.1.5
99
with:
1010
commit_ref: ${{ github.event.pull_request.head.ref }}

.github/workflows/terraform-scan.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ on:
55
jobs:
66
terraform-scan:
77
name: Vulnerability scanning
8-
uses: truefoundry/github-workflows-public/.github/workflows/terraform-scan.yml@v0.1.1
8+
uses: truefoundry/github-workflows-public/.github/workflows/terraform-scan.yml@v0.1.5
99
secrets:
1010
snyk_token: ${{ secrets.SNYK_TOKEN }}a

README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ Truefoundry Google Cloud Cluster Classic Module
66

77
| Name | Version |
88
|------|---------|
9-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4 |
10-
| <a name="requirement_google"></a> [google](#requirement\_google) | 5.18.0 |
11-
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | 5.18.0 |
9+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.4 |
10+
| <a name="requirement_google"></a> [google](#requirement\_google) | ~> 6.11 |
11+
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | ~> 6.11 |
1212

1313
## Providers
1414

1515
| Name | Version |
1616
|------|---------|
17-
| <a name="provider_google"></a> [google](#provider\_google) | 5.18.0 |
18-
| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | 5.18.0 |
17+
| <a name="provider_google"></a> [google](#provider\_google) | ~> 6.11 |
18+
| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | ~> 6.11 |
1919

2020
## Modules
2121

@@ -25,10 +25,10 @@ No modules.
2525

2626
| Name | Type |
2727
|------|------|
28-
| [google-beta_google_container_cluster.cluster](https://registry.terraform.io/providers/hashicorp/google-beta/5.18.0/docs/resources/google_container_cluster) | resource |
29-
| [google_compute_firewall.fix_webhooks](https://registry.terraform.io/providers/hashicorp/google/5.18.0/docs/resources/compute_firewall) | resource |
30-
| [google_container_node_pool.control_plane_pool](https://registry.terraform.io/providers/hashicorp/google/5.18.0/docs/resources/container_node_pool) | resource |
31-
| [google_container_node_pool.generic](https://registry.terraform.io/providers/hashicorp/google/5.18.0/docs/resources/container_node_pool) | resource |
28+
| [google-beta_google_container_cluster.cluster](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_container_cluster) | resource |
29+
| [google_compute_firewall.fix_webhooks](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_firewall) | resource |
30+
| [google_container_node_pool.control_plane_pool](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_node_pool) | resource |
31+
| [google_container_node_pool.generic](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_node_pool) | resource |
3232

3333
## Inputs
3434

gke.tf

+2
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ resource "google_container_node_pool" "generic" {
170170
name = "generic"
171171
cluster = google_container_cluster.cluster.id
172172
location = var.region
173+
project = var.project
173174
node_locations = var.cluster_node_locations
174175
management {
175176
auto_repair = var.cluster_generic_node_config.auto_repair
@@ -209,6 +210,7 @@ resource "google_container_node_pool" "control_plane_pool" {
209210
count = var.control_plane_enabled ? 1 : 0
210211
name = "control-plane"
211212
cluster = google_container_cluster.cluster.id
213+
project = var.project
212214
location = var.region
213215
node_locations = var.cluster_node_locations
214216
management {

versions.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
terraform {
2-
required_version = ">= 1.4"
2+
required_version = "~> 1.4"
33
required_providers {
44
google-beta = {
55
source = "hashicorp/google-beta"
6-
version = "5.18.0"
6+
version = "~> 6.11"
77
}
88
google = {
99
source = "hashicorp/google"
10-
version = "5.18.0"
10+
version = "~> 6.11"
1111
}
1212
}
1313
}

0 commit comments

Comments
 (0)