Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: eks module update to version 20.29.0 #186

Merged
merged 9 commits into from
Nov 14, 2024
Merged

fix: eks module update to version 20.29.0 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac10153
update terraform eks module to 20.24.2
jdongo-aneo Oct 3, 2024
a6d9b1a
update aws provider to 5.61
jdongo-aneo Oct 3, 2024
ae0e32d
add persmissions to the cluster
jdongo-aneo Oct 3, 2024
59b9bd5
update security_group
jdongo-aneo Oct 4, 2024
a9483ab
add security group
jdongo-aneo Nov 5, 2024
478e53c
update examples
jdongo-aneo Nov 6, 2024
5504b62
add conditional aws_auth creation
jdongo-aneo Nov 14, 2024
836ea0b
remove aws auth module
jdongo-aneo Nov 14, 2024
c755a07
update eks to latest version 20.29.0
jdongo-aneo Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions container-registry/aws/ecr/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ This module must be used with these constraints:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
| <a name="requirement_generic"></a> [generic](#requirement\_generic) | >= 0.1.1 |
| <a name="requirement_skopeo2"></a> [skopeo2](#requirement\_skopeo2) | >= 1.1.1 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
| <a name="provider_generic"></a> [generic](#provider\_generic) | >= 0.1.1 |
| <a name="provider_skopeo2"></a> [skopeo2](#provider\_skopeo2) | >= 1.1.1 |

Expand Down
4 changes: 2 additions & 2 deletions container-registry/aws/ecr/examples/complete/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ terraform destroy
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.61 |
| <a name="requirement_external"></a> [external](#requirement\_external) | ~> 2.3.1 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.2.1 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.61 |
| <a name="provider_external"></a> [external](#provider\_external) | ~> 2.3.1 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.2.1 |

Expand Down
2 changes: 1 addition & 1 deletion container-registry/aws/ecr/examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.4.0"
version = "~> 5.61"
}
external = {
source = "hashicorp/external"
Expand Down
4 changes: 2 additions & 2 deletions container-registry/aws/ecr/examples/simple/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ terraform destroy
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.61 |
| <a name="requirement_external"></a> [external](#requirement\_external) | ~> 2.3.1 |
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.2.1 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.61 |
| <a name="provider_external"></a> [external](#provider\_external) | ~> 2.3.1 |
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.2.1 |

Expand Down
2 changes: 1 addition & 1 deletion container-registry/aws/ecr/examples/simple/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.4.0"
version = "~> 5.61"
}
external = {
source = "hashicorp/external"
Expand Down
2 changes: 1 addition & 1 deletion container-registry/aws/ecr/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.4.0"
version = ">= 5.61"
lemaitre-aneo marked this conversation as resolved.
Show resolved Hide resolved
}
skopeo2 = {
source = "bsquare-corp/skopeo2"
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/aws/addons/efs-csi/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ Amazon Elastic File System (Amazon EFS) provides serverless, fully elastic file
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.3.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.10.1 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.22.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.10.1 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.22.0 |

Expand Down
4 changes: 2 additions & 2 deletions kubernetes/aws/addons/efs-csi/examples/complete/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform destroy
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
| <a name="requirement_external"></a> [external](#requirement\_external) | ~> 2.3.1 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.10.1 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.22.0 |
Expand All @@ -30,7 +30,7 @@ terraform destroy

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
| <a name="provider_external"></a> [external](#provider\_external) | ~> 2.3.1 |
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.2.1 |

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/aws/addons/efs-csi/examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.4.0"
version = ">= 5.61"
}
null = {
source = "hashicorp/null"
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/aws/addons/efs-csi/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.3.0"
version = ">= 5.61"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
9 changes: 3 additions & 6 deletions kubernetes/aws/eks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.3.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.10.1 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.13.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1 |
Expand All @@ -14,7 +14,7 @@

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.10.1 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.13.0 |
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.2.1 |
Expand All @@ -25,7 +25,7 @@
| Name | Source | Version |
|------|--------|---------|
| <a name="module_aws_node_termination_handler_role"></a> [aws\_node\_termination\_handler\_role](#module\_aws\_node\_termination\_handler\_role) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 4.1.0 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.16.0 |
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 20.29.0 |

## Resources

Expand Down Expand Up @@ -53,7 +53,6 @@
| [random_string.random_resources](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
| [aws_autoscaling_groups.groups](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/autoscaling_groups) | data source |
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
| [aws_iam_policy_document.aws_node_termination_handler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_iam_policy_document.efs_csi_driver](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_iam_policy_document.worker_autoscaling](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
Expand Down Expand Up @@ -113,8 +112,6 @@
| <a name="input_instance_refresh_tag"></a> [instance\_refresh\_tag](#input\_instance\_refresh\_tag) | Instance refresh tag | `string` | n/a | yes |
| <a name="input_instance_refresh_version"></a> [instance\_refresh\_version](#input\_instance\_refresh\_version) | Instance refresh helm chart version | `string` | n/a | yes |
| <a name="input_kubeconfig_file"></a> [kubeconfig\_file](#input\_kubeconfig\_file) | Kubeconfig file path | `string` | n/a | yes |
| <a name="input_map_roles_groups"></a> [map\_roles\_groups](#input\_map\_roles\_groups) | List of map roles group | <pre>list(object({<br> rolearn = string<br> username = string<br> groups = list(string)<br> }))</pre> | n/a | yes |
| <a name="input_map_users_groups"></a> [map\_users\_groups](#input\_map\_users\_groups) | List of map users group | <pre>list(object({<br> userarn = string<br> username = string<br> groups = list(string)<br> }))</pre> | n/a | yes |
| <a name="input_name"></a> [name](#input\_name) | AWS EKS service name | `string` | `"armonik-eks"` | no |
| <a name="input_node_selector"></a> [node\_selector](#input\_node\_selector) | Node selector for pods of EKS system | `any` | `{}` | no |
| <a name="input_profile"></a> [profile](#input\_profile) | Profile of AWS credentials to deploy Terraform sources | `string` | n/a | yes |
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/aws/eks/examples/complete/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform destroy
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
| <a name="requirement_external"></a> [external](#requirement\_external) | ~> 2.3.1 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.10.1 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.21.1 |
Expand All @@ -30,7 +30,7 @@ terraform destroy

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
| <a name="provider_external"></a> [external](#provider\_external) | ~> 2.3.1 |
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.2.1 |

Expand Down
2 changes: 0 additions & 2 deletions kubernetes/aws/eks/examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ module "eks" {
instance_refresh_tag = "v1.19.0"
instance_refresh_version = "0.21.0"
kubeconfig_file = "generated/kubeconfig"
map_roles_groups = []
map_users_groups = []
vpc_id = data.aws_vpc.default.id
vpc_pods_subnet_ids = data.aws_subnets.subnets.ids
vpc_private_subnet_ids = data.aws_subnets.subnets.ids
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/aws/eks/examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.4.0"
version = ">= 5.61"
}
null = {
source = "hashicorp/null"
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/aws/eks/examples/simple/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform destroy
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |
| <a name="requirement_external"></a> [external](#requirement\_external) | ~> 2.3.1 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.10.1 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.21.1 |
Expand All @@ -30,7 +30,7 @@ terraform destroy

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |
| <a name="provider_external"></a> [external](#provider\_external) | ~> 2.3.1 |
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.2.1 |

Expand Down
2 changes: 0 additions & 2 deletions kubernetes/aws/eks/examples/simple/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ module "eks" {
instance_refresh_tag = "v1.19.0"
instance_refresh_version = "0.21.0"
kubeconfig_file = "generated/kubeconfig"
map_roles_groups = []
map_users_groups = []
vpc_id = data.aws_vpc.default.id
vpc_pods_subnet_ids = data.aws_subnets.subnets.ids
vpc_private_subnet_ids = data.aws_subnets.subnets.ids
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/aws/eks/examples/simple/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.4.0"
version = ">= 5.61"
}
null = {
source = "hashicorp/null"
Expand Down
30 changes: 10 additions & 20 deletions kubernetes/aws/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Current account
data "aws_caller_identity" "current" {}

data "aws_region" "current" {}

# Available zones
Expand Down Expand Up @@ -115,20 +112,22 @@ locals {

module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "19.16.0"
version = "20.29.0"
create = true
cluster_name = var.name
cluster_version = var.cluster_version

# If you want to maintain the current default behavior of v19.x
kms_key_enable_default_policy = false

# Cluster access entry
# To add the current caller identity as an administrator
enable_cluster_creator_admin_permissions = true

# VPC
subnet_ids = var.vpc_private_subnet_ids
vpc_id = var.vpc_id

create_aws_auth_configmap = !(can(coalesce(var.eks_managed_node_groups)) && can(coalesce(var.fargate_profiles)))
# Needed to add self managed node group configuration.
# => kubectl get cm aws-auth -n kube-system -o yaml
manage_aws_auth_configmap = true

# Private cluster
cluster_endpoint_private_access = var.cluster_endpoint_private_access

Expand All @@ -154,6 +153,8 @@ module "eks" {
}
}

cluster_additional_security_group_ids = [module.eks.node_security_group_id]

cluster_encryption_config = {
provider_key_arn = var.cluster_encryption_config
resources = ["secrets"]
Expand All @@ -163,17 +164,6 @@ module "eks" {
tags = local.tags
cluster_tags = local.tags

# IAM
# used to allow other users to interact with our cluster
aws_auth_roles = var.map_roles_groups
aws_auth_users = concat([
{
userarn = "arn:aws:iam::${data.aws_caller_identity.current.arn}:user/admin"
username = "admin"
groups = ["system:masters", "system:bootstrappers", "system:nodes"]
}
], var.map_users_groups)

# List of EKS managed node groups
tschneider-aneo marked this conversation as resolved.
Show resolved Hide resolved
eks_managed_node_group_defaults = {
enable_monitoring = true
Expand Down
19 changes: 0 additions & 19 deletions kubernetes/aws/eks/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,25 +309,6 @@ variable "ebs_kms_key_id" {
type = string
}

# Map roles
variable "map_roles_groups" {
description = "List of map roles group"
type = list(object({
rolearn = string
username = string
groups = list(string)
}))
}

# Map users
variable "map_users_groups" {
description = "List of map users group"
type = list(object({
userarn = string
username = string
groups = list(string)
}))
}
# List of self managed node groups
variable "self_managed_node_groups" {
description = "List of self managed node groups"
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/aws/eks/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.3.0"
version = ">= 5.61"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions monitoring/aws/cloudwatch-log-group/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.3.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |

## Modules

Expand Down
2 changes: 1 addition & 1 deletion monitoring/aws/cloudwatch-log-group/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.3.0"
version = ">= 5.61"
}
}
}
4 changes: 2 additions & 2 deletions networking/aws/vpc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ This module creates an AWS VPC with these constraints:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.4.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.61 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.4.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.61 |

## Modules

Expand Down
Loading
Loading