Skip to content

chore: upgraded versions.tf to include minor bumps from tpg v5 #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Then perform the following commands on the root folder:
| time\_zone | The timezone to use in scheduler | `string` | `"Etc/UTC"` | no |
| topic\_labels | A set of key/value label pairs to assign to the pubsub topic. | `map(string)` | `{}` | no |
| topic\_name | Name of pubsub topic connecting the scheduled job and the function | `string` | `"test-topic"` | no |
| vpc\_connector | The VPC Network Connector that this cloud function can connect to. It should be set up as fully-qualified URI. The format of this field is projects//locations//connectors/\*. | `string` | `null` | no |
| vpc\_connector | The VPC Network Connector that this cloud function can connect to. It should be set up as fully-qualified URI. The format of this field is projects//locations//connectors/*. | `string` | `null` | no |
| vpc\_connector\_egress\_settings | The egress settings for the connector, controlling what traffic is diverted through it. Allowed values are ALL\_TRAFFIC and PRIVATE\_RANGES\_ONLY. If unset, this field preserves the previously set value. | `string` | `null` | no |

## Outputs
Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ tags:
- 'integration'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ tags:
- 'lint'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
2 changes: 1 addition & 1 deletion examples/logs-slack-alerts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ If not using the default App Engine default service account (PROJECT_ID@appspot.

## Outputs

No output.
No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
6 changes: 2 additions & 4 deletions examples/logs-slack-alerts/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.0"
source = "hashicorp/google-beta"
}
}
required_version = ">= 0.13"
Expand Down
6 changes: 2 additions & 4 deletions examples/pubsub_scheduled/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.0"
source = "hashicorp/google-beta"
}
}
required_version = ">= 0.13"
Expand Down
6 changes: 2 additions & 4 deletions examples/pubsub_scheduled_multiple/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
source = "hashicorp/google"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.0"
source = "hashicorp/google-beta"
}
}
required_version = ">= 0.13"
Expand Down
2 changes: 1 addition & 1 deletion modules/project_cleanup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform {

google = {
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
version = ">= 3.53, < 6"
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
version = ">= 3.53, < 6"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 3.35, < 5.0"
version = ">= 3.35, < 6"
}
}
}
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
version = ">= 3.53, < 6"
}
random = {
source = "hashicorp/random"
Expand Down