Merge branch 'master' into mci_gateway
This commit is contained in:
commit
1204b0077e
|
@ -60,14 +60,14 @@ Do the following to verify that everything works as expected.
|
||||||
|---|---|:---:|:---:|:---:|
|
|---|---|:---:|:---:|:---:|
|
||||||
| [envgroups](variables.tf#L24) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | ✓ | |
|
| [envgroups](variables.tf#L24) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | ✓ | |
|
||||||
| [environments](variables.tf#L30) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = list(string) }))">map(object({…}))</code> | ✓ | |
|
| [environments](variables.tf#L30) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = list(string) }))">map(object({…}))</code> | ✓ | |
|
||||||
| [instances](variables.tf#L45) | Instance. | <code title="map(object({ display_name = optional(string) description = optional(string) region = string environments = list(string) psa_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) }))">map(object({…}))</code> | ✓ | |
|
| [instances](variables.tf#L45) | Instance. | <code title="map(object({ display_name = optional(string) description = optional(string) region = string environments = list(string) runtime_ip_cidr_range = string troubleshooting_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) }))">map(object({…}))</code> | ✓ | |
|
||||||
| [project_id](variables.tf#L91) | Project ID. | <code>string</code> | ✓ | |
|
| [project_id](variables.tf#L92) | Project ID. | <code>string</code> | ✓ | |
|
||||||
| [psc_config](variables.tf#L97) | PSC configuration. | <code>map(string)</code> | ✓ | |
|
| [psc_config](variables.tf#L98) | PSC configuration. | <code>map(string)</code> | ✓ | |
|
||||||
| [datastore_name](variables.tf#L17) | Datastore. | <code>string</code> | | <code>"gcs"</code> |
|
| [datastore_name](variables.tf#L17) | Datastore. | <code>string</code> | | <code>"gcs"</code> |
|
||||||
| [organization](variables.tf#L59) | Apigee organization. | <code title="object({ display_name = optional(string, "Apigee organization created by tf module") description = optional(string, "Apigee organization created by tf module") authorized_network = optional(string, "vpc") runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") })">object({…})</code> | | <code title="{ }">{…}</code> |
|
| [organization](variables.tf#L60) | Apigee organization. | <code title="object({ display_name = optional(string, "Apigee organization created by tf module") description = optional(string, "Apigee organization created by tf module") authorized_network = optional(string, "vpc") runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") })">object({…})</code> | | <code title="{ }">{…}</code> |
|
||||||
| [path](variables.tf#L75) | Bucket path. | <code>string</code> | | <code>"/analytics"</code> |
|
| [path](variables.tf#L76) | Bucket path. | <code>string</code> | | <code>"/analytics"</code> |
|
||||||
| [project_create](variables.tf#L82) | Parameters for the creation of the new project. | <code title="object({ billing_account_id = string parent = string })">object({…})</code> | | <code>null</code> |
|
| [project_create](variables.tf#L83) | Parameters for the creation of the new project. | <code title="object({ billing_account_id = string parent = string })">object({…})</code> | | <code>null</code> |
|
||||||
| [vpc_create](variables.tf#L103) | Boolean flag indicating whether the VPC should be created or not. | <code>bool</code> | | <code>true</code> |
|
| [vpc_create](variables.tf#L104) | Boolean flag indicating whether the VPC should be created or not. | <code>bool</code> | | <code>true</code> |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
|
|
@ -68,9 +68,12 @@ module "vpc" {
|
||||||
region = k
|
region = k
|
||||||
}]
|
}]
|
||||||
psa_config = {
|
psa_config = {
|
||||||
ranges = {
|
ranges = merge({ for k, v in var.instances :
|
||||||
for k, v in var.instances : "apigee-${k}" => v.psa_ip_cidr_range
|
"apigee-runtime-${k}" => v.runtime_ip_cidr_range
|
||||||
|
}, { for k, v in var.instances :
|
||||||
|
"apigee-troubleshooting-${k}" => v.troubleshooting_ip_cidr_range
|
||||||
}
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,8 @@ instances = {
|
||||||
instance-ew1 = {
|
instance-ew1 = {
|
||||||
region = "europe-west1"
|
region = "europe-west1"
|
||||||
environments = ["apis-test"]
|
environments = ["apis-test"]
|
||||||
psa_ip_cidr_range = "10.0.4.0/22"
|
runtime_ip_cidr_range = "10.0.4.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.1.0/28"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
psc_config = {
|
psc_config = {
|
||||||
|
|
|
@ -49,7 +49,8 @@ variable "instances" {
|
||||||
description = optional(string)
|
description = optional(string)
|
||||||
region = string
|
region = string
|
||||||
environments = list(string)
|
environments = list(string)
|
||||||
psa_ip_cidr_range = string
|
runtime_ip_cidr_range = string
|
||||||
|
troubleshooting_ip_cidr_range = string
|
||||||
disk_encryption_key = optional(string)
|
disk_encryption_key = optional(string)
|
||||||
consumer_accept_list = optional(list(string))
|
consumer_accept_list = optional(list(string))
|
||||||
}))
|
}))
|
||||||
|
|
|
@ -46,18 +46,19 @@ Do the following to verify that everything works as expected.
|
||||||
| name | description | type | required | default |
|
| name | description | type | required | default |
|
||||||
|---|---|:---:|:---:|:---:|
|
|---|---|:---:|:---:|:---:|
|
||||||
| [apigee_project_id](variables.tf#L17) | Project ID. | <code>string</code> | ✓ | |
|
| [apigee_project_id](variables.tf#L17) | Project ID. | <code>string</code> | ✓ | |
|
||||||
| [billing_account_id](variables.tf#L47) | Parameters for the creation of the new project. | <code>string</code> | ✓ | |
|
| [billing_account_id](variables.tf#L53) | Parameters for the creation of the new project. | <code>string</code> | ✓ | |
|
||||||
| [hostname](variables.tf#L52) | Host name. | <code>string</code> | ✓ | |
|
| [hostname](variables.tf#L58) | Host name. | <code>string</code> | ✓ | |
|
||||||
| [onprem_project_id](variables.tf#L57) | Project ID. | <code>string</code> | ✓ | |
|
| [onprem_project_id](variables.tf#L63) | Project ID. | <code>string</code> | ✓ | |
|
||||||
| [parent](variables.tf#L75) | Parent (organizations/organizationID or folders/folderID). | <code>string</code> | ✓ | |
|
| [parent](variables.tf#L81) | Parent (organizations/organizationID or folders/folderID). | <code>string</code> | ✓ | |
|
||||||
| [apigee_proxy_only_subnet_ip_cidr_range](variables.tf#L23) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.2.1.0/24"</code> |
|
| [apigee_proxy_only_subnet_ip_cidr_range](variables.tf#L23) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.2.1.0/24"</code> |
|
||||||
| [apigee_psa_ip_cidr_range](variables.tf#L29) | Apigee PSA IP CIDR range. | <code>string</code> | | <code>"10.0.4.0/22"</code> |
|
| [apigee_psc_subnet_ip_cidr_range](variables.tf#L29) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.2.2.0/24"</code> |
|
||||||
| [apigee_psc_subnet_ip_cidr_range](variables.tf#L35) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.2.2.0/24"</code> |
|
| [apigee_runtime_ip_cidr_range](variables.tf#L35) | Apigee PSA IP CIDR range. | <code>string</code> | | <code>"10.0.4.0/22"</code> |
|
||||||
| [apigee_subnet_ip_cidr_range](variables.tf#L41) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.2.0.0/24"</code> |
|
| [apigee_subnet_ip_cidr_range](variables.tf#L41) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.2.0.0/24"</code> |
|
||||||
| [onprem_proxy_only_subnet_ip_cidr_range](variables.tf#L63) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.1.1.0/24"</code> |
|
| [apigee_troubleshooting_ip_cidr_range](variables.tf#L47) | Apigee PSA IP CIDR range. | <code>string</code> | | <code>"10.1.0.0/28"</code> |
|
||||||
| [onprem_subnet_ip_cidr_range](variables.tf#L69) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.1.0.0/24"</code> |
|
| [onprem_proxy_only_subnet_ip_cidr_range](variables.tf#L69) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.1.1.0/24"</code> |
|
||||||
| [region](variables.tf#L80) | Region. | <code>string</code> | | <code>"europe-west1"</code> |
|
| [onprem_subnet_ip_cidr_range](variables.tf#L75) | Subnet IP CIDR range. | <code>string</code> | | <code>"10.1.0.0/24"</code> |
|
||||||
| [zone](variables.tf#L86) | Zone. | <code>string</code> | | <code>"europe-west1-c"</code> |
|
| [region](variables.tf#L86) | Region. | <code>string</code> | | <code>"europe-west1"</code> |
|
||||||
|
| [zone](variables.tf#L92) | Zone. | <code>string</code> | | <code>"europe-west1-c"</code> |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,8 @@ module "apigee_vpc" {
|
||||||
}]
|
}]
|
||||||
psa_config = {
|
psa_config = {
|
||||||
ranges = {
|
ranges = {
|
||||||
"apigee" = var.apigee_psa_ip_cidr_range
|
"apigee-runtime" = var.apigee_runtime_ip_cidr_range
|
||||||
|
"apigee-troubleshooting" = var.apigee_troubleshooting_ip_cidr_range
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,7 +82,8 @@ module "apigee" {
|
||||||
instance-1 = {
|
instance-1 = {
|
||||||
region = var.region
|
region = var.region
|
||||||
environments = [local.environment]
|
environments = [local.environment]
|
||||||
psa_ip_cidr_range = var.apigee_psa_ip_cidr_range
|
runtime_ip_cidr_range = var.apigee_runtime_ip_cidr_range
|
||||||
|
troubleshooting_ip_cidr_range = var.apigee_troubleshooting_ip_cidr_range
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
endpoint_attachments = {
|
endpoint_attachments = {
|
||||||
|
|
|
@ -26,24 +26,30 @@ variable "apigee_proxy_only_subnet_ip_cidr_range" {
|
||||||
default = "10.2.1.0/24"
|
default = "10.2.1.0/24"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "apigee_psa_ip_cidr_range" {
|
|
||||||
description = "Apigee PSA IP CIDR range."
|
|
||||||
type = string
|
|
||||||
default = "10.0.4.0/22"
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "apigee_psc_subnet_ip_cidr_range" {
|
variable "apigee_psc_subnet_ip_cidr_range" {
|
||||||
description = "Subnet IP CIDR range."
|
description = "Subnet IP CIDR range."
|
||||||
type = string
|
type = string
|
||||||
default = "10.2.2.0/24"
|
default = "10.2.2.0/24"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "apigee_runtime_ip_cidr_range" {
|
||||||
|
description = "Apigee PSA IP CIDR range."
|
||||||
|
type = string
|
||||||
|
default = "10.0.4.0/22"
|
||||||
|
}
|
||||||
|
|
||||||
variable "apigee_subnet_ip_cidr_range" {
|
variable "apigee_subnet_ip_cidr_range" {
|
||||||
description = "Subnet IP CIDR range."
|
description = "Subnet IP CIDR range."
|
||||||
type = string
|
type = string
|
||||||
default = "10.2.0.0/24"
|
default = "10.2.0.0/24"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "apigee_troubleshooting_ip_cidr_range" {
|
||||||
|
description = "Apigee PSA IP CIDR range."
|
||||||
|
type = string
|
||||||
|
default = "10.1.0.0/28"
|
||||||
|
}
|
||||||
|
|
||||||
variable "billing_account_id" {
|
variable "billing_account_id" {
|
||||||
description = "Parameters for the creation of the new project."
|
description = "Parameters for the creation of the new project."
|
||||||
type = string
|
type = string
|
||||||
|
|
|
@ -46,12 +46,14 @@ module "apigee" {
|
||||||
instance-test-ew1 = {
|
instance-test-ew1 = {
|
||||||
region = "europe-west1"
|
region = "europe-west1"
|
||||||
environments = ["apis-test"]
|
environments = ["apis-test"]
|
||||||
psa_ip_cidr_range = "10.0.4.0/22"
|
runtime_ip_cidr_range = "10.0.4.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.1.0.0/28"
|
||||||
}
|
}
|
||||||
instance-prod-ew3 = {
|
instance-prod-ew3 = {
|
||||||
region = "europe-west3"
|
region = "europe-west3"
|
||||||
environments = ["apis-prod"]
|
environments = ["apis-prod"]
|
||||||
psa_ip_cidr_range = "10.0.5.0/22"
|
runtime_ip_cidr_range = "10.0.8.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.16.0/28"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
endpoint_attachments = {
|
endpoint_attachments = {
|
||||||
|
@ -143,7 +145,8 @@ module "apigee" {
|
||||||
instance-test-ew1 = {
|
instance-test-ew1 = {
|
||||||
region = "europe-west1"
|
region = "europe-west1"
|
||||||
environments = ["apis-test"]
|
environments = ["apis-test"]
|
||||||
psa_ip_cidr_range = "10.0.4.0/22"
|
runtime_ip_cidr_range = "10.0.4.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.1.0/28"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -173,12 +176,12 @@ module "apigee" {
|
||||||
|
|
||||||
| name | description | type | required | default |
|
| name | description | type | required | default |
|
||||||
|---|---|:---:|:---:|:---:|
|
|---|---|:---:|:---:|:---:|
|
||||||
| [project_id](variables.tf#L77) | Project ID. | <code>string</code> | ✓ | |
|
| [project_id](variables.tf#L78) | Project ID. | <code>string</code> | ✓ | |
|
||||||
| [endpoint_attachments](variables.tf#L17) | Endpoint attachments. | <code title="map(object({ region = string service_attachment = string }))">map(object({…}))</code> | | <code>null</code> |
|
| [endpoint_attachments](variables.tf#L17) | Endpoint attachments. | <code title="map(object({ region = string service_attachment = string }))">map(object({…}))</code> | | <code>null</code> |
|
||||||
| [envgroups](variables.tf#L26) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | | <code>null</code> |
|
| [envgroups](variables.tf#L26) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | | <code>null</code> |
|
||||||
| [environments](variables.tf#L32) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") deployment_type = optional(string) api_proxy_type = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = list(string) }))">map(object({…}))</code> | | <code>null</code> |
|
| [environments](variables.tf#L32) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") deployment_type = optional(string) api_proxy_type = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = list(string) }))">map(object({…}))</code> | | <code>null</code> |
|
||||||
| [instances](variables.tf#L49) | Instances. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") region = string environments = list(string) psa_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) }))">map(object({…}))</code> | | <code>null</code> |
|
| [instances](variables.tf#L49) | Instances. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") region = string environments = list(string) runtime_ip_cidr_range = string troubleshooting_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) }))">map(object({…}))</code> | | <code>null</code> |
|
||||||
| [organization](variables.tf#L63) | Apigee organization. If set to null the organization must already exist. | <code title="object({ display_name = optional(string) description = optional(string, "Terraform-managed") authorized_network = optional(string) runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") })">object({…})</code> | | <code>null</code> |
|
| [organization](variables.tf#L64) | Apigee organization. If set to null the organization must already exist. | <code title="object({ display_name = optional(string) description = optional(string, "Terraform-managed") authorized_network = optional(string) runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") })">object({…})</code> | | <code>null</code> |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ resource "google_apigee_instance" "instances" {
|
||||||
description = each.value.description
|
description = each.value.description
|
||||||
location = each.value.region
|
location = each.value.region
|
||||||
org_id = local.org_id
|
org_id = local.org_id
|
||||||
ip_range = each.value.psa_ip_cidr_range
|
ip_range = "${each.value.runtime_ip_cidr_range},${each.value.troubleshooting_ip_cidr_range}"
|
||||||
disk_encryption_key_name = each.value.disk_encryption_key
|
disk_encryption_key_name = each.value.disk_encryption_key
|
||||||
consumer_accept_list = each.value.consumer_accept_list
|
consumer_accept_list = each.value.consumer_accept_list
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,8 @@ variable "instances" {
|
||||||
description = optional(string, "Terraform-managed")
|
description = optional(string, "Terraform-managed")
|
||||||
region = string
|
region = string
|
||||||
environments = list(string)
|
environments = list(string)
|
||||||
psa_ip_cidr_range = string
|
runtime_ip_cidr_range = string
|
||||||
|
troubleshooting_ip_cidr_range = string
|
||||||
disk_encryption_key = optional(string)
|
disk_encryption_key = optional(string)
|
||||||
consumer_accept_list = optional(list(string))
|
consumer_accept_list = optional(list(string))
|
||||||
}))
|
}))
|
||||||
|
|
|
@ -15,7 +15,8 @@ instances = {
|
||||||
instance-ew1 = {
|
instance-ew1 = {
|
||||||
region = "europe-west1"
|
region = "europe-west1"
|
||||||
environments = ["apis-test"]
|
environments = ["apis-test"]
|
||||||
psa_ip_cidr_range = "10.0.4.0/22"
|
runtime_ip_cidr_range = "10.0.4.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.0.0/28"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
psc_config = {
|
psc_config = {
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
modules: 9
|
modules: 9
|
||||||
resources: 61
|
resources: 62
|
||||||
|
|
|
@ -14,4 +14,4 @@
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
modules: 13
|
modules: 13
|
||||||
resources: 72
|
resources: 73
|
||||||
|
|
|
@ -31,12 +31,14 @@ instances = {
|
||||||
instance-test-ew1 = {
|
instance-test-ew1 = {
|
||||||
region = "europe-west1"
|
region = "europe-west1"
|
||||||
environments = ["apis-test"]
|
environments = ["apis-test"]
|
||||||
psa_ip_cidr_range = "10.0.4.0/22"
|
runtime_ip_cidr_range = "10.0.4.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.0.0/28"
|
||||||
}
|
}
|
||||||
instance-prod-ew3 = {
|
instance-prod-ew3 = {
|
||||||
region = "europe-west3"
|
region = "europe-west3"
|
||||||
environments = ["apis-prod"]
|
environments = ["apis-prod"]
|
||||||
psa_ip_cidr_range = "10.0.5.0/22"
|
runtime_ip_cidr_range = "10.0.6.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.0.16/28"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
endpoint_attachments = {
|
endpoint_attachments = {
|
||||||
|
|
|
@ -3,6 +3,7 @@ instances = {
|
||||||
instance-test-ew1 = {
|
instance-test-ew1 = {
|
||||||
region = "europe-west1"
|
region = "europe-west1"
|
||||||
environments = ["apis-test"]
|
environments = ["apis-test"]
|
||||||
psa_ip_cidr_range = "10.0.4.0/22"
|
runtime_ip_cidr_range = "10.0.4.0/22"
|
||||||
|
troubleshooting_ip_cidr_range = "10.1.1.0.0/28"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -53,7 +53,8 @@ variable "instances" {
|
||||||
description = optional(string, "Terraform-managed")
|
description = optional(string, "Terraform-managed")
|
||||||
region = string
|
region = string
|
||||||
environments = list(string)
|
environments = list(string)
|
||||||
psa_ip_cidr_range = string
|
runtime_ip_cidr_range = string
|
||||||
|
troubleshooting_ip_cidr_range = string
|
||||||
disk_encryption_key = optional(string)
|
disk_encryption_key = optional(string)
|
||||||
consumer_accept_list = optional(list(string))
|
consumer_accept_list = optional(list(string))
|
||||||
}))
|
}))
|
||||||
|
|
Loading…
Reference in New Issue