From d3b44ea4854084ddab7a45d374f8285ec3352fa5 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 29 Nov 2024 15:21:54 -0500 Subject: [PATCH 1/3] Update main.tf - emptydir_volume res def --- modules/htc_res_defs/main.tf | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/htc_res_defs/main.tf b/modules/htc_res_defs/main.tf index bcc93c8d..426ac5f9 100644 --- a/modules/htc_res_defs/main.tf +++ b/modules/htc_res_defs/main.tf @@ -75,3 +75,35 @@ resource "humanitec_resource_definition_criteria" "default_mysql" { force_delete = true } + +resource "humanitec_resource_definition" "emptydir_volume" { + driver_type = "humanitec/template" + id = "volume-emptydir" + name = "volume-emptydir" + type = "volume" + driver_inputs = { + values_string = jsonencode({ + "templates" = { + "manifests" = { + "emptydir.yaml" = { + "location" = "volumes" + "data" = < Date: Fri, 29 Nov 2024 20:37:45 +0000 Subject: [PATCH 2/3] make docs --- modules/base/README.md | 2 +- modules/htc_res_defs/README.md | 2 ++ modules/network/README.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/base/README.md b/modules/base/README.md index 2aa4ac2a..e1ee3272 100644 --- a/modules/base/README.md +++ b/modules/base/README.md @@ -43,7 +43,7 @@ | humanitec\_prefix | A prefix that will be attached to all IDs created in Humanitec. | `string` | `""` | no | | vpc\_description | VPC Description | `string` | `"VPC for Humanitec Reference Architecture Implementation for GCP. https://github.com/humanitec-architecture/reference-archietcture-gcp"` | no | | vpc\_name | VPC Name | `string` | `"htc-ref-arch-vpc"` | no | -| vpc\_subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| 
[
  {
    "description": "Subnet that hosts resources provisioned for the Humanitec Reference Architecture Implementation for GCP. https://github.com/humanitec-architecture/reference-archietcture-gcp",
    "ip_cidr_range": "10.128.0.0/20",
    "name": "htc-ref-arch-subnet"
  }
]
| no | +| vpc\_subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| 
[
  {
    "description": "Subnet that hosts resources provisioned for the Humanitec Reference Architecture Implementation for GCP. https://github.com/humanitec-architecture/reference-archietcture-gcp",
    "ip_cidr_range": "10.128.0.0/20",
    "name": "htc-ref-arch-subnet"
  }
]
| no | ### Outputs diff --git a/modules/htc_res_defs/README.md b/modules/htc_res_defs/README.md index da73ee00..6d96fb3e 100644 --- a/modules/htc_res_defs/README.md +++ b/modules/htc_res_defs/README.md @@ -23,10 +23,12 @@ | Name | Type | |------|------| +| [humanitec_resource_definition.emptydir_volume](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition) | resource | | [humanitec_resource_definition.k8s_cluster](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition) | resource | | [humanitec_resource_definition.k8s_namespace](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition) | resource | | [humanitec_resource_definition_criteria.default_mysql](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition_criteria) | resource | | [humanitec_resource_definition_criteria.default_postgres](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition_criteria) | resource | +| [humanitec_resource_definition_criteria.emptydir_volume](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition_criteria) | resource | | [humanitec_resource_definition_criteria.k8s_cluster](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition_criteria) | resource | | [humanitec_resource_definition_criteria.k8s_namespace](https://registry.terraform.io/providers/humanitec/humanitec/latest/docs/resources/resource_definition_criteria) | resource | diff --git a/modules/network/README.md b/modules/network/README.md index 3554b0d9..17340a63 100644 --- a/modules/network/README.md +++ b/modules/network/README.md @@ -27,7 +27,7 @@ |------|-------------|------|---------|:--------:| | project\_id | GCP Project ID | `string` | n/a | yes | | region | GCP Region | `string` | n/a | yes | -| subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| n/a | yes | +| subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| n/a | yes | | vpc\_description | VPC Description | `string` | n/a | yes | | vpc\_name | VPC Name | `string` | n/a | yes | From be53d980f57c4597f991718de0cb52c022d5d33b Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 29 Nov 2024 20:40:26 +0000 Subject: [PATCH 3/3]
--- modules/base/README.md | 2 +- modules/network/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/base/README.md b/modules/base/README.md index e1ee3272..2aa4ac2a 100644 --- a/modules/base/README.md +++ b/modules/base/README.md @@ -43,7 +43,7 @@ | humanitec\_prefix | A prefix that will be attached to all IDs created in Humanitec. | `string` | `""` | no | | vpc\_description | VPC Description | `string` | `"VPC for Humanitec Reference Architecture Implementation for GCP. https://github.com/humanitec-architecture/reference-archietcture-gcp"` | no | | vpc\_name | VPC Name | `string` | `"htc-ref-arch-vpc"` | no | -| vpc\_subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| 
[
  {
    "description": "Subnet that hosts resources provisioned for the Humanitec Reference Architecture Implementation for GCP. https://github.com/humanitec-architecture/reference-archietcture-gcp",
    "ip_cidr_range": "10.128.0.0/20",
    "name": "htc-ref-arch-subnet"
  }
]
| no | +| vpc\_subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| 
[
  {
    "description": "Subnet that hosts resources provisioned for the Humanitec Reference Architecture Implementation for GCP. https://github.com/humanitec-architecture/reference-archietcture-gcp",
    "ip_cidr_range": "10.128.0.0/20",
    "name": "htc-ref-arch-subnet"
  }
]
| no | ### Outputs diff --git a/modules/network/README.md b/modules/network/README.md index 17340a63..3554b0d9 100644 --- a/modules/network/README.md +++ b/modules/network/README.md @@ -27,7 +27,7 @@ |------|-------------|------|---------|:--------:| | project\_id | GCP Project ID | `string` | n/a | yes | | region | GCP Region | `string` | n/a | yes | -| subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| n/a | yes | +| subnets | List of VPC Subnets | 
list(object({
    name                     = string
    description              = string
    ip_cidr_range            = string
    purpose                  = optional(string)
    role                     = optional(string)
    region                   = optional(string)
    private_ip_google_access = optional(bool)
    secondary_ip_range = optional(list(object({
      range_name    = string
      ip_cidr_range = string
    })))
  }))
| n/a | yes | | vpc\_description | VPC Description | `string` | n/a | yes | | vpc\_name | VPC Name | `string` | n/a | yes |