mirror of
https://github.com/terraform-aws-modules/terraform-aws-eks.git
synced 2025-09-09 19:32:58 +08:00
feat!: Upgrade min AWS provider and Terraform versions to 6.0 and 1.5.7 respectively (#3412)
* feat!: Upgrade min AWS provider and Terraform versions to `6.0` and `1.5.7` respectively * fix: Remove deprecated arguments in AWS v6.0 provider, upgrade Helm provider to v3.0, bump VPC module to v6.0 * fix: Remove `aws-auth` sub-module * fix: Remove `platform` and `cluster_service_ipv4_cidr` variables from `user-data` sub-module * fix: Resolve all marked `todos` that have been accumulated * fix: Set default `http_put_response_hop_limit` to `1` * fix: Remove IRSA support from Karpenter sub-module * fix: Avoid making GET requests from data sources unless absolutely necessary * feat: Add variable optional attribute definitions * feat: Bump KMS key module version to latest, add remaining variable attribute definitions * fix: Remove `cluster_` prefix from variable names to better match the underlying API * fix: Move all EFA logic to the nodegroup itself * fix: Remove arguments that do not make sense in EKS * fix: Updates from plan validation * fix: Remove more self-managed node group attributes that are commonly not used in EKS clusters * fix: Remove data plane compute `*_defaults` variables that do not work with variable optional attributes * fix: Ignore changes to `bootstrap_self_managed_addons` to aid in upgrade * feat: Add support for `region` argument on relevant resources * feat: Initial pass on upgrade guide * fix: Updates from testing and validating EKS managed node group * fix: Updates from testing and validating self-managed node group * docs: Ensure addon ussage documented is aligned * feat: Switch to dualstack OIDC issuer URL * feat: Allow sourcing over overriding the Karpenter assume role policy * fix: Use `Bool` instead of `StringEquals` for DenyHTTP queue policy * fix: Correct use of `nullable` and default value propagation
This commit is contained in:
@@ -25,9 +25,9 @@ Note that this example may create resources which cost money. Run `terraform des
|
||||
|
||||
| Name | Version |
|
||||
|------|---------|
|
||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.2 |
|
||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.95, < 6.0.0 |
|
||||
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.7, < 3.0.0 |
|
||||
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
|
||||
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.0 |
|
||||
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0 |
|
||||
| <a name="requirement_http"></a> [http](#requirement\_http) | >= 3.4 |
|
||||
| <a name="requirement_local"></a> [local](#requirement\_local) | >= 2.5 |
|
||||
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 4.0 |
|
||||
@@ -36,9 +36,9 @@ Note that this example may create resources which cost money. Run `terraform des
|
||||
|
||||
| Name | Version |
|
||||
|------|---------|
|
||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.95, < 6.0.0 |
|
||||
| <a name="provider_aws.remote"></a> [aws.remote](#provider\_aws.remote) | >= 5.95, < 6.0.0 |
|
||||
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.7, < 3.0.0 |
|
||||
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.0 |
|
||||
| <a name="provider_aws.remote"></a> [aws.remote](#provider\_aws.remote) | >= 6.0 |
|
||||
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 3.0 |
|
||||
| <a name="provider_http"></a> [http](#provider\_http) | >= 3.4 |
|
||||
| <a name="provider_local"></a> [local](#provider\_local) | >= 2.5 |
|
||||
|
||||
@@ -49,8 +49,8 @@ Note that this example may create resources which cost money. Run `terraform des
|
||||
| <a name="module_eks"></a> [eks](#module\_eks) | ../.. | n/a |
|
||||
| <a name="module_eks_hybrid_node_role"></a> [eks\_hybrid\_node\_role](#module\_eks\_hybrid\_node\_role) | ../../modules/hybrid-node-role | n/a |
|
||||
| <a name="module_key_pair"></a> [key\_pair](#module\_key\_pair) | terraform-aws-modules/key-pair/aws | ~> 2.0 |
|
||||
| <a name="module_remote_node_vpc"></a> [remote\_node\_vpc](#module\_remote\_node\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
|
||||
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
|
||||
| <a name="module_remote_node_vpc"></a> [remote\_node\_vpc](#module\_remote\_node\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
|
||||
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 |
|
||||
|
||||
## Resources
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@ provider "aws" {
|
||||
}
|
||||
|
||||
provider "helm" {
|
||||
kubernetes {
|
||||
kubernetes = {
|
||||
host = module.eks.cluster_endpoint
|
||||
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
|
||||
|
||||
exec {
|
||||
exec = {
|
||||
api_version = "client.authentication.k8s.io/v1beta1"
|
||||
command = "aws"
|
||||
# This requires the awscli to be installed locally where Terraform is executed
|
||||
@@ -20,7 +20,7 @@ locals {
|
||||
name = "ex-${basename(path.cwd)}"
|
||||
region = "us-west-2"
|
||||
|
||||
cluster_version = "1.33"
|
||||
kubernetes_version = "1.33"
|
||||
|
||||
tags = {
|
||||
Test = local.name
|
||||
@@ -36,20 +36,20 @@ locals {
|
||||
module "eks" {
|
||||
source = "../.."
|
||||
|
||||
cluster_name = local.name
|
||||
cluster_version = local.cluster_version
|
||||
name = local.name
|
||||
kubernetes_version = local.kubernetes_version
|
||||
|
||||
cluster_endpoint_public_access = true
|
||||
endpoint_public_access = true
|
||||
enable_cluster_creator_admin_permissions = true
|
||||
|
||||
cluster_addons = {
|
||||
addons = {
|
||||
coredns = {}
|
||||
eks-pod-identity-agent = {}
|
||||
kube-proxy = {}
|
||||
}
|
||||
|
||||
create_node_security_group = false
|
||||
cluster_security_group_additional_rules = {
|
||||
security_group_additional_rules = {
|
||||
hybrid-all = {
|
||||
cidr_blocks = [local.remote_network_cidr]
|
||||
description = "Allow all traffic from remote node/pod network"
|
||||
@@ -60,7 +60,7 @@ module "eks" {
|
||||
}
|
||||
}
|
||||
|
||||
cluster_compute_config = {
|
||||
compute_config = {
|
||||
enabled = true
|
||||
node_pools = ["system"]
|
||||
}
|
||||
@@ -75,7 +75,7 @@ module "eks" {
|
||||
vpc_id = module.vpc.vpc_id
|
||||
subnet_ids = module.vpc.private_subnets
|
||||
|
||||
cluster_remote_network_config = {
|
||||
remote_network_config = {
|
||||
remote_node_networks = {
|
||||
cidrs = [local.remote_node_cidr]
|
||||
}
|
||||
@@ -106,7 +106,7 @@ data "aws_availability_zones" "available" {
|
||||
|
||||
module "vpc" {
|
||||
source = "terraform-aws-modules/vpc/aws"
|
||||
version = "~> 5.0"
|
||||
version = "~> 6.0"
|
||||
|
||||
name = local.name
|
||||
cidr = local.vpc_cidr
|
||||
|
||||
@@ -89,7 +89,7 @@ data "aws_ami" "hybrid_node" {
|
||||
provider = aws.remote
|
||||
|
||||
most_recent = true
|
||||
name_regex = "eks-hybrid-ubuntu-${local.cluster_version}-amd64-*"
|
||||
name_regex = "eks-hybrid-ubuntu-${local.kubernetes_version}-amd64-*"
|
||||
owners = ["self"]
|
||||
}
|
||||
|
||||
@@ -253,7 +253,7 @@ data "aws_availability_zones" "remote" {
|
||||
|
||||
module "remote_node_vpc" {
|
||||
source = "terraform-aws-modules/vpc/aws"
|
||||
version = "~> 5.0"
|
||||
version = "~> 6.0"
|
||||
|
||||
providers = {
|
||||
aws = aws.remote
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
terraform {
|
||||
required_version = ">= 1.3.2"
|
||||
required_version = ">= 1.5.7"
|
||||
|
||||
required_providers {
|
||||
aws = {
|
||||
source = "hashicorp/aws"
|
||||
version = ">= 5.95, < 6.0.0"
|
||||
version = ">= 6.0"
|
||||
}
|
||||
helm = {
|
||||
source = "hashicorp/helm"
|
||||
version = ">= 2.7, < 3.0.0"
|
||||
version = ">= 3.0"
|
||||
}
|
||||
http = {
|
||||
source = "hashicorp/http"
|
||||
|
||||
Reference in New Issue
Block a user