Skip to content

fix(eks): migrate all AMI types from AL2 to AL2023 for K8s 1.33+ #674

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

Open
musa-asad wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(eks): migrate all AMI types from AL2 to AL2023 for K8s 1.33+ #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 generator/resources/eks_addon_test_matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"k8sVersion": "1.31",
"ami": "AL2_x86_64_GPU",
"ami": "AL2023_x86_64_NVIDIA",
"terraform_dir": "terraform/eks/addon/gpu",
"test_dir": "./test/gpu",
"instanceType":"g4dn.xlarge"
Expand Down
4 changes: 2 additions & 2 deletions generator/resources/eks_daemon_test_matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[
{
"k8sVersion": "1.35",
"ami": "AL2_x86_64",
"ami": "AL2023_x86_64_STANDARD",
"instanceType":"t3.medium",
"arc": "amd64"
},
{
"k8sVersion": "1.35",
"ami": "AL2_ARM_64",
"ami": "AL2023_ARM_64_STANDARD",
"instanceType":"m6g.large",
"arc": "arm64"
}
Expand Down
6 changes: 3 additions & 3 deletions generator/test_case_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ var testTypeToTestConfig = map[string][]testConfig{
testDir: "./test/metric_value_benchmark",
targets: map[string]map[string]struct{}{"arc": {"amd64": {}}},
instanceType: "g4dn.xlarge",
ami: "AL2_x86_64_GPU",
ami: "AL2023_x86_64_NVIDIA",
},
{
testDir: "./test/metric_value_benchmark",
Expand Down Expand Up @@ -386,13 +386,13 @@ var testTypeToTestConfig = map[string][]testConfig{
testDir: "./test/gpu", terraformDir: "terraform/eks/daemon/gpu",
targets: map[string]map[string]struct{}{"arc": {"amd64": {}}},
instanceType: "g4dn.xlarge",
ami: "AL2_x86_64_GPU",
ami: "AL2023_x86_64_NVIDIA",
},
{
testDir: "./test/gpu_high_frequency_metrics", terraformDir: "terraform/eks/daemon/gpu",
targets: map[string]map[string]struct{}{"arc": {"amd64": {}}},
instanceType: "g4dn.xlarge",
ami: "AL2_x86_64_GPU",
ami: "AL2023_x86_64_NVIDIA",
},
{
testDir: "./test/awsneuron", terraformDir: "terraform/eks/daemon/awsneuron",
Expand Down
15 changes: 14 additions & 1 deletion terraform/eks/addon/gpu/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-addon-eks-integ-node"
Expand All @@ -52,9 +61,13 @@ resource "aws_eks_node_group" "this" {

ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = [var.instance_type]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/addon/gpu/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64_GPU"
default = "AL2023_x86_64_NVIDIA"
}

variable "instance_type" {
Expand Down
18 changes: 16 additions & 2 deletions terraform/eks/daemon/app_signals/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-eks-integ-node"
Expand All @@ -47,11 +56,15 @@ resource "aws_eks_node_group" "this" {
min_size = 1
}

ami_type = "AL2_x86_64"
ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = ["t3.medium"]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down Expand Up @@ -373,6 +386,7 @@ resource "kubernetes_daemonset" "service" {
}
}
service_account_name = "cloudwatch-agent"
host_network = true
termination_grace_period_seconds = 60
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/app_signals/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
18 changes: 16 additions & 2 deletions terraform/eks/daemon/awsneuron/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-eks-integ-node"
Expand All @@ -47,11 +56,15 @@ resource "aws_eks_node_group" "this" {
min_size = 1
}

ami_type = "AL2_x86_64"
ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = ["t3.medium"]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down Expand Up @@ -672,6 +685,7 @@ resource "kubernetes_daemonset" "service" {
}
}
service_account_name = "cloudwatch-agent"
host_network = true
termination_grace_period_seconds = 60
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/awsneuron/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
15 changes: 14 additions & 1 deletion terraform/eks/daemon/credentials/pod_identity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-eks-integ-node-${module.common.testing_id}"
Expand All @@ -44,9 +53,13 @@ resource "aws_eks_node_group" "this" {

ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = [var.instance_type]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/credentials/pod_identity/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
15 changes: 14 additions & 1 deletion terraform/eks/daemon/ebs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-addon-eks-integ-node-${module.common.testing_id}"
Expand All @@ -46,9 +55,13 @@ resource "aws_eks_node_group" "this" {

ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = [var.instance_type]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/ebs/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
18 changes: 16 additions & 2 deletions terraform/eks/daemon/emf/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-eks-integ-node"
Expand All @@ -47,11 +56,15 @@ resource "aws_eks_node_group" "this" {
min_size = 1
}

ami_type = "AL2_x86_64"
ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = ["t3.medium"]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down Expand Up @@ -367,6 +380,7 @@ resource "kubernetes_daemonset" "service" {
}
}
service_account_name = "cloudwatch-agent"
host_network = true
termination_grace_period_seconds = 60
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/emf/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
15 changes: 14 additions & 1 deletion terraform/eks/daemon/entity/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ resource "aws_eks_cluster" "this" {
}

# EKS Node Groups

resource "aws_launch_template" "node" {
metadata_options {
http_endpoint = "enabled"
http_tokens = "required"
http_put_response_hop_limit = 2
}
}

resource "aws_eks_node_group" "this" {
cluster_name = aws_eks_cluster.this.name
node_group_name = "cwagent-eks-integ-node-${module.common.testing_id}"
Expand All @@ -44,9 +53,13 @@ resource "aws_eks_node_group" "this" {

ami_type = var.ami_type
capacity_type = "ON_DEMAND"
disk_size = 20
instance_types = [var.instance_type]

launch_template {
id = aws_launch_template.node.id
version = aws_launch_template.node.latest_version
}

depends_on = [
aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/entity/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/eks/daemon/fluent/bit/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variable "k8s_version" {

variable "ami_type" {
type = string
default = "AL2_x86_64"
default = "AL2023_x86_64_STANDARD"
}

variable "instance_type" {
Expand Down
Loading
Loading