Skip to content

Commit

Permalink
Merge pull request #19 from truefoundry/cluster-vars-update
Browse files Browse the repository at this point in the history
Updating cluster variables, versions
  • Loading branch information
dunefro authored Nov 19, 2024
2 parents febd3a8 + ec3d68d commit 7b19f3d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint_clean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ on:
jobs:
fmt_and_lint:
name: Terraform fmt and tflint
uses: truefoundry/github-workflows-public/.github/workflows/[email protected].1
uses: truefoundry/github-workflows-public/.github/workflows/[email protected].5
2 changes: 1 addition & 1 deletion .github/workflows/terraform-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ on:
jobs:
terraform-docs-generator:
name: Generate terraform docs
uses: truefoundry/github-workflows-public/.github/workflows/[email protected].1
uses: truefoundry/github-workflows-public/.github/workflows/[email protected].5
with:
commit_ref: ${{ github.event.pull_request.head.ref }}
2 changes: 1 addition & 1 deletion .github/workflows/terraform-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ on:
jobs:
terraform-scan:
name: Vulnerability scanning
uses: truefoundry/github-workflows-public/.github/workflows/[email protected].1
uses: truefoundry/github-workflows-public/.github/workflows/[email protected].5
secrets:
snyk_token: ${{ secrets.SNYK_TOKEN }}a
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ Truefoundry Google Cloud Cluster Classic Module

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

## Providers

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

## Modules

Expand All @@ -25,10 +25,10 @@ No modules.

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

## Inputs

Expand Down
2 changes: 2 additions & 0 deletions gke.tf
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ resource "google_container_node_pool" "generic" {
name = "generic"
cluster = google_container_cluster.cluster.id
location = var.region
project = var.project
node_locations = var.cluster_node_locations
management {
auto_repair = var.cluster_generic_node_config.auto_repair
Expand Down Expand Up @@ -209,6 +210,7 @@ resource "google_container_node_pool" "control_plane_pool" {
count = var.control_plane_enabled ? 1 : 0
name = "control-plane"
cluster = google_container_cluster.cluster.id
project = var.project
location = var.region
node_locations = var.cluster_node_locations
management {
Expand Down
6 changes: 3 additions & 3 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
terraform {
required_version = ">= 1.4"
required_version = "~> 1.4"
required_providers {
google-beta = {
source = "hashicorp/google-beta"
version = "5.18.0"
version = "~> 6.11"
}
google = {
source = "hashicorp/google"
version = "5.18.0"
version = "~> 6.11"
}
}
}

0 comments on commit 7b19f3d

Please sign in to comment.