Skip to content

Commit

Permalink
run precommit
Browse files Browse the repository at this point in the history
  • Loading branch information
devops0706 committed Mar 20, 2024
1 parent 88b42e7 commit aa4e638
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 28 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ In this module, we have implemented the following CIS Compliance checks for EKS:

| Name | Version |
|------|---------|
| <a name="provider_null"></a> [null](#provider\_null) | n/a |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
| <a name="provider_template"></a> [template](#provider\_template) | n/a |

Expand Down Expand Up @@ -173,9 +174,11 @@ In this module, we have implemented the following CIS Compliance checks for EKS:
| [aws_iam_role_policy_attachment.eks_worker_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.node_autoscaler_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_launch_template.eks_template](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template) | resource |
| [null_resource.update_cni_prifix](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [aws_ami.launch_template_ami](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
| [aws_iam_policy.S3Access](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy) | data source |
| [aws_iam_policy.SSMManagedInstanceCore](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy) | data source |
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
| [template_file.launch_template_userdata](https://registry.terraform.io/providers/hashicorp/template/latest/docs/data-sources/file) | data source |

## Inputs
Expand Down Expand Up @@ -219,6 +222,7 @@ In this module, we have implemented the following CIS Compliance checks for EKS:
| <a name="input_k8s_labels"></a> [k8s\_labels](#input\_k8s\_labels) | Labels to be applied to the Kubernetes node groups. | `map(any)` | `{}` | no |
| <a name="input_worker_iam_role_arn"></a> [worker\_iam\_role\_arn](#input\_worker\_iam\_role\_arn) | The ARN of the worker role for EKS. | `string` | `""` | no |
| <a name="input_worker_iam_role_name"></a> [worker\_iam\_role\_name](#input\_worker\_iam\_role\_name) | The name of the EKS Worker IAM role. | `string` | `""` | no |
| <a name="input_managed_ng_pod_capacity"></a> [managed\_ng\_pod\_capacity](#input\_managed\_ng\_pod\_capacity) | Maximum number of pods you want to schedule on one node. This value should not exceed 110. | `number` | `70` | no |

## Outputs

Expand Down
38 changes: 19 additions & 19 deletions examples/complete-ipv6/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -154,25 +154,25 @@ module "eks" {
}

module "managed_node_group_production" {
source = "squareops/eks/aws//modules/managed-nodegroup"
depends_on = [module.vpc, module.eks]
name = "Infra"
min_size = 1
max_size = 3
desired_size = 1
subnet_ids = [module.vpc.private_subnets[0]]
environment = local.environment
kms_key_arn = module.kms.key_arn
capacity_type = "ON_DEMAND"
ebs_volume_size = 50
instance_types = ["t3a.large", "t3.large", "m5.large"]
kms_policy_arn = module.eks.kms_policy_arn
eks_cluster_name = module.eks.cluster_name
default_addon_enabled = local.default_addon_enabled
managed_ng_pod_capacity= 90
worker_iam_role_name = module.eks.worker_iam_role_name
worker_iam_role_arn = module.eks.worker_iam_role_arn
eks_nodes_keypair_name = module.key_pair_eks.key_pair_name
source = "squareops/eks/aws//modules/managed-nodegroup"
depends_on = [module.vpc, module.eks]
name = "Infra"
min_size = 1
max_size = 3
desired_size = 1
subnet_ids = [module.vpc.private_subnets[0]]
environment = local.environment
kms_key_arn = module.kms.key_arn
capacity_type = "ON_DEMAND"
ebs_volume_size = 50
instance_types = ["t3a.large", "t3.large", "m5.large"]
kms_policy_arn = module.eks.kms_policy_arn
eks_cluster_name = module.eks.cluster_name
default_addon_enabled = local.default_addon_enabled
managed_ng_pod_capacity = 90
worker_iam_role_name = module.eks.worker_iam_role_name
worker_iam_role_arn = module.eks.worker_iam_role_arn
eks_nodes_keypair_name = module.key_pair_eks.key_pair_name
k8s_labels = {
"Addon-Services" = "true"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/managed-nodegroup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ No modules.
| <a name="input_ipv6_enabled"></a> [ipv6\_enabled](#input\_ipv6\_enabled) | Whether IPv6 enabled or not | `bool` | `false` | no |
| <a name="input_default_addon_enabled"></a> [default\_addon\_enabled](#input\_default\_addon\_enabled) | Enable default addon(VPC-CNI, AWS-EBS-CSI-DRIVER) with Cluster creation | `bool` | `false` | no |
| <a name="input_managed_ng_pod_capacity"></a> [managed\_ng\_pod\_capacity](#input\_managed\_ng\_pod\_capacity) | Maximum number of pods you want to schedule on one node. This value should not exceed 110. | `number` | `70` | no |
| <a name="input_addons"></a> [addons](#input\_addons) | n/a | <pre>map(object({<br> name = string<br> version = string<br> }))</pre> | <pre>{<br> "coredns": {<br> "name": "coredns",<br> "version": "v1.10.1-eksbuild.4"<br> },<br> "ebs_csi": {<br> "name": "aws-ebs-csi-driver",<br> "version": "v1.28.0-eksbuild.1"<br> },<br> "kube_proxy": {<br> "name": "kube-proxy",<br> "version": "v1.27.6-eksbuild.2"<br> },<br> "vpc_cni": {<br> "name": "vpc-cni",<br> "version": "v1.16.4-eksbuild.2"<br> }<br>}</pre> | no |
| <a name="input_addons"></a> [addons](#input\_addons) | A map variable representing various Kubernetes add-ons with their respective name and version. | <pre>map(object({<br> name = string<br> version = string<br> }))</pre> | <pre>{<br> "coredns": {<br> "name": "coredns",<br> "version": "v1.10.1-eksbuild.4"<br> },<br> "ebs_csi": {<br> "name": "aws-ebs-csi-driver",<br> "version": "v1.28.0-eksbuild.1"<br> },<br> "kube_proxy": {<br> "name": "kube-proxy",<br> "version": "v1.27.6-eksbuild.2"<br> },<br> "vpc_cni": {<br> "name": "vpc-cni",<br> "version": "v1.16.4-eksbuild.2"<br> }<br>}</pre> | no |

## Outputs

Expand Down
14 changes: 7 additions & 7 deletions modules/managed-nodegroup/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -163,24 +163,24 @@ variable "managed_ng_pod_capacity" {

variable "addons" {
description = "A map variable representing various Kubernetes add-ons with their respective name and version."
type = map(object({
name = string
version = string
type = map(object({
name = string
version = string
}))
default = {
coredns = {
default = {
coredns = {
name = "coredns"
version = "v1.10.1-eksbuild.4"
}
vpc_cni = {
vpc_cni = {
name = "vpc-cni"
version = "v1.16.4-eksbuild.2"
}
kube_proxy = {
name = "kube-proxy"
version = "v1.27.6-eksbuild.2"
}
ebs_csi = {
ebs_csi = {
name = "aws-ebs-csi-driver"
version = "v1.28.0-eksbuild.1"
}
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,4 @@ variable "managed_ng_pod_capacity" {
description = "Maximum number of pods you want to schedule on one node. This value should not exceed 110."
default = 70
type = number
}
}

0 comments on commit aa4e638

Please sign in to comment.