Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version of the Terraform module "eks" to 19.4.2 #312

Merged
merged 3 commits into from
Dec 23, 2022
Merged

Bump version of the Terraform module "eks" to 19.4.2 #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c018b9
chore: Updated the content of the file "/tmp/updatecli/github/jenkins...
jenkins-infra-bot Dec 23, 2022
2972e46
chore: bump shared tools to latest version
dduportal Dec 23, 2022
d1350e4
chore: comment out EKS module global tags because of https://github.c…
dduportal Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .shared-tools
Open in desktop
Submodule .shared-tools updated 1 files
+1 −2 terraform/Makefile
18 changes: 10 additions & 8 deletions eks-cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<MINOR>.<MINOR>', as per https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html
cluster_version = "1.23"
Expand All @@ -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
Expand Down
16 changes: 9 additions & 7 deletions eks-public-cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<MINOR>.<MINOR>', as per https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html
cluster_version = "1.23"
Expand All @@ -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
Expand Down