diff --git a/terraform/layer1-aws/.terraform.lock.hcl b/terraform/layer1-aws/.terraform.lock.hcl index 2c58d4ce..b129a238 100644 --- a/terraform/layer1-aws/.terraform.lock.hcl +++ b/terraform/layer1-aws/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/hashicorp/aws" { constraints = ">= 2.49.0, >= 2.53.0, >= 3.10.0, >= 3.22.0, 3.38.0" hashes = [ "h1:ARuS11ThIcUfmAQKWNXGPLOa1GheaIwkeCnMh9Mjvao=", + "h1:qKEjN/EM56XT46vGY33eoq7nD6JuGqRqFp7tkzTrRM0=", "zh:20476d4c1b0c0efc55226bcbd85fbd948638fd9860a0edcdb7875cbb2b449e46", "zh:7102622e6549cc3fc46b9ad68cbf4c50b162ce1013d4da817d05d1edf1f12fae", "zh:74ff7f1610065e14c043cd9d74b3d5e0de4474f09a1a81e0b126b920b5cf6a27", @@ -25,6 +26,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { constraints = ">= 1.11.1, 2.1.0" hashes = [ "h1:8RC6upWV190+kE3+rYI4HuSouBUOfOXwV5GvIEXW4nk=", + "h1:L/3XfqLQ4bS1PjH/FksJPm+MYIOxCwn97ozbfSwg/VQ=", "zh:22e2bcef08fb7f97ed503a27e3725d9d14fdd09fe3aa144fae8a7f78ed27856a", "zh:2380cc2a91239b80ea380af8a7fcdcc7396f5213a71a251a5505c962ac6cb9c2", "zh:496ea2818d5480590ada763672be051f4e76dc12c6a61fde2faa0c909e174eb7", diff --git a/terraform/layer2-k8s/.terraform.lock.hcl b/terraform/layer2-k8s/.terraform.lock.hcl index 6a3a2abb..65b3b6c0 100644 --- a/terraform/layer2-k8s/.terraform.lock.hcl +++ b/terraform/layer2-k8s/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/hashicorp/aws" { constraints = "3.38.0" hashes = [ "h1:ARuS11ThIcUfmAQKWNXGPLOa1GheaIwkeCnMh9Mjvao=", + "h1:qKEjN/EM56XT46vGY33eoq7nD6JuGqRqFp7tkzTrRM0=", "zh:20476d4c1b0c0efc55226bcbd85fbd948638fd9860a0edcdb7875cbb2b449e46", "zh:7102622e6549cc3fc46b9ad68cbf4c50b162ce1013d4da817d05d1edf1f12fae", "zh:74ff7f1610065e14c043cd9d74b3d5e0de4474f09a1a81e0b126b920b5cf6a27", @@ -42,6 +43,7 @@ provider "registry.terraform.io/hashicorp/helm" { version = "2.1.2" constraints = "2.1.2" hashes = [ + "h1:UVuNjmuEM4ZVtItbh1QRGulkBWxDY929roxFQhEf9Ks=", "h1:axFN2JRP+iDo8EAhCfnA3fRUCB5S5x4zCKkivWLNN+Y=", "zh:09bd2b6f33a040c3fd59d82c9768b886b8c82163e31ec92dc1b747229d0548df", "zh:09f209fa57ad5d01f04c458f1719b42958ca5e0fc2eca63d9ec29f92c77a29f8", @@ -62,6 +64,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { constraints = "2.1.0" hashes = [ "h1:8RC6upWV190+kE3+rYI4HuSouBUOfOXwV5GvIEXW4nk=", + "h1:L/3XfqLQ4bS1PjH/FksJPm+MYIOxCwn97ozbfSwg/VQ=", "zh:22e2bcef08fb7f97ed503a27e3725d9d14fdd09fe3aa144fae8a7f78ed27856a", "zh:2380cc2a91239b80ea380af8a7fcdcc7396f5213a71a251a5505c962ac6cb9c2", "zh:496ea2818d5480590ada763672be051f4e76dc12c6a61fde2faa0c909e174eb7", diff --git a/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf b/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf new file mode 100644 index 00000000..840b2c18 --- /dev/null +++ b/terraform/layer2-k8s/eks-aws-loadbalancer-controller.tf @@ -0,0 +1,11 @@ +module "eks_alb_ingress" { + source = "../modules/eks-aws-loadbalancer-controller" + count = var.aws_loadbalancer_controller_enable ? 1 : 0 + + name = local.name + region = local.region + oidc_provider_arn = local.eks_oidc_provider_arn + eks_cluster_id = local.eks_cluster_id + vpc_id = local.vpc_id + namespace = module.ing_namespace.name +} diff --git a/terraform/layer2-k8s/examples/eks-alb-ingress-controller.tf b/terraform/layer2-k8s/examples/eks-alb-ingress-controller.tf deleted file mode 100644 index 4be7d404..00000000 --- a/terraform/layer2-k8s/examples/eks-alb-ingress-controller.tf +++ /dev/null @@ -1,32 +0,0 @@ -module "aws_iam_alb_ingress_controller" { - source = "../modules/aws-iam-alb-ingress-controller" - - name = local.name - region = local.region - oidc_provider_arn = local.eks_oidc_provider_arn -} - -data "template_file" "alb_ingress_controller" { - template = file("${path.module}/templates/alb-ingress-controller-values.yaml") - - vars = { - role_arn = module.aws_iam_alb_ingress_controller.role_arn - region = local.region - cluster_name = local.eks_cluster_id - vpc_id = local.vpc_id - image_tag = var.alb_ingress_image_tag - } -} - -resource "helm_release" "alb_ingress_controller" { - name = "aws-alb-ingress-controller" - chart = "aws-alb-ingress-controller" - repository = local.helm_repo_incubator - version = var.alb_ingress_chart_version - namespace = kubernetes_namespace.ing.id - max_history = var.helm_release_history_size - - values = [ - data.template_file.alb_ingress_controller.rendered - ] -} diff --git a/terraform/layer2-k8s/variables.tf b/terraform/layer2-k8s/variables.tf index 7f4cbd1a..f0acf4c3 100644 --- a/terraform/layer2-k8s/variables.tf +++ b/terraform/layer2-k8s/variables.tf @@ -60,14 +60,10 @@ variable "nginx_ingress_ssl_terminator" { } # ALB Ingress -variable "alb_ingress_image_tag" { - description = "Tag of docker image for alb-ingress controller" - default = "v1.1.5" -} - -variable "alb_ingress_chart_version" { - description = "Version of alb-ingress helm chart" - default = "1.0.4" +variable "aws_loadbalancer_controller_enable" { + description = "Disable or Enable aws-loadbalancer-controller" + type = bool + default = true } # Cluster autoscaler diff --git a/terraform/modules/aws-iam-alb-ingress-controller/iam.tf b/terraform/modules/aws-iam-alb-ingress-controller/iam.tf deleted file mode 100644 index 2086aa92..00000000 --- a/terraform/modules/aws-iam-alb-ingress-controller/iam.tf +++ /dev/null @@ -1,144 +0,0 @@ -resource "aws_iam_role" "this" { - name_prefix = "${var.name}-alb-ingress" - assume_role_policy = <