From 916f33e7f1f7fa77aaf70574e1db481e1215745e Mon Sep 17 00:00:00 2001 From: "jenkins-infra-updatecli[bot]" <101213878+jenkins-infra-updatecli[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 18:12:28 +0100 Subject: [PATCH] Bump version of the Terraform module "eks" to 19.4.2 (#312) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Updated the content of the file "/tmp/updatecli/github/jenkins... ... -infra/aws/eks-cluster.tf" Updated the content of the file "/tmp/updatecli/github/jenkins-infra/aws/eks-public-cluster.tf" Made with ❤️️ by updatecli * chore: bump shared tools to latest version Signed-off-by: Damien Duportal * chore: comment out EKS module global tags because of https://github.com/terraform-aws-modules/terraform-aws-eks/issues/2337 Signed-off-by: Damien Duportal Signed-off-by: Damien Duportal Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com> Co-authored-by: Damien Duportal --- .shared-tools | 2 +- eks-cluster.tf | 18 ++++++++++-------- eks-public-cluster.tf | 16 +++++++++------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.shared-tools b/.shared-tools index 522117b..5e7af9c 160000 --- a/.shared-tools +++ b/.shared-tools @@ -1 +1 @@ -Subproject commit 522117b8728020b61b9b073c8107d310050c6185 +Subproject commit 5e7af9ca6e51ffd79ef0646e12164708e2e38155 diff --git a/eks-cluster.tf b/eks-cluster.tf index 9c80f38..d8376b5 100644 --- a/eks-cluster.tf +++ b/eks-cluster.tf @@ -11,7 +11,7 @@ resource "aws_kms_key" "eks" { # EKS Cluster definition module "eks" { source = "terraform-aws-modules/eks/aws" - version = "19.4.0" + version = "19.4.2" cluster_name = local.cluster_name # Kubernetes version in format '.', as per https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html cluster_version = "1.23" @@ -27,15 +27,17 @@ module "eks" { provider_key_arn = aws_kms_key.eks.arn resources = ["secrets"] } - + cluster_endpoint_public_access = true - tags = { - Environment = "jenkins-infra-${terraform.workspace}" - GithubRepo = "aws" - GithubOrg = "jenkins-infra" - associated_service = "eks/${local.cluster_name}" - } + ## TODO: Uncomment when https://github.com/terraform-aws-modules/terraform-aws-eks/issues/2337 is resolved + # create_cluster_primary_security_group_tags = false + # tags = { + # Environment = "jenkins-infra-${terraform.workspace}" + # GithubRepo = "aws" + # GithubOrg = "jenkins-infra" + # associated_service = "eks/${local.cluster_name}" + # } # VPC is defined in vpc.tf vpc_id = module.vpc.vpc_id diff --git a/eks-public-cluster.tf b/eks-public-cluster.tf index b91911e..ff7f614 100644 --- a/eks-public-cluster.tf +++ b/eks-public-cluster.tf @@ -11,7 +11,7 @@ resource "aws_kms_key" "eks-public" { # EKS Cluster definition module "eks-public" { source = "terraform-aws-modules/eks/aws" - version = "19.4.0" + version = "19.4.2" cluster_name = local.public_cluster_name # Kubernetes version in format '.', as per https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html cluster_version = "1.23" @@ -34,12 +34,14 @@ module "eks-public" { resources = ["secrets"] } - tags = { - Environment = "jenkins-infra-${terraform.workspace}" - GithubRepo = "aws" - GithubOrg = "jenkins-infra" - associated_service = "eks/${local.public_cluster_name}" - } + ## TODO: Uncomment when https://github.com/terraform-aws-modules/terraform-aws-eks/issues/2337 is resolved + # create_cluster_primary_security_group_tags = false + # tags = { + # Environment = "jenkins-infra-${terraform.workspace}" + # GithubRepo = "aws" + # GithubOrg = "jenkins-infra" + # associated_service = "eks/${local.public_cluster_name}" + # } # VPC is defined in vpc.tf vpc_id = module.vpc.vpc_id