From bf956d7f56cdbd376938d946ef5c0b45ecb2d0f9 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 4 Jul 2024 00:29:42 +0300 Subject: terraform-ls works --- org-buetow-eks/efscsi.tf | 12 ++++++------ org-buetow-eks/eks.tf | 24 +++++++++++++++--------- org-buetow-eks/main.tf | 12 +++--------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/org-buetow-eks/efscsi.tf b/org-buetow-eks/efscsi.tf index dcf96c5..ca8d8a6 100644 --- a/org-buetow-eks/efscsi.tf +++ b/org-buetow-eks/efscsi.tf @@ -32,11 +32,11 @@ resource "aws_iam_role" "efs_csi_role" { Version : "2012-10-17" Statement : [ { - Effect : "Allow" - Principal : { + Effect : "Allow" + Principal : { Service : "eks.amazonaws.com" } - Action : "sts:AssumeRole" + Action : "sts:AssumeRole" } ] }) @@ -48,9 +48,9 @@ resource "aws_iam_role_policy_attachment" "efs_csi_role_policy_attachment" { } resource "aws_eks_addon" "efs_csi_addon" { - cluster_name = var.cluster_name - addon_name = "aws-efs-csi-driver" - addon_version = "v2.0.4-eksbuild.1" # You can specify exact version if needed. + cluster_name = var.cluster_name + addon_name = "aws-efs-csi-driver" + addon_version = "v2.0.4-eksbuild.1" # You can specify exact version if needed. service_account_role_arn = aws_iam_role.efs_csi_role.arn depends_on = [ diff --git a/org-buetow-eks/eks.tf b/org-buetow-eks/eks.tf index 6e20366..f332874 100644 --- a/org-buetow-eks/eks.tf +++ b/org-buetow-eks/eks.tf @@ -1,12 +1,18 @@ +provider "kubernetes" { + host = data.aws_eks_cluster.cluster.endpoint + cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data) + token = data.aws_eks_cluster_auth.cluster.token +} + resource "aws_eks_cluster" "org_buetow_eks" { name = var.cluster_name role_arn = aws_iam_role.eks_role.arn vpc_config { subnet_ids = [ - data.terraform_remote_state.base.outputs.public_subnet_a_id, - data.terraform_remote_state.base.outputs.public_subnet_b_id, - data.terraform_remote_state.base.outputs.public_subnet_c_id, + data.terraform_remote_state.base.outputs.public_subnet_a_id, + data.terraform_remote_state.base.outputs.public_subnet_b_id, + data.terraform_remote_state.base.outputs.public_subnet_c_id, ] } @@ -17,12 +23,12 @@ resource "aws_eks_cluster" "org_buetow_eks" { } resource "aws_eks_node_group" "example" { - cluster_name = aws_eks_cluster.org_buetow_eks.name - node_role_arn = aws_iam_role.eks_nodegroup_role.arn - subnet_ids = [ - data.terraform_remote_state.base.outputs.public_subnet_a_id, - data.terraform_remote_state.base.outputs.public_subnet_b_id, - data.terraform_remote_state.base.outputs.public_subnet_c_id, + cluster_name = aws_eks_cluster.org_buetow_eks.name + node_role_arn = aws_iam_role.eks_nodegroup_role.arn + subnet_ids = [ + data.terraform_remote_state.base.outputs.public_subnet_a_id, + data.terraform_remote_state.base.outputs.public_subnet_b_id, + data.terraform_remote_state.base.outputs.public_subnet_c_id, ] scaling_config { desired_size = 2 diff --git a/org-buetow-eks/main.tf b/org-buetow-eks/main.tf index c854b5c..d37c6c8 100644 --- a/org-buetow-eks/main.tf +++ b/org-buetow-eks/main.tf @@ -1,8 +1,8 @@ terraform { backend "s3" { - bucket = "org-buetow-tfstate" - key = "org-buetow-eks/terraform.tfstate" - region = "eu-central-1" + bucket = "org-buetow-tfstate" + key = "org-buetow-eks/terraform.tfstate" + region = "eu-central-1" encrypt = true } } @@ -11,9 +11,3 @@ provider "aws" { region = "eu-central-1" } -provider "kubernetes" { - host = data.aws_eks_cluster.cluster.endpoint - cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data) - token = data.aws_eks_cluster_auth.cluster.token -} - -- cgit v1.2.3