Skip to content

Commit c54c054

Browse files
bryantbiggsbryantbiggs
committed
chore: update outputs, bump version for autoscaling attribute additions
1 parent 1b9ae2b commit c54c054

38 files changed

+1157
-122
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,15 @@ Full contributing [guidelines are covered here](https://github.com/terraform-aws
392392
| Name | Version |
393393
|------|---------|
394394
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
395-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56.0 |
396-
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.2.0 |
395+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.64 |
396+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.2 |
397397

398398
## Providers
399399

400400
| Name | Version |
401401
|------|---------|
402-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56.0 |
403-
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.2.0 |
402+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.64 |
403+
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.2 |
404404

405405
## Modules
406406

‎examples/bottlerocket/README.md

+24-8
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ Note that this example may create resources which cost money. Run `terraform des
2424
| Name | Version |
2525
|------|---------|
2626
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
27-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56.0 |
28-
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0.0 |
29-
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.2.0 |
27+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.64 |
28+
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
29+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.2 |
3030

3131
## Providers
3232

3333
| Name | Version |
3434
|------|---------|
35-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56.0 |
36-
| <a name="provider_random"></a> [random](#provider\_random) | >= 2.0.0 |
37-
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.2.0 |
35+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.64 |
36+
| <a name="provider_random"></a> [random](#provider\_random) | >= 2.0 |
37+
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.2 |
3838

3939
## Modules
4040

@@ -61,6 +61,22 @@ No inputs.
6161

6262
| Name | Description |
6363
|------|-------------|
64-
| <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Endpoint for EKS control plane. |
65-
| <a name="output_cluster_security_group_id"></a> [cluster\_security\_group\_id](#output\_cluster\_security\_group\_id) | Security group ids attached to the cluster control plane. |
64+
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
65+
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
66+
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The Amazon Resource Name (ARN) of the cluster |
67+
| <a name="output_cluster_certificate_authority_data"></a> [cluster\_certificate\_authority\_data](#output\_cluster\_certificate\_authority\_data) | Base64 encoded certificate data required to communicate with the cluster |
68+
| <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Endpoint for your Kubernetes API server |
69+
| <a name="output_cluster_iam_role_arn"></a> [cluster\_iam\_role\_arn](#output\_cluster\_iam\_role\_arn) | IAM role ARN of the EKS cluster |
70+
| <a name="output_cluster_iam_role_name"></a> [cluster\_iam\_role\_name](#output\_cluster\_iam\_role\_name) | IAM role name of the EKS cluster |
71+
| <a name="output_cluster_iam_role_unique_id"></a> [cluster\_iam\_role\_unique\_id](#output\_cluster\_iam\_role\_unique\_id) | Stable and unique string identifying the IAM role |
72+
| <a name="output_cluster_id"></a> [cluster\_id](#output\_cluster\_id) | The name/id of the EKS cluster. Will block on cluster creation until the cluster is really ready |
73+
| <a name="output_cluster_oidc_issuer_url"></a> [cluster\_oidc\_issuer\_url](#output\_cluster\_oidc\_issuer\_url) | The URL on the EKS cluster for the OpenID Connect identity provider |
74+
| <a name="output_cluster_platform_version"></a> [cluster\_platform\_version](#output\_cluster\_platform\_version) | Platform version for the cluster |
75+
| <a name="output_cluster_security_group_arn"></a> [cluster\_security\_group\_arn](#output\_cluster\_security\_group\_arn) | Amazon Resource Name (ARN) of the cluster security group |
76+
| <a name="output_cluster_security_group_id"></a> [cluster\_security\_group\_id](#output\_cluster\_security\_group\_id) | Cluster security group that was created by Amazon EKS for the cluster. Managed node groups use this security group for control-plane-to-data-plane communication. Referred to as 'Cluster security group' in the EKS console |
77+
| <a name="output_cluster_status"></a> [cluster\_status](#output\_cluster\_status) | Status of the EKS cluster. One of `CREATING`, `ACTIVE`, `DELETING`, `FAILED` |
78+
| <a name="output_eks_managed_node_groups"></a> [eks\_managed\_node\_groups](#output\_eks\_managed\_node\_groups) | Map of attribute maps for all EKS managed node groups created |
79+
| <a name="output_fargate_profiles"></a> [fargate\_profiles](#output\_fargate\_profiles) | Map of attribute maps for all EKS Fargate Profiles created |
80+
| <a name="output_oidc_provider_arn"></a> [oidc\_provider\_arn](#output\_oidc\_provider\_arn) | The ARN of the OIDC Provider if `enable_irsa = true` |
81+
| <a name="output_self_managed_node_groups"></a> [self\_managed\_node\_groups](#output\_self\_managed\_node\_groups) | Map of attribute maps for all self managed node groups created |
6682
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎examples/bottlerocket/outputs.tf

+114-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,121 @@
1+
################################################################################
2+
# Cluster
3+
################################################################################
4+
5+
output "cluster_arn" {
6+
description = "The Amazon Resource Name (ARN) of the cluster"
7+
value = module.eks.cluster_arn
8+
}
9+
10+
output "cluster_certificate_authority_data" {
11+
description = "Base64 encoded certificate data required to communicate with the cluster"
12+
value = module.eks.cluster_certificate_authority_data
13+
}
14+
115
output "cluster_endpoint" {
2-
description = "Endpoint for EKS control plane."
16+
description = "Endpoint for your Kubernetes API server"
317
value = module.eks.cluster_endpoint
418
}
519

20+
output "cluster_id" {
21+
description = "The name/id of the EKS cluster. Will block on cluster creation until the cluster is really ready"
22+
value = module.eks.cluster_id
23+
}
24+
25+
output "cluster_oidc_issuer_url" {
26+
description = "The URL on the EKS cluster for the OpenID Connect identity provider"
27+
value = module.eks.cluster_oidc_issuer_url
28+
}
29+
30+
output "cluster_platform_version" {
31+
description = "Platform version for the cluster"
32+
value = module.eks.cluster_platform_version
33+
}
34+
35+
output "cluster_status" {
36+
description = "Status of the EKS cluster. One of `CREATING`, `ACTIVE`, `DELETING`, `FAILED`"
37+
value = module.eks.cluster_status
38+
}
39+
640
output "cluster_security_group_id" {
7-
description = "Security group ids attached to the cluster control plane."
41+
description = "Cluster security group that was created by Amazon EKS for the cluster. Managed node groups use this security group for control-plane-to-data-plane communication. Referred to as 'Cluster security group' in the EKS console"
842
value = module.eks.cluster_security_group_id
943
}
44+
45+
################################################################################
46+
# Security Group
47+
################################################################################
48+
49+
output "cluster_security_group_arn" {
50+
description = "Amazon Resource Name (ARN) of the cluster security group"
51+
value = module.eks.cluster_security_group_arn
52+
}
53+
54+
################################################################################
55+
# IRSA
56+
################################################################################
57+
58+
output "oidc_provider_arn" {
59+
description = "The ARN of the OIDC Provider if `enable_irsa = true`"
60+
value = module.eks.oidc_provider_arn
61+
}
62+
63+
################################################################################
64+
# IAM Role
65+
################################################################################
66+
67+
output "cluster_iam_role_name" {
68+
description = "IAM role name of the EKS cluster"
69+
value = module.eks.cluster_iam_role_name
70+
}
71+
72+
output "cluster_iam_role_arn" {
73+
description = "IAM role ARN of the EKS cluster"
74+
value = module.eks.cluster_iam_role_arn
75+
}
76+
77+
output "cluster_iam_role_unique_id" {
78+
description = "Stable and unique string identifying the IAM role"
79+
value = module.eks.cluster_iam_role_unique_id
80+
}
81+
82+
################################################################################
83+
# CloudWatch Log Group
84+
################################################################################
85+
86+
output "cloudwatch_log_group_name" {
87+
description = "Name of cloudwatch log group created"
88+
value = module.eks.cloudwatch_log_group_name
89+
}
90+
91+
output "cloudwatch_log_group_arn" {
92+
description = "Arn of cloudwatch log group created"
93+
value = module.eks.cloudwatch_log_group_arn
94+
}
95+
96+
################################################################################
97+
# Fargate Profile
98+
################################################################################
99+
100+
output "fargate_profiles" {
101+
description = "Map of attribute maps for all EKS Fargate Profiles created"
102+
value = module.eks.fargate_profiles
103+
}
104+
105+
################################################################################
106+
# EKS Managed Node Group
107+
################################################################################
108+
109+
output "eks_managed_node_groups" {
110+
description = "Map of attribute maps for all EKS managed node groups created"
111+
value = module.eks.eks_managed_node_groups
112+
}
113+
114+
################################################################################
115+
# Self Managed Node Group
116+
################################################################################
117+
118+
output "self_managed_node_groups" {
119+
description = "Map of attribute maps for all self managed node groups created"
120+
value = module.eks.self_managed_node_groups
121+
}

‎examples/bottlerocket/versions.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.56.0"
7+
version = ">= 3.64"
88
}
99
random = {
1010
source = "hashicorp/random"
11-
version = ">= 2.0.0"
11+
version = ">= 2.0"
1212
}
1313
tls = {
1414
source = "hashicorp/tls"
15-
version = ">= 2.2.0"
15+
version = ">= 2.2"
1616
}
1717
}
1818
}

‎examples/complete/README.md

+23-5
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,22 @@ Note that this example may create resources which cost money. Run `terraform des
2424
| Name | Version |
2525
|------|---------|
2626
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
27-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56.0 |
27+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.64 |
2828

2929
## Providers
3030

3131
| Name | Version |
3232
|------|---------|
33-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56.0 |
33+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.64 |
3434

3535
## Modules
3636

3737
| Name | Source | Version |
3838
|------|--------|---------|
3939
| <a name="module_disabled_eks"></a> [disabled\_eks](#module\_disabled\_eks) | ../.. | n/a |
40-
| <a name="module_disabled_fargate"></a> [disabled\_fargate](#module\_disabled\_fargate) | ../../modules/fargate-profile | n/a |
40+
| <a name="module_disabled_eks_managed_node_group"></a> [disabled\_eks\_managed\_node\_group](#module\_disabled\_eks\_managed\_node\_group) | ../../modules/eks-managed-node-group | n/a |
41+
| <a name="module_disabled_fargate_profile"></a> [disabled\_fargate\_profile](#module\_disabled\_fargate\_profile) | ../../modules/fargate-profile | n/a |
42+
| <a name="module_disabled_self_managed_node_group"></a> [disabled\_self\_managed\_node\_group](#module\_disabled\_self\_managed\_node\_group) | ../../modules/self-managed-node-group | n/a |
4143
| <a name="module_eks"></a> [eks](#module\_eks) | ../.. | n/a |
4244
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
4345

@@ -56,6 +58,22 @@ No inputs.
5658

5759
| Name | Description |
5860
|------|-------------|
59-
| <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Endpoint for EKS control plane. |
60-
| <a name="output_cluster_security_group_id"></a> [cluster\_security\_group\_id](#output\_cluster\_security\_group\_id) | Security group ids attached to the cluster control plane. |
61+
| <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
62+
| <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
63+
| <a name="output_cluster_arn"></a> [cluster\_arn](#output\_cluster\_arn) | The Amazon Resource Name (ARN) of the cluster |
64+
| <a name="output_cluster_certificate_authority_data"></a> [cluster\_certificate\_authority\_data](#output\_cluster\_certificate\_authority\_data) | Base64 encoded certificate data required to communicate with the cluster |
65+
| <a name="output_cluster_endpoint"></a> [cluster\_endpoint](#output\_cluster\_endpoint) | Endpoint for your Kubernetes API server |
66+
| <a name="output_cluster_iam_role_arn"></a> [cluster\_iam\_role\_arn](#output\_cluster\_iam\_role\_arn) | IAM role ARN of the EKS cluster |
67+
| <a name="output_cluster_iam_role_name"></a> [cluster\_iam\_role\_name](#output\_cluster\_iam\_role\_name) | IAM role name of the EKS cluster |
68+
| <a name="output_cluster_iam_role_unique_id"></a> [cluster\_iam\_role\_unique\_id](#output\_cluster\_iam\_role\_unique\_id) | Stable and unique string identifying the IAM role |
69+
| <a name="output_cluster_id"></a> [cluster\_id](#output\_cluster\_id) | The name/id of the EKS cluster. Will block on cluster creation until the cluster is really ready |
70+
| <a name="output_cluster_oidc_issuer_url"></a> [cluster\_oidc\_issuer\_url](#output\_cluster\_oidc\_issuer\_url) | The URL on the EKS cluster for the OpenID Connect identity provider |
71+
| <a name="output_cluster_platform_version"></a> [cluster\_platform\_version](#output\_cluster\_platform\_version) | Platform version for the cluster |
72+
| <a name="output_cluster_security_group_arn"></a> [cluster\_security\_group\_arn](#output\_cluster\_security\_group\_arn) | Amazon Resource Name (ARN) of the cluster security group |
73+
| <a name="output_cluster_security_group_id"></a> [cluster\_security\_group\_id](#output\_cluster\_security\_group\_id) | Cluster security group that was created by Amazon EKS for the cluster. Managed node groups use this security group for control-plane-to-data-plane communication. Referred to as 'Cluster security group' in the EKS console |
74+
| <a name="output_cluster_status"></a> [cluster\_status](#output\_cluster\_status) | Status of the EKS cluster. One of `CREATING`, `ACTIVE`, `DELETING`, `FAILED` |
75+
| <a name="output_eks_managed_node_groups"></a> [eks\_managed\_node\_groups](#output\_eks\_managed\_node\_groups) | Map of attribute maps for all EKS managed node groups created |
76+
| <a name="output_fargate_profiles"></a> [fargate\_profiles](#output\_fargate\_profiles) | Map of attribute maps for all EKS Fargate Profiles created |
77+
| <a name="output_oidc_provider_arn"></a> [oidc\_provider\_arn](#output\_oidc\_provider\_arn) | The ARN of the OIDC Provider if `enable_irsa = true` |
78+
| <a name="output_self_managed_node_groups"></a> [self\_managed\_node\_groups](#output\_self\_managed\_node\_groups) | Map of attribute maps for all self managed node groups created |
6179
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎examples/complete/main.tf

+27-19
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ provider "aws" {
44

55
locals {
66
name = "ex-${replace(basename(path.cwd), "_", "-")}"
7-
cluster_version = "1.20"
7+
cluster_version = "1.21"
88
region = "eu-west-1"
99

1010
tags = {
@@ -36,7 +36,7 @@ module "eks" {
3636
self_managed_node_groups = {
3737
one = {
3838
name = "spot-1"
39-
override_instance_types = ["m5.large", "m5a.large", "m5d.large", "m5ad.large"]
39+
override_instance_types = ["m5.large", "m5d.large", "m6i.large"]
4040
spot_instance_pools = 4
4141
asg_max_size = 5
4242
asg_desired_capacity = 5
@@ -124,30 +124,22 @@ module "disabled_eks" {
124124
create = false
125125
}
126126

127-
module "disabled_fargate" {
127+
module "disabled_fargate_profile" {
128128
source = "../../modules/fargate-profile"
129129

130130
create = false
131131
}
132132

133-
################################################################################
134-
# Additional security groups for workers
135-
################################################################################
133+
module "disabled_eks_managed_node_group" {
134+
source = "../../modules/eks-managed-node-group"
136135

137-
resource "aws_security_group" "additional" {
138-
name_prefix = "all_worker_management"
139-
vpc_id = module.vpc.vpc_id
136+
create = false
137+
}
140138

141-
ingress {
142-
from_port = 22
143-
to_port = 22
144-
protocol = "tcp"
145-
cidr_blocks = [
146-
"10.0.0.0/8",
147-
"172.16.0.0/12",
148-
"192.168.0.0/16",
149-
]
150-
}
139+
module "disabled_self_managed_node_group" {
140+
source = "../../modules/self-managed-node-group"
141+
142+
create = false
151143
}
152144

153145
################################################################################
@@ -181,3 +173,19 @@ module "vpc" {
181173

182174
tags = local.tags
183175
}
176+
177+
resource "aws_security_group" "additional" {
178+
name_prefix = "${local.name}-additional"
179+
vpc_id = module.vpc.vpc_id
180+
181+
ingress {
182+
from_port = 22
183+
to_port = 22
184+
protocol = "tcp"
185+
cidr_blocks = [
186+
"10.0.0.0/8",
187+
"172.16.0.0/12",
188+
"192.168.0.0/16",
189+
]
190+
}
191+
}

0 commit comments

Comments
 (0)