patch all resource into README

KKGo-Software-engineering · May 16, 2024 · 4f3f2ba · 4f3f2ba
1 parent 94885bc
commit 4f3f2ba
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 32 deletions.
diff --git a/infra/iac/README.md b/infra/iac/README.md
@@ -37,6 +37,7 @@ No providers.
 | <a name="module_eks"></a> [eks](#module\_eks) | ./eks | n/a |
 | <a name="module_rds"></a> [rds](#module\_rds) | ./rds | n/a |
 | <a name="module_sonarqube"></a> [sonarqube](#module\_sonarqube) | ./sonarqube | n/a |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | ./vpc | n/a |
 
 ## Resources
 

diff --git a/infra/iac/argocd-app/README.md b/infra/iac/argocd-app/README.md
@@ -24,8 +24,8 @@ This module intended to create ArgoCD application for EKS cluster
 
 | Name | Version |
 |------|---------|
-| <a name="provider_argocd"></a> [argocd](#provider\_argocd) | 6.1.1 |
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.47.0 |
+| <a name="provider_argocd"></a> [argocd](#provider\_argocd) | >= 6.0.0, < 7.0.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.0 |
 
 ## Modules
 
@@ -47,6 +47,7 @@ No modules.
 | <a name="input_argocd_password"></a> [argocd\_password](#input\_argocd\_password) | ArgoCD password | `string` | n/a | yes |
 | <a name="input_argocd_server_addr"></a> [argocd\_server\_addr](#input\_argocd\_server\_addr) | ArgoCD server address | `string` | `"argocd.werockstar.dev:443"` | no |
 | <a name="input_argocd_username"></a> [argocd\_username](#input\_argocd\_username) | ArgoCD username | `string` | `"admin"` | no |
+| <a name="input_batch_no"></a> [batch\_no](#input\_batch\_no) | Workshop batch number | `string` | `"b2"` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the EKS cluster | `string` | `"eks-go-workshop"` | no |
 
 ## Outputs

diff --git a/infra/iac/eks/README.md b/infra/iac/eks/README.md
@@ -80,9 +80,9 @@ data:
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.48.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.48.0 |
 | <a name="provider_cloudflare"></a> [cloudflare](#provider\_cloudflare) | 4.31.0 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.13.1 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.13 |
 | <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.29.0 |
 
 ## Modules
@@ -93,7 +93,6 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_eip.nat](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eip) | resource |
 | [aws_eks_cluster.eks-cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_cluster) | resource |
 | [aws_eks_node_group.private-nodes](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group) | resource |
 | [aws_iam_role.eks_iam](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
@@ -102,19 +101,6 @@ No modules.
 | [aws_iam_role_policy_attachment.nodes-AmazonEC2ContainerRegistryReadOnly](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.nodes-AmazonEKSWorkerNodePolicy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.nodes-AmazonEKS_CNI_Policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
-| [aws_internet_gateway.igw](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/internet_gateway) | resource |
-| [aws_nat_gateway.nat](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/nat_gateway) | resource |
-| [aws_route_table.private](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route_table) | resource |
-| [aws_route_table.public](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route_table) | resource |
-| [aws_route_table_association.private-1a](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route_table_association) | resource |
-| [aws_route_table_association.private-1b](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route_table_association) | resource |
-| [aws_route_table_association.public-1a](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route_table_association) | resource |
-| [aws_route_table_association.public-1b](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route_table_association) | resource |
-| [aws_subnet.private-1a](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/subnet) | resource |
-| [aws_subnet.private-1b](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/subnet) | resource |
-| [aws_subnet.public-1a](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/subnet) | resource |
-| [aws_subnet.public-1b](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/subnet) | resource |
-| [aws_vpc.workshop](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc) | resource |
 | [cloudflare_record.argocd](https://registry.terraform.io/providers/cloudflare/cloudflare/4.31.0/docs/resources/record) | resource |
 | [cloudflare_record.cnames-dev](https://registry.terraform.io/providers/cloudflare/cloudflare/4.31.0/docs/resources/record) | resource |
 | [cloudflare_record.cnames-prod](https://registry.terraform.io/providers/cloudflare/cloudflare/4.31.0/docs/resources/record) | resource |
@@ -130,14 +116,26 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_argocd_namespace"></a> [argocd\_namespace](#input\_argocd\_namespace) | The namespace where ArgoCD is installed | `string` | `"argocd"` | no |
 | <a name="input_batch_no"></a> [batch\_no](#input\_batch\_no) | Workshop batch number | `string` | `"b2"` | no |
+| <a name="input_capacity_type"></a> [capacity\_type](#input\_capacity\_type) | The capacity type for the EKS nodes | `string` | n/a | yes |
 | <a name="input_cloudflare_api_token"></a> [cloudflare\_api\_token](#input\_cloudflare\_api\_token) | Cloudflare API Token | `string` | n/a | yes |
-| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the EKS cluster | `string` | `"eks-go-workshop"` | no |
+| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the EKS cluster | `string` | n/a | yes |
+| <a name="input_desired_size"></a> [desired\_size](#input\_desired\_size) | The desired size of the EKS nodes | `number` | n/a | yes |
 | <a name="input_eks_node_role"></a> [eks\_node\_role](#input\_eks\_node\_role) | The IAM role for the EKS nodes | `string` | `"eks-nodes-role"` | no |
 | <a name="input_eks_role"></a> [eks\_role](#input\_eks\_role) | The IAM role for the EKS cluster | `string` | `"eks-go-workshop-role"` | no |
+| <a name="input_igw_id"></a> [igw\_id](#input\_igw\_id) | The ID of the Internet Gateway | `string` | n/a | yes |
 | <a name="input_ingress_namespace"></a> [ingress\_namespace](#input\_ingress\_namespace) | The namespace where the Ingress Controller is installed | `string` | `"ingress-nginx"` | no |
-| <a name="input_nat_name"></a> [nat\_name](#input\_nat\_name) | The name of the NAT Gateway | `string` | `"go-workshop-nat"` | no |
-| <a name="input_subdomains"></a> [subdomains](#input\_subdomains) | List of subdomains | `list(string)` | <pre>[<br>  "group-0",<br>  "group-1",<br>  "group-2",<br>  "group-3",<br>  "group-4",<br>  "group-5"<br>]</pre> | no |
-| <a name="input_vpc_name"></a> [vpc\_name](#input\_vpc\_name) | The name of the VPC | `string` | `"go-workshop-vpc"` | no |
+| <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | The instance type for the EKS nodes | `string` | n/a | yes |
+| <a name="input_max_size"></a> [max\_size](#input\_max\_size) | The maximum size of the EKS nodes | `number` | n/a | yes |
+| <a name="input_min_size"></a> [min\_size](#input\_min\_size) | The minimum size of the EKS nodes | `number` | n/a | yes |
+| <a name="input_nat_id"></a> [nat\_id](#input\_nat\_id) | ID of the NAT Gateway | `string` | n/a | yes |
+| <a name="input_subdomains"></a> [subdomains](#input\_subdomains) | List of subdomains | `list(string)` | n/a | yes |
+| <a name="input_subnet_private-1a"></a> [subnet\_private-1a](#input\_subnet\_private-1a) | ID of the private subnet in AZ 1a | `string` | n/a | yes |
+| <a name="input_subnet_private-1b"></a> [subnet\_private-1b](#input\_subnet\_private-1b) | ID of the private subnet in AZ 1b | `string` | n/a | yes |
+| <a name="input_subnet_private-1c"></a> [subnet\_private-1c](#input\_subnet\_private-1c) | ID of the private subnet in AZ 1c | `string` | n/a | yes |
+| <a name="input_subnet_public-1a"></a> [subnet\_public-1a](#input\_subnet\_public-1a) | ID of the public subnet in AZ 1a | `string` | n/a | yes |
+| <a name="input_subnet_public-1b"></a> [subnet\_public-1b](#input\_subnet\_public-1b) | ID of the public subnet in AZ 1b | `string` | n/a | yes |
+| <a name="input_subnet_public-1c"></a> [subnet\_public-1c](#input\_subnet\_public-1c) | ID of the public subnet in AZ 1c | `string` | n/a | yes |
+| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | ID of the VPC | `string` | n/a | yes |
 | <a name="input_zone_id"></a> [zone\_id](#input\_zone\_id) | Cloudflare Zone ID | `string` | `"460c65b55ec2a251ab45cf8eedac4734"` | no |
 
 ## Outputs

diff --git a/infra/iac/main.tf b/infra/iac/main.tf
@@ -36,7 +36,7 @@ module "rds" {
   source               = "./rds"
   db_password          = var.rds_db_password
   db_username          = var.rds_db_username
-  db_name              = "workshop"
+  db_name              = var.rds_db_name
   rds_vpc_id           = module.vpc.vpc_id
   rds_subnet_public-1a = module.vpc.subnet_public-1a
   rds_subnet_public-1b = module.vpc.subnet_public-1b

diff --git a/infra/iac/provides.tf b/infra/iac/provides.tf
@@ -0,0 +1,3 @@
+terraform {
+	required_version = "~> 1.8.0"
+}
diff --git a/infra/iac/rds/README.md b/infra/iac/rds/README.md
@@ -10,7 +10,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.48.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.0 |
 
 ## Modules
 
@@ -21,16 +21,21 @@ No modules.
 | Name | Type |
 |------|------|
 | [aws_db_instance.postgres](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance) | resource |
+| [aws_db_subnet_group.db_subnet_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_subnet_group) | resource |
 | [aws_security_group.db-sg](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
-| [aws_vpc.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_db_name"></a> [db\_name](#input\_db\_name) | database name | `string` | `"workshop"` | no |
+| <a name="input_db_name"></a> [db\_name](#input\_db\_name) | database name | `string` | n/a | yes |
 | <a name="input_db_password"></a> [db\_password](#input\_db\_password) | password for db | `string` | n/a | yes |
 | <a name="input_db_username"></a> [db\_username](#input\_db\_username) | username for db | `string` | n/a | yes |
+| <a name="input_publicly_accessible"></a> [publicly\_accessible](#input\_publicly\_accessible) | Whether the RDS instance is publicly accessible | `bool` | n/a | yes |
+| <a name="input_rds_subnet_public-1a"></a> [rds\_subnet\_public-1a](#input\_rds\_subnet\_public-1a) | ID of the public subnet in AZ 1a | `string` | n/a | yes |
+| <a name="input_rds_subnet_public-1b"></a> [rds\_subnet\_public-1b](#input\_rds\_subnet\_public-1b) | ID of the public subnet in AZ 1b | `string` | n/a | yes |
+| <a name="input_rds_subnet_public-1c"></a> [rds\_subnet\_public-1c](#input\_rds\_subnet\_public-1c) | ID of the public subnet in AZ 1c | `string` | n/a | yes |
+| <a name="input_rds_vpc_id"></a> [rds\_vpc\_id](#input\_rds\_vpc\_id) | ID of the VPC | `string` | n/a | yes |
 
 ## Outputs
 
@@ -39,4 +44,4 @@ No modules.
 | <a name="output_database_endpoint"></a> [database\_endpoint](#output\_database\_endpoint) | n/a |
 | <a name="output_database_name"></a> [database\_name](#output\_database\_name) | n/a |
 | <a name="output_database_port"></a> [database\_port](#output\_database\_port) | n/a |
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->
diff --git a/infra/iac/sonarqube/README.md b/infra/iac/sonarqube/README.md
@@ -20,9 +20,9 @@ sudo cat /home/bitnami/bitnami_credentials
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.47.0 |
-| <a name="provider_cloudflare"></a> [cloudflare](#provider\_cloudflare) | 4.30.0 |
-| <a name="provider_local"></a> [local](#provider\_local) | 2.5.1 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.0 |
+| <a name="provider_cloudflare"></a> [cloudflare](#provider\_cloudflare) | >= 4.0.0, < 5.0.0 |
+| <a name="provider_local"></a> [local](#provider\_local) | >= 2.0.0 |
 
 ## Modules
 
@@ -49,6 +49,7 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_cloudflare_api_token"></a> [cloudflare\_api\_token](#input\_cloudflare\_api\_token) | Cloudflare API Token | `string` | n/a | yes |
 | <a name="input_instance_name"></a> [instance\_name](#input\_instance\_name) | Name of the instance | `string` | `"sonarqube"` | no |
+| <a name="input_instance_type"></a> [instance\_type](#input\_instance\_type) | Instance type | `string` | n/a | yes |
 | <a name="input_zone_id"></a> [zone\_id](#input\_zone\_id) | Cloudflare Zone ID | `string` | `"460c65b55ec2a251ab45cf8eedac4734"` | no |
 
 ## Outputs

diff --git a/infra/iac/variables.tf b/infra/iac/variables.tf
@@ -36,6 +36,5 @@ variable "rds_db_username" {
 
 variable "rds_db_name" {
   type        = string
-  default     = "workshop"
-  description = "database name"
+  description = "initial database name"
 }