diff --git a/examples/full-cluster-tf-upgrade/1.29/variables.addons.tf b/examples/full-cluster-tf-upgrade/1.29/variables.addons.tf index ae7209f..6760351 100644 --- a/examples/full-cluster-tf-upgrade/1.29/variables.addons.tf +++ b/examples/full-cluster-tf-upgrade/1.29/variables.addons.tf @@ -51,15 +51,15 @@ variable "addon_versions" { "eks-pod-identity-agent" = "v1.3.2-eksbuild.2" } "1.29" = { - "coredns" = "v1.11.3-eksbuild.1" - "kube-proxy" = "v1.29.7-eksbuild.5" - "vpc-cni" = "v1.18.3-eksbuild.3" - "aws-ebs-csi-driver" = "v1.34.0-eksbuild.1" - "aws-efs-csi-driver" = "v2.0.7-eksbuild.1" - "adot" = "v0.102.0-eksbuild.1" - "snapshot-controller" = "v8.0.0-eksbuild.1" - "amazon-cloudwatch-observability" = "v2.1.0-eksbuild.1" - "eks-pod-identity-agent" = "v1.3.2-eksbuild.2" + "coredns" = "v1.11.3-eksbuild.2" + "kube-proxy" = "v1.31.2-eksbuild.3" + "vpc-cni" = "v1.19.0-eksbuild.1" + "aws-ebs-csi-driver" = "v1.37.0-eksbuild.1" + "aws-efs-csi-driver" = "v2.1.0-eksbuild.1" + "adot" = "v0.109.0-eksbuild.1" + "snapshot-controller" = "v8.1.0-eksbuild.2" + "amazon-cloudwatch-observability" = "v2.3.1-eksbuild.1" + "eks-pod-identity-agent" = "v1.3.4-eksbuild.1" } "1.30" = { "coredns" = "v1.11.3-eksbuild.1" diff --git a/examples/full-cluster-tf-upgrade/1.30/import.tf b/examples/full-cluster-tf-upgrade/1.30/import.tf new file mode 100644 index 0000000..0f20f92 --- /dev/null +++ b/examples/full-cluster-tf-upgrade/1.30/import.tf @@ -0,0 +1,4 @@ +import { + to = aws_cloudwatch_log_group.cluster + id = format("/aws/eks/%v/cluster", var.cluster_name) +} diff --git a/examples/full-cluster-tf-upgrade/1.30/main.tf b/examples/full-cluster-tf-upgrade/1.30/main.tf index 9f40f01..9219b09 100644 --- a/examples/full-cluster-tf-upgrade/1.30/main.tf +++ b/examples/full-cluster-tf-upgrade/1.30/main.tf @@ -50,18 +50,19 @@ locals { # The log group name format is /aws/eks//cluster # Reference: https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html -# Obsolete: EKS cluster automatically creates the Cloudwatch log group -#resource "aws_cloudwatch_log_group" "eks_cluster" { -# name = format("/aws/eks/%v/cluster", var.cluster_name) -# retention_in_days = 180 -# -# tags = merge( -# local.base_tags, -# local.common_tags, -# var.tags, -# var.application_tags, -# ) -#} +# define the CW log here to be able to specify a log retention date. There is no other way to do that. + +resource "aws_cloudwatch_log_group" "cluster" { + name = format("/aws/eks/%v/cluster", var.cluster_name) + retention_in_days = var.cluster_log_retention_days + + tags = merge( + local.base_tags, + local.common_tags, + var.tags, + var.application_tags, + ) +} # we changed endpoint_public_access to false by default. This is so we can reach the EKS API through private IPs # from on-prem and from the cloud. Otherwise, another account outside of where this is created will be unable to diff --git a/examples/full-cluster-tf-upgrade/1.30/variables.addons.tf b/examples/full-cluster-tf-upgrade/1.30/variables.addons.tf index f99ac4b..340fc7d 100644 --- a/examples/full-cluster-tf-upgrade/1.30/variables.addons.tf +++ b/examples/full-cluster-tf-upgrade/1.30/variables.addons.tf @@ -51,15 +51,15 @@ variable "addon_versions" { "eks-pod-identity-agent" = "v1.3.2-eksbuild.2" } "1.29" = { - "coredns" = "v1.11.3-eksbuild.1" - "kube-proxy" = "v1.29.7-eksbuild.5" - "vpc-cni" = "v1.18.3-eksbuild.3" - "aws-ebs-csi-driver" = "v1.34.0-eksbuild.1" - "aws-efs-csi-driver" = "v2.0.7-eksbuild.1" - "adot" = "v0.102.0-eksbuild.1" - "snapshot-controller" = "v8.0.0-eksbuild.1" - "amazon-cloudwatch-observability" = "v2.1.0-eksbuild.1" - "eks-pod-identity-agent" = "v1.3.2-eksbuild.2" + "coredns" = "v1.11.3-eksbuild.2" + "kube-proxy" = "v1.31.2-eksbuild.3" + "vpc-cni" = "v1.19.0-eksbuild.1" + "aws-ebs-csi-driver" = "v1.37.0-eksbuild.1" + "aws-efs-csi-driver" = "v2.1.0-eksbuild.1" + "adot" = "v0.109.0-eksbuild.1" + "snapshot-controller" = "v8.1.0-eksbuild.2" + "amazon-cloudwatch-observability" = "v2.3.1-eksbuild.1" + "eks-pod-identity-agent" = "v1.3.4-eksbuild.1" } "1.30" = { "coredns" = "v1.11.3-eksbuild.1" diff --git a/examples/full-cluster-tf-upgrade/1.30/variables.eks.tf b/examples/full-cluster-tf-upgrade/1.30/variables.eks.tf index 4505e1e..5e166f4 100644 --- a/examples/full-cluster-tf-upgrade/1.30/variables.eks.tf +++ b/examples/full-cluster-tf-upgrade/1.30/variables.eks.tf @@ -22,6 +22,12 @@ variable "cluster_version" { default = "1.28" } +variable "cluster_log_retention_days" { + description = "The EKS cluster CloudWatch Log retention in days" + type = number + default = 90 +} + variable "eks_instance_type" { description = "EKS worker node instance type" type = string