Skip to content

Commit 21ef038

Browse files
primoz-hrovatclaude
andcommitted
chore(examples): migrate EKS examples to AWS provider 6.x
- Update AWS provider version to >= 6.23.0 - Update EKS module to ~> 21.0 - Migrate from ConfigMap to API-only authentication mode - Replace aws_auth_roles with aws_eks_access_entry resources - Fix deprecated resolve_conflicts attribute - Update cluster_id references to cluster_name 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 8b4b0d3 commit 21ef038

File tree

32 files changed

+223
-324
lines changed

32 files changed

+223
-324
lines changed

examples/eks/eks_cluster_access_entries/eks.tf

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
# 2. Create EKS cluster.
22
module "eks" {
3-
source = "terraform-aws-modules/eks/aws"
4-
version = "21.3.1"
5-
putin_khuylo = true
3+
source = "terraform-aws-modules/eks/aws"
4+
version = "~> 21.0"
65

76
name = var.cluster_name
87
kubernetes_version = var.cluster_version
98
endpoint_public_access = true
109

1110
addons = {
12-
coredns = {}
11+
coredns = {
12+
most_recent = true
13+
}
1314
eks-pod-identity-agent = {
15+
most_recent = true
1416
before_compute = true
1517
}
16-
kube-proxy = {}
18+
kube-proxy = {
19+
most_recent = true
20+
}
1721
vpc-cni = {
22+
most_recent = true
1823
before_compute = true
1924
}
2025
}
2126

2227
vpc_id = module.vpc.vpc_id
2328
subnet_ids = module.vpc.private_subnets
2429

25-
authentication_mode = "API_AND_CONFIG_MAP"
30+
authentication_mode = "API"
2631

2732
access_entries = {
2833
for key, arn in var.additional_cluster_admin_arns :
@@ -73,8 +78,9 @@ resource "aws_security_group" "additional" {
7378
}
7479
}
7580

76-
resource "aws_eks_access_entry" "access_entry" {
77-
cluster_name = var.cluster_name
81+
# CAST AI access entry for nodes to join the cluster.
82+
resource "aws_eks_access_entry" "castai" {
83+
cluster_name = module.eks.cluster_name
7884
principal_arn = module.castai-eks-role-iam.instance_profile_role_arn
7985
type = "EC2_LINUX"
8086
}

examples/eks/eks_cluster_access_entries/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ terraform {
1212
}
1313
aws = {
1414
source = "hashicorp/aws"
15-
version = "~> 6.0"
15+
version = ">= 6.23.0"
1616
}
1717
}
1818
required_version = ">= 1.3.2"

examples/eks/eks_cluster_assumerole/eks.tf

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# 2. Create EKS cluster.
22
module "eks" {
3-
source = "terraform-aws-modules/eks/aws"
4-
version = "19.4.2"
5-
putin_khuylo = true
3+
source = "terraform-aws-modules/eks/aws"
4+
version = "~> 21.0"
65

7-
cluster_name = var.cluster_name
8-
cluster_version = var.cluster_version
9-
cluster_endpoint_public_access = true
6+
name = var.cluster_name
7+
kubernetes_version = var.cluster_version
8+
endpoint_public_access = true
109

11-
cluster_addons = {
10+
addons = {
1211
coredns = {
1312
most_recent = true
1413
}
@@ -23,19 +22,7 @@ module "eks" {
2322
vpc_id = module.vpc.vpc_id
2423
subnet_ids = module.vpc.private_subnets
2524

26-
manage_aws_auth_configmap = true
27-
28-
aws_auth_roles = [
29-
# Add the CAST AI IAM role which required for CAST AI nodes to join the cluster.
30-
{
31-
rolearn = module.castai-eks-role-iam.instance_profile_role_arn
32-
username = "system:node:{{EC2PrivateDNSName}}"
33-
groups = [
34-
"system:bootstrappers",
35-
"system:nodes",
36-
]
37-
},
38-
]
25+
authentication_mode = "API"
3926

4027
self_managed_node_groups = {
4128
node_group_1 = {
@@ -78,3 +65,10 @@ resource "aws_security_group" "additional" {
7865
]
7966
}
8067
}
68+
69+
# CAST AI access entry for nodes to join the cluster.
70+
resource "aws_eks_access_entry" "castai" {
71+
cluster_name = module.eks.cluster_name
72+
principal_arn = module.castai-eks-role-iam.instance_profile_role_arn
73+
type = "EC2_LINUX"
74+
}

examples/eks/eks_cluster_assumerole/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ terraform {
1212
}
1313
aws = {
1414
source = "hashicorp/aws"
15-
version = "~> 5.0"
15+
version = ">= 6.23.0"
1616
}
1717
}
1818
required_version = ">= 1.3.2"

examples/eks/eks_cluster_autoscaler_policies/eks.tf

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# 2. Create EKS cluster.
22
module "eks" {
3-
source = "terraform-aws-modules/eks/aws"
4-
version = "19.4.2"
5-
putin_khuylo = true
3+
source = "terraform-aws-modules/eks/aws"
4+
version = "~> 21.0"
65

7-
cluster_name = var.cluster_name
8-
cluster_version = var.cluster_version
9-
cluster_endpoint_public_access = true
6+
name = var.cluster_name
7+
kubernetes_version = var.cluster_version
8+
endpoint_public_access = true
109

11-
cluster_addons = {
10+
addons = {
1211
coredns = {
1312
most_recent = true
1413
}
@@ -23,19 +22,7 @@ module "eks" {
2322
vpc_id = module.vpc.vpc_id
2423
subnet_ids = module.vpc.private_subnets
2524

26-
manage_aws_auth_configmap = true
27-
28-
aws_auth_roles = [
29-
# Add the CAST AI IAM role which required for CAST AI nodes to join the cluster.
30-
{
31-
rolearn = module.castai-eks-role-iam.instance_profile_role_arn
32-
username = "system:node:{{EC2PrivateDNSName}}"
33-
groups = [
34-
"system:bootstrappers",
35-
"system:nodes",
36-
]
37-
},
38-
]
25+
authentication_mode = "API"
3926

4027
self_managed_node_groups = {
4128
node_group_1 = {
@@ -78,3 +65,10 @@ resource "aws_security_group" "additional" {
7865
]
7966
}
8067
}
68+
69+
# CAST AI access entry for nodes to join the cluster.
70+
resource "aws_eks_access_entry" "castai" {
71+
cluster_name = module.eks.cluster_name
72+
principal_arn = module.castai-eks-role-iam.instance_profile_role_arn
73+
type = "EC2_LINUX"
74+
}

examples/eks/eks_cluster_autoscaler_policies/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ terraform {
1212
}
1313
aws = {
1414
source = "hashicorp/aws"
15-
version = "~> 5.0"
15+
version = ">= 6.23.0"
1616
}
1717
}
1818
required_version = ">= 1.3.2"

examples/eks/eks_cluster_custom_iam/eks.tf

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# 2. Create EKS cluster.
22
module "eks" {
3-
source = "terraform-aws-modules/eks/aws"
4-
version = "19.4.2"
5-
putin_khuylo = true
3+
source = "terraform-aws-modules/eks/aws"
4+
version = "~> 21.0"
65

7-
cluster_name = var.cluster_name
8-
cluster_version = var.cluster_version
9-
cluster_endpoint_public_access = true
6+
name = var.cluster_name
7+
kubernetes_version = var.cluster_version
8+
endpoint_public_access = true
109

11-
cluster_addons = {
10+
addons = {
1211
coredns = {
1312
most_recent = true
1413
}
@@ -23,11 +22,7 @@ module "eks" {
2322
vpc_id = module.vpc.vpc_id
2423
subnet_ids = module.vpc.private_subnets
2524

26-
manage_aws_auth_configmap = true
27-
aws_auth_node_iam_role_arns_non_windows = [
28-
# Required for CAST AI nodes to join cluster.
29-
aws_iam_role.castai_instance_profile_role.arn,
30-
]
25+
authentication_mode = "API"
3126

3227
self_managed_node_groups = {
3328
node_group_1 = {
@@ -70,3 +65,10 @@ resource "aws_security_group" "additional" {
7065
]
7166
}
7267
}
68+
69+
# CAST AI access entry for nodes to join the cluster.
70+
resource "aws_eks_access_entry" "castai" {
71+
cluster_name = module.eks.cluster_name
72+
principal_arn = aws_iam_role.castai_instance_profile_role.arn
73+
type = "EC2_LINUX"
74+
}

examples/eks/eks_cluster_custom_iam/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ terraform {
1212
}
1313
aws = {
1414
source = "hashicorp/aws"
15-
version = "~> 5.0"
15+
version = ">= 6.23.0"
1616
}
1717
}
1818
required_version = ">= 1.3.2"

examples/eks/eks_cluster_existing/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ terraform {
1212
}
1313
aws = {
1414
source = "hashicorp/aws"
15-
version = "~> 5.0"
15+
version = ">= 6.23.0"
1616
}
1717
}
1818
required_version = ">= 1.3.2"

examples/eks/eks_cluster_gitops/versions.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@ terraform {
66
source = "castai/castai"
77
version = ">= 3.11.0"
88
}
9+
aws = {
10+
source = "hashicorp/aws"
11+
version = ">= 6.23.0"
12+
}
913
}
1014
}

0 commit comments

Comments
 (0)