Skip to content

KRA-49 feat: update EKS to 1.31 #851

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

Merged
muse-sisay merged 4 commits into from
Jan 9, 2025
Merged

KRA-49 feat: update EKS to 1.31 #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4249ecb
feat: upgrade eks version to v1.31
muse-sisay Jan 7, 2025
be16b01
feat: update eks to 1.31 in aws gitlab combo
muse-sisay Jan 7, 2025
ae1f79f
feat: enable default storage
muse-sisay Jan 8, 2025
7b668f0
Merge branch 'main' into KRA-49
muse-sisay Jan 9, 2025
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
103 changes: 54 additions & 49 deletions aws-github/terraform/aws/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ data "aws_availability_zones" "available" {}

locals {
name = "<CLUSTER_NAME>"
cluster_version = "1.29"
cluster_version = "1.31"
region = "<CLOUD_REGION>"

vpc_cidr = "10.0.0.0/16"
Expand Down Expand Up @@ -52,6 +52,11 @@ module "eks" {
aws-ebs-csi-driver = {
most_recent = true
service_account_role_arn = module.aws_ebs_csi_driver.iam_role_arn
configuration_values = jsonencode({
defaultStorageClass = {
enabled = true
}
})
}
kube-proxy = {
most_recent = true
Expand Down Expand Up @@ -89,9 +94,9 @@ module "eks" {
eks_managed_node_groups = {
# Default node group - as provided by AWS EKS
default_node_group = {
desired_size = tonumber("<NODE_COUNT>") # tonumber() is used for a string token value
min_size = tonumber("1") # tonumber() is used for a string token value
max_size = tonumber("<NODE_COUNT>")+10 # tonumber() is used for a string token value
desired_size = tonumber("<NODE_COUNT>") # tonumber() is used for a string token value
min_size = tonumber("1") # tonumber() is used for a string token value
max_size = tonumber("<NODE_COUNT>") + 10 # tonumber() is used for a string token value
# By default, the module creates a launch template to ensure tags are propagated to instances, etc.,
# so we need to disable it to use the default template provided by the AWS EKS managed node group service
use_custom_launch_template = false
Expand All @@ -104,14 +109,14 @@ module "eks" {
enable_cluster_creator_admin_permissions = true

access_entries = {

"argocd_<CLUSTER_NAME>" = {
cluster_name = "<CLUSTER_NAME>"
principal_arn = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/argocd-<CLUSTER_NAME>"
username = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/argocd-<CLUSTER_NAME>"
cluster_name = "<CLUSTER_NAME>"
principal_arn = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/argocd-<CLUSTER_NAME>"
username = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/argocd-<CLUSTER_NAME>"
policy_associations = {
view_deployments = {
policy_arn = "arn:aws:eks::aws:cluster-access-policy/AmazonEKSViewPolicy"
policy_arn = "arn:aws:eks::aws:cluster-access-policy/AmazonEKSViewPolicy"
access_scope = {
namespaces = ["default"]
type = "namespace"
Expand All @@ -121,12 +126,12 @@ module "eks" {
}

"atlantis_<CLUSTER_NAME>" = {
cluster_name = "<CLUSTER_NAME>"
principal_arn = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/atlantis-<CLUSTER_NAME>"
username = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/atlantis-<CLUSTER_NAME>"
cluster_name = "<CLUSTER_NAME>"
principal_arn = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/atlantis-<CLUSTER_NAME>"
username = "arn:aws:iam::<AWS_ACCOUNT_ID>:role/atlantis-<CLUSTER_NAME>"
policy_associations = {
view_deployments = {
policy_arn = "arn:aws:eks::aws:cluster-access-policy/AmazonEKSViewPolicy"
policy_arn = "arn:aws:eks::aws:cluster-access-policy/AmazonEKSViewPolicy"
access_scope = {
namespaces = ["default"]
type = "namespace"
Expand Down Expand Up @@ -617,7 +622,7 @@ resource "aws_iam_policy" "ssm_access_policy" {
Version = "2012-10-17",
Statement = [
{
Sid = "Statement1",
Sid = "Statement1",
Effect = "Allow",
Action = [
"ssm:*"
Expand All @@ -637,7 +642,7 @@ module "kubefirst_api" {
role_name = "kubefirst-pro-api-${local.name}"
role_policy_arns = {
kubefirst = "arn:aws:iam::aws:policy/AmazonEC2FullAccess",
ssm = aws_iam_policy.ssm_access_policy.arn
ssm = aws_iam_policy.ssm_access_policy.arn
}
assume_role_condition_test = "StringLike"
allow_self_assume_role = true
Expand Down Expand Up @@ -735,11 +740,11 @@ resource "aws_iam_policy" "cluster_autoscaler" {
name = "cluster-autoscaler-${local.name}"
path = "/"
policy = jsonencode({
"Version": "2012-10-17",
"Statement": [
"Version" : "2012-10-17",
"Statement" : [
{
"Effect": "Allow",
"Action": [
"Effect" : "Allow",
"Action" : [
"autoscaling:DescribeAutoScalingGroups",
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
Expand All @@ -752,7 +757,7 @@ resource "aws_iam_policy" "cluster_autoscaler" {
"autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup"
],
"Resource": ["*"]
"Resource" : ["*"]
}
]
})
Expand All @@ -763,42 +768,42 @@ resource "aws_iam_policy" "vault_dynamodb" {
path = "/"

policy = jsonencode({
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"dynamodb:Query",
"dynamodb:DescribeTable",
"dynamodb:GetItem",
"dynamodb:PutItem",
"dynamodb:DeleteItem",
"dynamodb:BatchWriteItem",
"dynamodb:UpdateItem"
],
"Resource": "*"
}
"Version" : "2012-10-17",
"Statement" : [
{
"Effect" : "Allow",
"Action" : [
"dynamodb:Query",
"dynamodb:DescribeTable",
"dynamodb:GetItem",
"dynamodb:PutItem",
"dynamodb:DeleteItem",
"dynamodb:BatchWriteItem",
"dynamodb:UpdateItem"
],
"Resource" : "*"
}
]
})
})
}

resource "aws_iam_policy" "vault_kms" {
name = "vault-kms-${local.name}"
path = "/"

policy = jsonencode({
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"kms:DescribeKey",
"kms:Decrypt",
"kms:Encrypt",
"kms:GenerateDataKey"
],
"Resource": "*"
}
"Version" : "2012-10-17",
"Statement" : [
{
"Effect" : "Allow",
"Action" : [
"kms:DescribeKey",
"kms:Decrypt",
"kms:Encrypt",
"kms:GenerateDataKey"
],
"Resource" : "*"
}
]
})
})
}
13 changes: 9 additions & 4 deletions aws-github/terraform/aws/modules/workload-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
data "aws_availability_zones" "available" {}

locals {
cluster_version = "1.29"
cluster_version = "1.31"
vpc_cidr = "10.0.0.0/16"
azs = slice(data.aws_availability_zones.available.names, 0, 3)
tags = {
Expand Down Expand Up @@ -42,6 +42,11 @@ module "eks" {
aws-ebs-csi-driver = {
most_recent = true
service_account_role_arn = module.aws_ebs_csi_driver.iam_role_arn
configuration_values = jsonencode({
defaultStorageClass = {
enabled = true
}
})
}
kube-proxy = {
most_recent = true
Expand Down Expand Up @@ -78,9 +83,9 @@ module "eks" {
eks_managed_node_groups = {
# Default node group - as provided by AWS EKS
default_node_group = {
desired_size = tonumber(var.node_count) # tonumber() is used for a string token value
min_size = tonumber(1) # tonumber() is used for a string token value
max_size = tonumber(var.node_count)+10 # tonumber() is used for a string token value
desired_size = tonumber(var.node_count) # tonumber() is used for a string token value
min_size = tonumber(1) # tonumber() is used for a string token value
max_size = tonumber(var.node_count) + 10 # tonumber() is used for a string token value
# By default, the module creates a launch template to ensure tags are propagated to instances, etc.,
# so we need to disable it to use the default template provided by the AWS EKS managed node group service
use_custom_launch_template = false
Expand Down
Loading