Skip to content

Commit

Permalink
Merge branch 'main' into renovate/terraform-docs-gh-actions-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
cblkwell authored Nov 7, 2024
2 parents 35e8388 + db94072 commit 48f92c1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ You can check the status of the certificate in the Google Cloud Console.
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
| <a name="requirement_cloudinit"></a> [cloudinit](#requirement\_cloudinit) | >=2.2.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >=4.79.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >=6.9.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >=4.79.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | >=3.4.3 |

Expand All @@ -196,15 +196,15 @@ You can check the status of the certificate in the Google Cloud Console.
| Name | Version |
|------|---------|
| <a name="provider_cloudinit"></a> [cloudinit](#provider\_cloudinit) | >=2.2.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >=4.79.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >=6.9.0 |
| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | >=4.79.0 |
| <a name="provider_random"></a> [random](#provider\_random) | >=3.4.3 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_container"></a> [container](#module\_container) | terraform-google-modules/container-vm/google | 3.1.1 |
| <a name="module_container"></a> [container](#module\_container) | terraform-google-modules/container-vm/google | ~> 3.2 |

## Resources

Expand Down Expand Up @@ -275,4 +275,4 @@ You can check the status of the certificate in the Google Cloud Console.
| <a name="output_ip_address"></a> [ip\_address](#output\_ip\_address) | The IPv4 address of the load balancer |
| <a name="output_managed_ssl_certificate_certificate_id"></a> [managed\_ssl\_certificate\_certificate\_id](#output\_managed\_ssl\_certificate\_certificate\_id) | The unique identifier of the Google Managed SSL certificate |
| <a name="output_managed_ssl_certificate_expire_time"></a> [managed\_ssl\_certificate\_expire\_time](#output\_managed\_ssl\_certificate\_expire\_time) | Expire time of the Google Managed SSL certificate |
<!-- END_TF_DOCS -->
<!-- END_TF_DOCS -->
4 changes: 3 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
locals {

# The default port that Atlantis runs on is 4141, we default to this.
atlantis_port = lookup(var.env_vars, "ATLANTIS_PORT", 4141)
# Atlantis' home directory is "/home/atlantis", we default to this.
Expand Down Expand Up @@ -79,7 +80,7 @@ data "cloudinit_config" "config" {

module "container" {
source = "terraform-google-modules/container-vm/google"
version = "3.1.1"
version = "~> 3.2"

container = {
image = var.image
Expand Down Expand Up @@ -344,6 +345,7 @@ resource "google_compute_backend_service" "iap" {
}

iap {
enabled = true
oauth2_client_id = var.iap.oauth2_client_id
oauth2_client_secret = var.iap.oauth2_client_secret
}
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">=4.79.0"
version = ">=6.9.0"
}
google-beta = {
source = "hashicorp/google-beta"
Expand Down

0 comments on commit 48f92c1

Please sign in to comment.