Skip to content

Commit

Permalink
Merge branch 'master' into release-please--branches--master
Browse files Browse the repository at this point in the history
  • Loading branch information
imrannayer authored Apr 15, 2024
2 parents f405f94 + b42f61c commit 36d3d3e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions examples/airflow_connection/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "simple-composer-environment" {
source = "terraform-google-modules/composer/google//modules/create_environment_v1"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = var.composer_env_name
Expand All @@ -35,7 +35,7 @@ module "simple-composer-environment" {
# Making the k8s master globally available is only to make the integration testing portable and should be removed
module "master-authorized-networks" {
source = "terraform-google-modules/composer/google//modules/master_authorized_networks"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
zone = var.zone
Expand All @@ -47,7 +47,7 @@ module "master-authorized-networks" {

module "example-1" {
source = "terraform-google-modules/composer/google//modules/airflow_connection"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = module.simple-composer-environment.composer_env_name
Expand All @@ -62,7 +62,7 @@ module "example-1" {

module "example-2" {
source = "terraform-google-modules/composer/google//modules/airflow_connection"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = module.simple-composer-environment.composer_env_name
Expand All @@ -82,7 +82,7 @@ module "example-2" {
# Connections can be defined externally if you wish
module "example-3" {
source = "terraform-google-modules/composer/google//modules/airflow_connection"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = module.simple-composer-environment.composer_env_name
Expand Down
6 changes: 3 additions & 3 deletions examples/airflow_pool/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "simple-composer-environment" {
source = "terraform-google-modules/composer/google//modules/create_environment_v1"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = var.composer_env_name
Expand All @@ -35,7 +35,7 @@ module "simple-composer-environment" {
# Making the k8s master globally available is only to make the integration testing portable and should be removed
module "master-authorized-networks" {
source = "terraform-google-modules/composer/google//modules/master_authorized_networks"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
zone = var.zone
Expand All @@ -48,7 +48,7 @@ module "master-authorized-networks" {
# Pools can be defined externally if you wish
module "pool-1" {
source = "terraform-google-modules/composer/google//modules/airflow_pool"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = module.simple-composer-environment.composer_env_name
Expand Down
4 changes: 2 additions & 2 deletions examples/composer_v2_sharedvpc_prereq/composer.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

module "composer_net" {
source = "terraform-google-modules/composer/google//modules/composer_net"
version = "~> 4.0"
version = "~> 5.0"

service_project_id = var.service_project_id
network_project_id = var.project_id
Expand All @@ -32,7 +32,7 @@ module "composer_env" {
module.composer_net
]
source = "terraform-google-modules/composer/google//modules/create_environment_v2"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.service_project_id
network_project_id = var.project_id
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_composer_env_v1/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "simple-composer-environment" {
source = "terraform-google-modules/composer/google//modules/create_environment_v1"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = var.composer_env_name
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_composer_env_v2/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ resource "google_storage_bucket_iam_member" "object_admin" {

module "simple-composer-environment" {
source = "terraform-google-modules/composer/google//modules/create_environment_v2"
version = "~> 4.0"
version = "~> 5.0"

project_id = var.project_id
composer_env_name = var.composer_env_name
Expand Down

0 comments on commit 36d3d3e

Please sign in to comment.