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

Added EBS SCI add-on #6

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+188 −31
Open

Added EBS SCI add-on #6

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22502fd
Added EBS SCI add-on
pedrom-zoi Jan 11, 2023
ac03ace
Update CHANGELOG.md
pedrom-zoi Jan 12, 2023
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
Next Next commit
Added EBS SCI add-on
@pedrom-zoi
pedrom-zoi committed Jan 11, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 22502fdcad0e9efab7aa0620ca51aad0b083c14e
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [2.1.3]

FEATURE:
* Add EBS CSI EKS add-on, this is necessary for clusters with a version >= 1.23

## [2.1.2]

Make CoreDNS optional
100 changes: 100 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -135,3 +135,103 @@ module "eks" {
}

```
## Requirements

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >=3.25.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >=3.25.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | n/a |

## Modules

No modules.

## Resources

| Name | Type |
|------|------|
| [aws_eks_addon.core_dns](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
| [aws_eks_addon.ebs_csi](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
| [aws_eks_addon.kube_proxy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
| [aws_eks_addon.vpc-cni](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
| [aws_eks_cluster.cluster-masters](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_cluster) | resource |
| [aws_eks_node_group.cluster_nodes](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group) | resource |
| [aws_eks_node_group.spot_cluster_nodes](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_node_group) | resource |
| [aws_iam_role.eks-masters](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
| [aws_iam_role.nodes](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
| [aws_iam_role_policy_attachment.AmazonEC2ContainerRegistryReadOnly](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.AmazonEKSClusterPolicy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.AmazonEKSServicePolicy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.AmazonEKSWorkerNodePolicy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.AmazonEKS_CNI_Policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
| [aws_launch_template.cluster-nodes-launch-template](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template) | resource |
| [aws_security_group.Group-eks](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
| [aws_security_group.Group-eks-nodes](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
| [aws_security_group_rule.Group-eks-nodes-self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource |
| [aws_security_group_rule.Group-eks-self](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group_rule) | resource |
| [kubernetes_config_map.aws_auth](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |

## Inputs

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_cluster-name"></a> [cluster-name](#input\_cluster-name) | n/a | `string` | n/a | yes |
| <a name="input_cluster-subnets-ids"></a> [cluster-subnets-ids](#input\_cluster-subnets-ids) | n/a | `list(string)` | n/a | yes |
| <a name="input_create_eks_addons"></a> [create\_eks\_addons](#input\_create\_eks\_addons) | Enable EKS managed addons creation. | `bool` | `true` | no |
| <a name="input_eks-additional-security-groups"></a> [eks-additional-security-groups](#input\_eks-additional-security-groups) | n/a | `list(string)` | `[]` | no |
| <a name="input_eks-masters-iam-role"></a> [eks-masters-iam-role](#input\_eks-masters-iam-role) | n/a | `string` | `""` | no |
| <a name="input_eks-nodes-iam-role"></a> [eks-nodes-iam-role](#input\_eks-nodes-iam-role) | n/a | `string` | `""` | no |
| <a name="input_eks-version"></a> [eks-version](#input\_eks-version) | n/a | `string` | n/a | yes |
| <a name="input_eks_addon_resolve_conflicts_core_dns"></a> [eks\_addon\_resolve\_conflicts\_core\_dns](#input\_eks\_addon\_resolve\_conflicts\_core\_dns) | Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE | `string` | `"NONE"` | no |
| <a name="input_eks_addon_resolve_conflicts_ebs_csi"></a> [eks\_addon\_resolve\_conflicts\_ebs\_csi](#input\_eks\_addon\_resolve\_conflicts\_ebs\_csi) | Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE | `string` | `"NONE"` | no |
| <a name="input_eks_addon_resolve_conflicts_kube_proxy"></a> [eks\_addon\_resolve\_conflicts\_kube\_proxy](#input\_eks\_addon\_resolve\_conflicts\_kube\_proxy) | Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE | `string` | `"NONE"` | no |
| <a name="input_eks_addon_resolve_conflicts_vpc_cni"></a> [eks\_addon\_resolve\_conflicts\_vpc\_cni](#input\_eks\_addon\_resolve\_conflicts\_vpc\_cni) | Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE. | `string` | `"NONE"` | no |
| <a name="input_eks_addon_version_core_dns"></a> [eks\_addon\_version\_core\_dns](#input\_eks\_addon\_version\_core\_dns) | Core DNS managed EKS addon version. | `string` | `""` | no |
| <a name="input_eks_addon_version_ebs_csi"></a> [eks\_addon\_version\_ebs\_csi](#input\_eks\_addon\_version\_ebs\_csi) | EBS-CSI managed EKS addon version. | `string` | `""` | no |
| <a name="input_eks_addon_version_kube_proxy"></a> [eks\_addon\_version\_kube\_proxy](#input\_eks\_addon\_version\_kube\_proxy) | Kube proxy managed EKS addon version. | `string` | `""` | no |
| <a name="input_eks_addon_version_vpc_cni"></a> [eks\_addon\_version\_vpc\_cni](#input\_eks\_addon\_version\_vpc\_cni) | VPC-CNI managed EKS addon version. | `string` | `""` | no |
| <a name="input_enable-aws-auth"></a> [enable-aws-auth](#input\_enable-aws-auth) | Needs to be enabled at Cluster creation and allows for the management of the aws\_auth configmap for the EKS cluster. | `bool` | `false` | no |
| <a name="input_enable-primary-nodegroup"></a> [enable-primary-nodegroup](#input\_enable-primary-nodegroup) | n/a | `bool` | `false` | no |
| <a name="input_enable-private-access"></a> [enable-private-access](#input\_enable-private-access) | n/a | `bool` | `true` | no |
| <a name="input_enable-public-access"></a> [enable-public-access](#input\_enable-public-access) | n/a | `bool` | `false` | no |
| <a name="input_enable-spot-instances"></a> [enable-spot-instances](#input\_enable-spot-instances) | n/a | `bool` | `false` | no |
| <a name="input_enable_coredns_addon"></a> [enable\_coredns\_addon](#input\_enable\_coredns\_addon) | Enable CoreDNS AddOn | `bool` | `false` | no |
| <a name="input_enable_iam"></a> [enable\_iam](#input\_enable\_iam) | Deploy IAM Roles in cluster creation. | `bool` | `true` | no |
| <a name="input_map-roles"></a> [map-roles](#input\_map-roles) | Additional IAM roles to add to the aws-auth configmap. See readme for example format. | `map(list(string))` | `{}` | no |
| <a name="input_map-users"></a> [map-users](#input\_map-users) | Additional IAM users to add to the aws-auth configmap. See readme for example format. | `map(list(string))` | `{}` | no |
| <a name="input_nodes-additional-security-groups"></a> [nodes-additional-security-groups](#input\_nodes-additional-security-groups) | n/a | `list(string)` | `[]` | no |
| <a name="input_nodes-version"></a> [nodes-version](#input\_nodes-version) | n/a | `string` | `""` | no |
| <a name="input_primary-instance-type"></a> [primary-instance-type](#input\_primary-instance-type) | n/a | `string` | `""` | no |
| <a name="input_primary-max-nodes-count"></a> [primary-max-nodes-count](#input\_primary-max-nodes-count) | n/a | `string` | `"5"` | no |
| <a name="input_primary-min-nodes-count"></a> [primary-min-nodes-count](#input\_primary-min-nodes-count) | n/a | `string` | `"0"` | no |
| <a name="input_primary-node-subnets-ids"></a> [primary-node-subnets-ids](#input\_primary-node-subnets-ids) | n/a | `list(string)` | `[]` | no |
| <a name="input_primary-nodes-count"></a> [primary-nodes-count](#input\_primary-nodes-count) | n/a | `string` | `"0"` | no |
| <a name="input_region"></a> [region](#input\_region) | n/a | `string` | n/a | yes |
| <a name="input_service_ipv4_cidr"></a> [service\_ipv4\_cidr](#input\_service\_ipv4\_cidr) | n/a | `string` | n/a | yes |
| <a name="input_spot-instance-types"></a> [spot-instance-types](#input\_spot-instance-types) | n/a | `list(string)` | `[]` | no |
| <a name="input_spot-max-nodes-count"></a> [spot-max-nodes-count](#input\_spot-max-nodes-count) | Desired max size os spot instance node group | `number` | `5` | no |
| <a name="input_spot-min-nodes-count"></a> [spot-min-nodes-count](#input\_spot-min-nodes-count) | Desired minimum size os spot instance node group | `number` | `1` | no |
| <a name="input_spot-node-subnets-ids"></a> [spot-node-subnets-ids](#input\_spot-node-subnets-ids) | n/a | `list(string)` | `[]` | no |
| <a name="input_spot-nodes-count"></a> [spot-nodes-count](#input\_spot-nodes-count) | Desired size os spot instance node group | `number` | `1` | no |
| <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(string)` | n/a | yes |
| <a name="input_userdata-file"></a> [userdata-file](#input\_userdata-file) | userdata file path | `string` | `""` | no |
| <a name="input_vpc-id"></a> [vpc-id](#input\_vpc-id) | n/a | `string` | n/a | yes |

## Outputs

| Name | Description |
|------|-------------|
| <a name="output_cluster-arn"></a> [cluster-arn](#output\_cluster-arn) | n/a |
| <a name="output_cluster_primary_security_group_id"></a> [cluster\_primary\_security\_group\_id](#output\_cluster\_primary\_security\_group\_id) | The cluster primary security group ID created by the EKS cluster on 1.14 or later. Referred to as 'Cluster security group' in the EKS console. |
| <a name="output_eks_ca"></a> [eks\_ca](#output\_eks\_ca) | n/a |
| <a name="output_eks_endpoint"></a> [eks\_endpoint](#output\_eks\_endpoint) | n/a |
| <a name="output_eks_nodes_launch_template_id"></a> [eks\_nodes\_launch\_template\_id](#output\_eks\_nodes\_launch\_template\_id) | n/a |
| <a name="output_eks_nodes_role"></a> [eks\_nodes\_role](#output\_eks\_nodes\_role) | IAM role used by EKS node group. |
| <a name="output_oidc_provider_issuer"></a> [oidc\_provider\_issuer](#output\_oidc\_provider\_issuer) | n/a |
65 changes: 38 additions & 27 deletions cluster-addon.tf
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,49 @@
resource "aws_eks_addon" "kube_proxy" {
count = var.create_eks_addons ? 1 : 0
count = var.create_eks_addons && var.enable-primary-nodegroup ? 1 : 0

cluster_name = var.cluster-name
addon_name = "kube-proxy"
addon_version = var.eks_addon_version_kube_proxy
resolve_conflicts = "NONE"
cluster_name = var.cluster-name
addon_name = "kube-proxy"
addon_version = var.eks_addon_version_kube_proxy
resolve_conflicts = var.eks_addon_resolve_conflicts_kube_proxy

depends_on = [
aws_eks_cluster.cluster-masters
]

depends_on = [
aws_eks_cluster.cluster-masters
]
}

resource "aws_eks_addon" "core_dns" {
count = var.create_eks_addons && var.enable_coredns_addon ? 1 : 0
count = var.create_eks_addons && var.enable-primary-nodegroup && var.enable_coredns_addon ? 1 : 0

cluster_name = var.cluster-name
addon_name = "coredns"
addon_version = var.eks_addon_version_core_dns
resolve_conflicts = "NONE"
cluster_name = var.cluster-name
addon_name = "coredns"
addon_version = var.eks_addon_version_core_dns
resolve_conflicts = var.eks_addon_resolve_conflicts_core_dns

depends_on = [
aws_eks_node_group.cluster_nodes
]
depends_on = [
aws_eks_node_group.cluster_nodes
]
}

resource "aws_eks_addon" "vpc-cni" {
count = var.create_eks_addons ? 1 : 0

cluster_name = var.cluster-name
addon_name = "vpc-cni"
addon_version = var.eks_addon_version_vpc_cni
resolve_conflicts = "NONE"

depends_on = [
aws_eks_cluster.cluster-masters
]
count = var.create_eks_addons ? 1 : 0

cluster_name = var.cluster-name
addon_name = "vpc-cni"
addon_version = var.eks_addon_version_vpc_cni
resolve_conflicts = var.eks_addon_resolve_conflicts_vpc_cni
depends_on = [
aws_eks_cluster.cluster-masters
]
}

resource "aws_eks_addon" "ebs_csi" {
count = var.create_eks_addons ? 1 : 0

cluster_name = var.cluster-name
addon_name = "aws-ebs-csi-driver"
addon_version = var.eks_addon_version_ebs_csi
resolve_conflicts = var.eks_addon_resolve_conflicts_ebs_csi
depends_on = [
aws_eks_cluster.cluster-masters
]
}
49 changes: 45 additions & 4 deletions variables.tf
View file
Original file line number Diff line number Diff line change
@@ -143,28 +143,64 @@ variable "create_eks_addons" {
default = true
}

variable "create_eks_addons" {
type = bool
description = "Enable EKS managed addons creation."
default = true
}

variable "eks_addon_version_kube_proxy" {
type = string
description = "Kube proxy managed EKS addon version."
default = ""
default = ""
}

variable "eks_addon_resolve_conflicts_kube_proxy" {
type = string
description = "Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE"
default = "NONE"
}

variable "eks_addon_version_core_dns" {
type = string
description = "Core DNS managed EKS addon version."
default = ""
default = ""
}

variable "eks_addon_resolve_conflicts_core_dns" {
type = string
description = "Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE"
default = "NONE"
}

variable "eks_addon_version_vpc_cni" {
type = string
description = "VPC-CNI managed EKS addon version."
default = ""
default = ""
}

variable "eks_addon_resolve_conflicts_vpc_cni" {
type = string
description = "Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE."
default = "NONE"
}

variable "enable_coredns_addon" {
type = bool
description = "Enable CoreDNS AddOn"
default = false
default = false
}

variable "eks_addon_version_ebs_csi" {
type = string
description = "EBS-CSI managed EKS addon version."
default = ""
}

variable "eks_addon_resolve_conflicts_ebs_csi" {
type = string
description = "Define how to resolve parameter value conflicts when migrating an existing add-on to an Amazon EKS add-on or when applying version updates to the add-on. Valid values are NONE, OVERWRITE and PRESERVE"
default = "NONE"
}

variable "enable_iam" {
@@ -182,3 +218,8 @@ variable "eks-nodes-iam-role" {
type = string
default = ""
}

eks_addon_version_kube_proxy = "v1.23.8-eksbuild.2"
eks_addon_version_core_dns = "v1.8.7-eksbuild.3"
eks_addon_version_vpc_cni = "v1.12.0-eksbuild.1"
eks_addon_version_ebs_csi = "v1.14.0-eksbuild.1"