Merge branch 'terraform-google-modules:master' into master

nlevee · web-flow · commit 301ada51d66f · 2024-10-29T15:29:52.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,32 @@ and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 This changelog is generated automatically based on [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
 
+## [5.2.0](https://github.com/terraform-google-modules/terraform-google-composer/compare/v5.1.0...v5.2.0) (2024-10-08)
+
+
+### Features
+
+* **deps:** Update Terraform Google Provider to v6 (major) ([#145](https://github.com/terraform-google-modules/terraform-google-composer/issues/145)) ([f44a42a](https://github.com/terraform-google-modules/terraform-google-composer/commit/f44a42a3ea1c494efb854fe9c1fd2d6f24fb007a))
+
+## [5.1.0](https://github.com/terraform-google-modules/terraform-google-composer/compare/v5.0.0...v5.1.0) (2024-04-12)
+
+
+### Features
+
+* adds var.enable_privately_used_public_ips to create_environment_v2 ([#129](https://github.com/terraform-google-modules/terraform-google-composer/issues/129)) ([47884d5](https://github.com/terraform-google-modules/terraform-google-composer/commit/47884d5c99496450e3544b1fab256ce5adffba57))
+
+## [5.0.0](https://github.com/terraform-google-modules/terraform-google-composer/compare/v4.1.0...v5.0.0) (2024-03-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* **TPG>=5.14:** add data_retention_config block ([#121](https://github.com/terraform-google-modules/terraform-google-composer/issues/121))
+
+### Features
+
+* add cmek support in composer_env_v2 ([#113](https://github.com/terraform-google-modules/terraform-google-composer/issues/113)) ([0fe2605](https://github.com/terraform-google-modules/terraform-google-composer/commit/0fe2605df22e658212e5a3b9048939ecf2837bcc))
+* **TPG>=5.14:** add data_retention_config block ([#121](https://github.com/terraform-google-modules/terraform-google-composer/issues/121)) ([ca0dfcc](https://github.com/terraform-google-modules/terraform-google-composer/commit/ca0dfcca64f3e3103a7ece9f2f3bffa43e2bfa95))
+
 ## [4.1.0](https://github.com/terraform-google-modules/terraform-google-composer/compare/v4.0.1...v4.1.0) (2023-12-04)
 
 
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.19
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Simple usage is as follows:
 ```hcl
 module "composer" {
   source  = "terraform-google-modules/composer/google"
-  version = "~> 4.1"
+  version = "~> 5.2"
 
   project_id        = "<PROJECT ID>"
   region            = "us-central1"
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -83,4 +83,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
diff --git a/examples/airflow_connection/main.tf b/examples/airflow_connection/main.tf
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/examples/airflow_pool/main.tf b/examples/airflow_pool/main.tf
@@ -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
@@ -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
@@ -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
diff --git a/examples/composer_v2_sharedvpc_prereq/composer.tf b/examples/composer_v2_sharedvpc_prereq/composer.tf
@@ -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
@@ -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
diff --git a/examples/simple_composer_env_v1/main.tf b/examples/simple_composer_env_v1/main.tf
@@ -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
diff --git a/examples/simple_composer_env_v2/main.tf b/examples/simple_composer_env_v2/main.tf
@@ -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
diff --git a/modules/airflow_connection/versions.tf b/modules/airflow_connection/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.13"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:airflow_connection/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:airflow_connection/v5.2.0"
   }
 }
diff --git a/modules/airflow_pool/versions.tf b/modules/airflow_pool/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.13"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:airflow_pool/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:airflow_pool/v5.2.0"
   }
 }
diff --git a/modules/airflow_storage/versions.tf b/modules/airflow_storage/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 6"
+      version = ">= 3.53, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:airflow_storage/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:airflow_storage/v5.2.0"
   }
 }
diff --git a/modules/composer_net/versions.tf b/modules/composer_net/versions.tf
@@ -20,15 +20,15 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 6"
+      version = ">= 3.53, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 6"
+      version = ">= 3.53, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:composer_net/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:composer_net/v5.2.0"
   }
 }
diff --git a/modules/create_environment_v1/versions.tf b/modules/create_environment_v1/versions.tf
@@ -20,21 +20,21 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 6"
+      version = ">= 3.53, < 7"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 6"
+      version = ">= 3.53, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v1/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v1/v5.2.0"
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v1/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v1/v5.2.0"
   }
 
 }
diff --git a/modules/create_environment_v2/README.md b/modules/create_environment_v2/README.md
@@ -31,6 +31,7 @@ module "simple-composer-environment" {
   enable_private_endpoint              = true
   use_private_environment              = true
   cloud_composer_connection_subnetwork = var.subnetwork_self_link
+  enable_privately_used_public_ips     = var.enable_privately_used_public_ips
 
   scheduler = {
     cpu        = 0.5
@@ -76,6 +77,7 @@ module "simple-composer-environment" {
 | composer\_service\_account | Service Account for running Cloud Composer. | `string` | `null` | no |
 | enable\_ip\_masq\_agent | Deploys 'ip-masq-agent' daemon set in the GKE cluster and defines nonMasqueradeCIDRs equals to pod IP range so IP masquerading is used for all destination addresses, except between pods traffic. | `bool` | `false` | no |
 | enable\_private\_endpoint | Configure private access to the cluster endpoint. If true, access to the public endpoint of the GKE cluster is denied | `bool` | `false` | no |
+| enable\_privately\_used\_public\_ips | When enabled, IPs from public (non-RFC1918) ranges can be used for pod\_ip\_allocation\_range\_name and service\_ip\_allocation\_range\_name. | `bool` | `false` | no |
 | env\_variables | Variables of the airflow environment. | `map(string)` | `{}` | no |
 | environment\_size | The environment size controls the performance parameters of the managed Cloud Composer infrastructure that includes the Airflow database. Values for environment size are: `ENVIRONMENT_SIZE_SMALL`, `ENVIRONMENT_SIZE_MEDIUM`, and `ENVIRONMENT_SIZE_LARGE`. | `string` | `"ENVIRONMENT_SIZE_MEDIUM"` | no |
 | grant\_sa\_agent\_permission | Cloud Composer relies on Workload Identity as Google API authentication mechanism for Airflow. | `bool` | `true` | no |
diff --git a/modules/create_environment_v2/main.tf b/modules/create_environment_v2/main.tf
@@ -86,13 +86,15 @@ resource "google_composer_environment" "composer_env" {
       for_each = var.use_private_environment ? [
         {
           enable_private_endpoint                = var.enable_private_endpoint
+          enable_privately_used_public_ips       = var.enable_privately_used_public_ips
           master_ipv4_cidr_block                 = var.master_ipv4_cidr
           cloud_sql_ipv4_cidr_block              = var.cloud_sql_ipv4_cidr
           cloud_composer_network_ipv4_cidr_block = var.cloud_composer_network_ipv4_cidr_block
           cloud_composer_connection_subnetwork   = var.cloud_composer_connection_subnetwork
       }] : []
       content {
         enable_private_endpoint                = private_environment_config.value["enable_private_endpoint"]
+        enable_privately_used_public_ips       = private_environment_config.value["enable_privately_used_public_ips"]
         master_ipv4_cidr_block                 = private_environment_config.value["master_ipv4_cidr_block"]
         cloud_sql_ipv4_cidr_block              = private_environment_config.value["cloud_sql_ipv4_cidr_block"]
         cloud_composer_network_ipv4_cidr_block = private_environment_config.value["cloud_composer_network_ipv4_cidr_block"]
diff --git a/modules/create_environment_v2/variables.tf b/modules/create_environment_v2/variables.tf
@@ -142,6 +142,12 @@ variable "enable_private_endpoint" {
   default     = false
 }
 
+variable "enable_privately_used_public_ips" {
+  description = "When enabled, IPs from public (non-RFC1918) ranges can be used for pod_ip_allocation_range_name and service_ip_allocation_range_name."
+  type        = bool
+  default     = false
+}
+
 variable "cloud_composer_network_ipv4_cidr_block" {
   description = "The CIDR block from which IP range in tenant project will be reserved. Required if VPC peering is used to connect to CloudSql instead of PSC"
   type        = string
diff --git a/modules/create_environment_v2/versions.tf b/modules/create_environment_v2/versions.tf
@@ -20,21 +20,21 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.14, < 6"
+      version = ">= 5.14, < 7"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.14, < 6"
+      version = ">= 5.14, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v2/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v2/v5.2.0"
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v2/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:create_environment_v2/v5.2.0"
   }
 
 }
diff --git a/modules/master_authorized_networks/versions.tf b/modules/master_authorized_networks/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.13"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-composer:master_authorized_networks/v4.1.0"
+    module_name = "blueprints/terraform/terraform-google-composer:master_authorized_networks/v5.2.0"
   }
 }
diff --git a/test/integration/go.mod b/test/integration/go.mod
diff --git a/test/integration/go.sum b/test/integration/go.sum
diff --git a/test/setup/main.tf b/test/setup/main.tf
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
diff --git a/versions.tf b/versions.tf
