mirror of
https://github.com/ysoftdevs/terraform-aws-eks.git
synced 2026-04-11 11:36:50 +02:00
feat: Add support for addon configuration_values (#2345)
Resolves undefined
This commit is contained in:
@@ -223,7 +223,7 @@ We are grateful to the community for contributing bugfixes and improvements! Ple
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
||||||
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 3.0 |
|
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 3.0 |
|
||||||
|
|
||||||
@@ -231,7 +231,7 @@ We are grateful to the community for contributing bugfixes and improvements! Ple
|
|||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.10 |
|
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.10 |
|
||||||
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 3.0 |
|
| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 3.0 |
|
||||||
|
|
||||||
|
|||||||
@@ -34,14 +34,14 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
kubernetes = {
|
kubernetes = {
|
||||||
source = "hashicorp/kubernetes"
|
source = "hashicorp/kubernetes"
|
||||||
|
|||||||
@@ -58,14 +58,14 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -64,6 +64,13 @@ module "eks" {
|
|||||||
vpc-cni = {
|
vpc-cni = {
|
||||||
most_recent = true
|
most_recent = true
|
||||||
service_account_role_arn = module.vpc_cni_irsa.iam_role_arn
|
service_account_role_arn = module.vpc_cni_irsa.iam_role_arn
|
||||||
|
configuration_values = jsonencode({
|
||||||
|
env = {
|
||||||
|
# Reference docs https://docs.aws.amazon.com/eks/latest/userguide/cni-increase-ip-addresses.html
|
||||||
|
ENABLE_PREFIX_DELEGATION = true
|
||||||
|
WARM_PREFIX_TARGET = 1
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
kubernetes = {
|
kubernetes = {
|
||||||
source = "hashicorp/kubernetes"
|
source = "hashicorp/kubernetes"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.7 |
|
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.7 |
|
||||||
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
|
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
|
||||||
|
|
||||||
@@ -28,9 +28,7 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.7 |
|
|
||||||
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
|
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
@@ -44,12 +42,7 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Type |
|
| Name | Type |
|
||||||
|------|------|
|
|------|------|
|
||||||
| [aws_iam_policy.additional](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
|
| [aws_iam_policy.additional](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
|
||||||
| [helm_release.coredns](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
|
|
||||||
| [null_resource.modify_kube_dns](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
|
|
||||||
| [null_resource.remove_default_coredns_deployment](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
|
|
||||||
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
|
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
|
||||||
| [aws_eks_addon_version.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_addon_version) | data source |
|
|
||||||
| [aws_eks_cluster_auth.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source |
|
|
||||||
|
|
||||||
## Inputs
|
## Inputs
|
||||||
|
|
||||||
|
|||||||
@@ -2,20 +2,6 @@ provider "aws" {
|
|||||||
region = local.region
|
region = local.region
|
||||||
}
|
}
|
||||||
|
|
||||||
provider "helm" {
|
|
||||||
kubernetes {
|
|
||||||
host = module.eks.cluster_endpoint
|
|
||||||
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
|
|
||||||
|
|
||||||
exec {
|
|
||||||
api_version = "client.authentication.k8s.io/v1beta1"
|
|
||||||
command = "aws"
|
|
||||||
# This requires the awscli to be installed locally where Terraform is executed
|
|
||||||
args = ["eks", "get-token", "--cluster-name", module.eks.cluster_name]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data "aws_availability_zones" "available" {}
|
data "aws_availability_zones" "available" {}
|
||||||
|
|
||||||
locals {
|
locals {
|
||||||
@@ -47,6 +33,11 @@ module "eks" {
|
|||||||
cluster_addons = {
|
cluster_addons = {
|
||||||
kube-proxy = {}
|
kube-proxy = {}
|
||||||
vpc-cni = {}
|
vpc-cni = {}
|
||||||
|
coredns = {
|
||||||
|
configuration_values = jsonencode({
|
||||||
|
computeType = "Fargate"
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
vpc_id = module.vpc.vpc_id
|
vpc_id = module.vpc.vpc_id
|
||||||
@@ -105,129 +96,6 @@ module "eks" {
|
|||||||
tags = local.tags
|
tags = local.tags
|
||||||
}
|
}
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Modify EKS CoreDNS Deployment
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
data "aws_eks_cluster_auth" "this" {
|
|
||||||
name = module.eks.cluster_name
|
|
||||||
}
|
|
||||||
|
|
||||||
locals {
|
|
||||||
kubeconfig = yamlencode({
|
|
||||||
apiVersion = "v1"
|
|
||||||
kind = "Config"
|
|
||||||
current-context = "terraform"
|
|
||||||
clusters = [{
|
|
||||||
name = module.eks.cluster_name
|
|
||||||
cluster = {
|
|
||||||
certificate-authority-data = module.eks.cluster_certificate_authority_data
|
|
||||||
server = module.eks.cluster_endpoint
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
contexts = [{
|
|
||||||
name = "terraform"
|
|
||||||
context = {
|
|
||||||
cluster = module.eks.cluster_name
|
|
||||||
user = "terraform"
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
users = [{
|
|
||||||
name = "terraform"
|
|
||||||
user = {
|
|
||||||
token = data.aws_eks_cluster_auth.this.token
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
# Separate resource so that this is only ever executed once
|
|
||||||
resource "null_resource" "remove_default_coredns_deployment" {
|
|
||||||
triggers = {}
|
|
||||||
|
|
||||||
provisioner "local-exec" {
|
|
||||||
interpreter = ["/bin/bash", "-c"]
|
|
||||||
environment = {
|
|
||||||
KUBECONFIG = base64encode(local.kubeconfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
# We are removing the deployment provided by the EKS service and replacing it through the self-managed CoreDNS Helm addon
|
|
||||||
# However, we are maintaining the existing kube-dns service and annotating it for Helm to assume control
|
|
||||||
command = <<-EOT
|
|
||||||
kubectl --namespace kube-system delete deployment coredns --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
EOT
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "null_resource" "modify_kube_dns" {
|
|
||||||
triggers = {}
|
|
||||||
|
|
||||||
provisioner "local-exec" {
|
|
||||||
interpreter = ["/bin/bash", "-c"]
|
|
||||||
environment = {
|
|
||||||
KUBECONFIG = base64encode(local.kubeconfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
# We are maintaining the existing kube-dns service and annotating it for Helm to assume control
|
|
||||||
command = <<-EOT
|
|
||||||
echo "Setting implicit dependency on ${module.eks.fargate_profiles["kube_system"].fargate_profile_pod_execution_role_arn}"
|
|
||||||
kubectl --namespace kube-system annotate --overwrite service kube-dns meta.helm.sh/release-name=coredns --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
kubectl --namespace kube-system annotate --overwrite service kube-dns meta.helm.sh/release-namespace=kube-system --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
kubectl --namespace kube-system label --overwrite service kube-dns app.kubernetes.io/managed-by=Helm --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
EOT
|
|
||||||
}
|
|
||||||
|
|
||||||
depends_on = [
|
|
||||||
null_resource.remove_default_coredns_deployment
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# CoreDNS Helm Chart (self-managed)
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
data "aws_eks_addon_version" "this" {
|
|
||||||
for_each = toset(["coredns"])
|
|
||||||
|
|
||||||
addon_name = each.value
|
|
||||||
kubernetes_version = module.eks.cluster_version
|
|
||||||
most_recent = true
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "helm_release" "coredns" {
|
|
||||||
name = "coredns"
|
|
||||||
namespace = "kube-system"
|
|
||||||
create_namespace = false
|
|
||||||
description = "CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services"
|
|
||||||
chart = "coredns"
|
|
||||||
version = "1.19.4"
|
|
||||||
repository = "https://coredns.github.io/helm"
|
|
||||||
|
|
||||||
# For EKS image repositories https://docs.aws.amazon.com/eks/latest/userguide/add-ons-images.html
|
|
||||||
values = [
|
|
||||||
<<-EOT
|
|
||||||
image:
|
|
||||||
repository: 602401143452.dkr.ecr.eu-west-1.amazonaws.com/eks/coredns
|
|
||||||
tag: ${data.aws_eks_addon_version.this["coredns"].version}
|
|
||||||
deployment:
|
|
||||||
name: coredns
|
|
||||||
annotations:
|
|
||||||
eks.amazonaws.com/compute-type: fargate
|
|
||||||
service:
|
|
||||||
name: kube-dns
|
|
||||||
annotations:
|
|
||||||
eks.amazonaws.com/compute-type: fargate
|
|
||||||
podAnnotations:
|
|
||||||
eks.amazonaws.com/compute-type: fargate
|
|
||||||
EOT
|
|
||||||
]
|
|
||||||
|
|
||||||
depends_on = [
|
|
||||||
# Need to ensure the CoreDNS updates are performed before provisioning
|
|
||||||
null_resource.modify_kube_dns
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Supporting Resources
|
# Supporting Resources
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
helm = {
|
helm = {
|
||||||
source = "hashicorp/helm"
|
source = "hashicorp/helm"
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.7 |
|
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.7 |
|
||||||
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
|
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
|
||||||
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
||||||
@@ -62,11 +62,10 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 4.45 |
|
| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 4.47 |
|
||||||
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.7 |
|
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.7 |
|
||||||
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | >= 1.14 |
|
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | >= 1.14 |
|
||||||
| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
|
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
@@ -80,17 +79,12 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
|
|
||||||
| Name | Type |
|
| Name | Type |
|
||||||
|------|------|
|
|------|------|
|
||||||
| [helm_release.coredns](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
|
|
||||||
| [helm_release.karpenter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
|
| [helm_release.karpenter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
|
||||||
| [kubectl_manifest.karpenter_example_deployment](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
|
| [kubectl_manifest.karpenter_example_deployment](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
|
||||||
| [kubectl_manifest.karpenter_node_template](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
|
| [kubectl_manifest.karpenter_node_template](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
|
||||||
| [kubectl_manifest.karpenter_provisioner](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
|
| [kubectl_manifest.karpenter_provisioner](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
|
||||||
| [null_resource.modify_kube_dns](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
|
|
||||||
| [null_resource.remove_default_coredns_deployment](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
|
|
||||||
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
|
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
|
||||||
| [aws_ecrpublic_authorization_token.token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecrpublic_authorization_token) | data source |
|
| [aws_ecrpublic_authorization_token.token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecrpublic_authorization_token) | data source |
|
||||||
| [aws_eks_addon_version.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_addon_version) | data source |
|
|
||||||
| [aws_eks_cluster_auth.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source |
|
|
||||||
|
|
||||||
## Inputs
|
## Inputs
|
||||||
|
|
||||||
|
|||||||
@@ -78,6 +78,16 @@ module "eks" {
|
|||||||
cluster_version = local.cluster_version
|
cluster_version = local.cluster_version
|
||||||
cluster_endpoint_public_access = true
|
cluster_endpoint_public_access = true
|
||||||
|
|
||||||
|
cluster_addons = {
|
||||||
|
kube-proxy = {}
|
||||||
|
vpc-cni = {}
|
||||||
|
coredns = {
|
||||||
|
configuration_values = jsonencode({
|
||||||
|
computeType = "Fargate"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
vpc_id = module.vpc.vpc_id
|
vpc_id = module.vpc.vpc_id
|
||||||
subnet_ids = module.vpc.private_subnets
|
subnet_ids = module.vpc.private_subnets
|
||||||
control_plane_subnet_ids = module.vpc.intra_subnets
|
control_plane_subnet_ids = module.vpc.intra_subnets
|
||||||
@@ -245,129 +255,6 @@ resource "kubectl_manifest" "karpenter_example_deployment" {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Modify EKS CoreDNS Deployment
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
data "aws_eks_cluster_auth" "this" {
|
|
||||||
name = module.eks.cluster_name
|
|
||||||
}
|
|
||||||
|
|
||||||
locals {
|
|
||||||
kubeconfig = yamlencode({
|
|
||||||
apiVersion = "v1"
|
|
||||||
kind = "Config"
|
|
||||||
current-context = "terraform"
|
|
||||||
clusters = [{
|
|
||||||
name = module.eks.cluster_name
|
|
||||||
cluster = {
|
|
||||||
certificate-authority-data = module.eks.cluster_certificate_authority_data
|
|
||||||
server = module.eks.cluster_endpoint
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
contexts = [{
|
|
||||||
name = "terraform"
|
|
||||||
context = {
|
|
||||||
cluster = module.eks.cluster_name
|
|
||||||
user = "terraform"
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
users = [{
|
|
||||||
name = "terraform"
|
|
||||||
user = {
|
|
||||||
token = data.aws_eks_cluster_auth.this.token
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
# Separate resource so that this is only ever executed once
|
|
||||||
resource "null_resource" "remove_default_coredns_deployment" {
|
|
||||||
triggers = {}
|
|
||||||
|
|
||||||
provisioner "local-exec" {
|
|
||||||
interpreter = ["/bin/bash", "-c"]
|
|
||||||
environment = {
|
|
||||||
KUBECONFIG = base64encode(local.kubeconfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
# We are removing the deployment provided by the EKS service and replacing it through the self-managed CoreDNS Helm addon
|
|
||||||
# However, we are maintaining the existing kube-dns service and annotating it for Helm to assume control
|
|
||||||
command = <<-EOT
|
|
||||||
kubectl --namespace kube-system delete deployment coredns --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
EOT
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "null_resource" "modify_kube_dns" {
|
|
||||||
triggers = {}
|
|
||||||
|
|
||||||
provisioner "local-exec" {
|
|
||||||
interpreter = ["/bin/bash", "-c"]
|
|
||||||
environment = {
|
|
||||||
KUBECONFIG = base64encode(local.kubeconfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
# We are maintaining the existing kube-dns service and annotating it for Helm to assume control
|
|
||||||
command = <<-EOT
|
|
||||||
echo "Setting implicit dependency on ${module.eks.fargate_profiles["kube_system"].fargate_profile_pod_execution_role_arn}"
|
|
||||||
kubectl --namespace kube-system annotate --overwrite service kube-dns meta.helm.sh/release-name=coredns --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
kubectl --namespace kube-system annotate --overwrite service kube-dns meta.helm.sh/release-namespace=kube-system --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
kubectl --namespace kube-system label --overwrite service kube-dns app.kubernetes.io/managed-by=Helm --kubeconfig <(echo $KUBECONFIG | base64 --decode)
|
|
||||||
EOT
|
|
||||||
}
|
|
||||||
|
|
||||||
depends_on = [
|
|
||||||
null_resource.remove_default_coredns_deployment
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# CoreDNS Helm Chart (self-managed)
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
data "aws_eks_addon_version" "this" {
|
|
||||||
for_each = toset(["coredns"])
|
|
||||||
|
|
||||||
addon_name = each.value
|
|
||||||
kubernetes_version = module.eks.cluster_version
|
|
||||||
most_recent = true
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "helm_release" "coredns" {
|
|
||||||
name = "coredns"
|
|
||||||
namespace = "kube-system"
|
|
||||||
create_namespace = false
|
|
||||||
description = "CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services"
|
|
||||||
chart = "coredns"
|
|
||||||
version = "1.19.4"
|
|
||||||
repository = "https://coredns.github.io/helm"
|
|
||||||
|
|
||||||
# For EKS image repositories https://docs.aws.amazon.com/eks/latest/userguide/add-ons-images.html
|
|
||||||
values = [
|
|
||||||
<<-EOT
|
|
||||||
image:
|
|
||||||
repository: 602401143452.dkr.ecr.eu-west-1.amazonaws.com/eks/coredns
|
|
||||||
tag: ${data.aws_eks_addon_version.this["coredns"].version}
|
|
||||||
deployment:
|
|
||||||
name: coredns
|
|
||||||
annotations:
|
|
||||||
eks.amazonaws.com/compute-type: fargate
|
|
||||||
service:
|
|
||||||
name: kube-dns
|
|
||||||
annotations:
|
|
||||||
eks.amazonaws.com/compute-type: fargate
|
|
||||||
podAnnotations:
|
|
||||||
eks.amazonaws.com/compute-type: fargate
|
|
||||||
EOT
|
|
||||||
]
|
|
||||||
|
|
||||||
depends_on = [
|
|
||||||
# Need to ensure the CoreDNS updates are performed before provisioning
|
|
||||||
null_resource.modify_kube_dns
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Supporting Resources
|
# Supporting Resources
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
kubernetes = {
|
kubernetes = {
|
||||||
source = "hashicorp/kubernetes"
|
source = "hashicorp/kubernetes"
|
||||||
|
|||||||
@@ -42,14 +42,14 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.10 |
|
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.10 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
kubernetes = {
|
kubernetes = {
|
||||||
source = "hashicorp/kubernetes"
|
source = "hashicorp/kubernetes"
|
||||||
|
|||||||
@@ -26,14 +26,14 @@ Note that this example may create resources which cost money. Run `terraform des
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
kubernetes = {
|
kubernetes = {
|
||||||
source = "hashicorp/kubernetes"
|
source = "hashicorp/kubernetes"
|
||||||
|
|||||||
1
main.tf
1
main.tf
@@ -375,6 +375,7 @@ resource "aws_eks_addon" "this" {
|
|||||||
addon_name = try(each.value.name, each.key)
|
addon_name = try(each.value.name, each.key)
|
||||||
|
|
||||||
addon_version = try(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version)
|
addon_version = try(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version)
|
||||||
|
configuration_values = try(each.value.configuration_values, null)
|
||||||
preserve = try(each.value.preserve, null)
|
preserve = try(each.value.preserve, null)
|
||||||
resolve_conflicts = try(each.value.resolve_conflicts, "OVERWRITE")
|
resolve_conflicts = try(each.value.resolve_conflicts, "OVERWRITE")
|
||||||
service_account_role_arn = try(each.value.service_account_role_arn, null)
|
service_account_role_arn = try(each.value.service_account_role_arn, null)
|
||||||
|
|||||||
@@ -65,13 +65,13 @@ module "eks_managed_node_group" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,13 +29,13 @@ module "fargate_profile" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,13 +100,13 @@ module "karpenter" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ module "self_managed_node_group" {
|
|||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
|
||||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.45 |
|
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Providers
|
## Providers
|
||||||
|
|
||||||
| Name | Version |
|
| Name | Version |
|
||||||
|------|---------|
|
|------|---------|
|
||||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.45 |
|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.47 |
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
aws = {
|
aws = {
|
||||||
source = "hashicorp/aws"
|
source = "hashicorp/aws"
|
||||||
version = ">= 4.45"
|
version = ">= 4.47"
|
||||||
}
|
}
|
||||||
tls = {
|
tls = {
|
||||||
source = "hashicorp/tls"
|
source = "hashicorp/tls"
|
||||||
|
|||||||
Reference in New Issue
Block a user