mirror of
https://github.com/ysoftdevs/terraform-aws-eks.git
synced 2026-01-11 14:30:55 +01:00
docs: Update doc references to 1.33; remove AL2 examples since 1.33+ does not support AL2 (#3402)
This commit is contained in:
Bryant Biggs
@@ -33,7 +33,7 @@ module "eks" {
|
||||
version = "~> 20.31"
|
||||
|
||||
cluster_name = "example"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# Optional
|
||||
cluster_endpoint_public_access = true
|
||||
@@ -82,7 +82,7 @@ module "eks" {
|
||||
version = "~> 20.31"
|
||||
|
||||
cluster_name = "example"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
cluster_addons = {
|
||||
coredns = {}
|
||||
@@ -149,7 +149,7 @@ module "eks" {
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "my-cluster"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
bootstrap_self_managed_addons = false
|
||||
cluster_addons = {
|
||||
|
||||
@@ -113,7 +113,7 @@ Refer to the [Self Managed Node Group documentation](https://docs.aws.amazon.com
|
||||
1. The `self-managed-node-group` uses the latest AWS EKS Optimized AMI (Linux) for the given Kubernetes version by default:
|
||||
|
||||
```hcl
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# This self managed node group will use the latest AWS EKS Optimized AMI for Kubernetes 1.27
|
||||
self_managed_node_groups = {
|
||||
@@ -124,7 +124,7 @@ Refer to the [Self Managed Node Group documentation](https://docs.aws.amazon.com
|
||||
2. To use Bottlerocket, specify the `ami_type` as one of the respective `"BOTTLEROCKET_*" types` and supply a Bottlerocket OS AMI:
|
||||
|
||||
```hcl
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
self_managed_node_groups = {
|
||||
bottlerocket = {
|
||||
|
||||
@@ -12,7 +12,7 @@ data "aws_availability_zones" "available" {
|
||||
|
||||
locals {
|
||||
name = "ex-${basename(path.cwd)}"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
region = "us-west-2"
|
||||
|
||||
vpc_cidr = "10.0.0.0/16"
|
||||
|
||||
@@ -7,7 +7,7 @@ variable "ami_name_prefix" {
|
||||
variable "eks_version" {
|
||||
description = "The EKS cluster version associated with the AMI created"
|
||||
type = string
|
||||
default = "1.31"
|
||||
default = "1.33"
|
||||
}
|
||||
|
||||
variable "credential_provider" {
|
||||
|
||||
@@ -20,7 +20,7 @@ locals {
|
||||
name = "ex-${basename(path.cwd)}"
|
||||
region = "us-west-2"
|
||||
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
tags = {
|
||||
Test = local.name
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
Configuration in this directory creates Amazon EKS clusters with EKS Managed Node Groups demonstrating different configurations:
|
||||
|
||||
- `eks-al2.tf` demonstrates an EKS cluster using EKS managed node group that utilizes the EKS Amazon Linux 2 optimized AMI
|
||||
- `eks-al2023.tf` demonstrates an EKS cluster using EKS managed node group that utilizes the EKS Amazon Linux 2023 optimized AMI
|
||||
- `eks-bottlerocket.tf` demonstrates an EKS cluster using EKS managed node group that utilizes the Bottlerocket EKS optimized AMI
|
||||
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
module "eks_al2" {
|
||||
source = "terraform-aws-modules/eks/aws"
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "${local.name}-al2"
|
||||
cluster_version = "1.31"
|
||||
|
||||
# EKS Addons
|
||||
cluster_addons = {
|
||||
coredns = {}
|
||||
eks-pod-identity-agent = {}
|
||||
kube-proxy = {}
|
||||
vpc-cni = {}
|
||||
}
|
||||
|
||||
vpc_id = module.vpc.vpc_id
|
||||
subnet_ids = module.vpc.private_subnets
|
||||
|
||||
eks_managed_node_groups = {
|
||||
example = {
|
||||
# Starting on 1.30, AL2023 is the default AMI type for EKS managed node groups
|
||||
ami_type = "AL2_x86_64"
|
||||
instance_types = ["m6i.large"]
|
||||
|
||||
min_size = 2
|
||||
max_size = 5
|
||||
# This value is ignored after the initial creation
|
||||
# https://github.com/bryantbiggs/eks-desired-size-hack
|
||||
desired_size = 2
|
||||
}
|
||||
}
|
||||
|
||||
tags = local.tags
|
||||
}
|
||||
@@ -3,7 +3,7 @@ module "eks_al2023" {
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "${local.name}-al2023"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# EKS Addons
|
||||
cluster_addons = {
|
||||
|
||||
@@ -3,7 +3,7 @@ module "eks_bottlerocket" {
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "${local.name}-bottlerocket"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# EKS Addons
|
||||
cluster_addons = {
|
||||
|
||||
@@ -55,7 +55,7 @@ module "eks" {
|
||||
source = "../.."
|
||||
|
||||
cluster_name = local.name
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# Gives Terraform identity admin access to cluster which will
|
||||
# allow deploying resources (Karpenter) into the cluster
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
Configuration in this directory creates Amazon EKS clusters with self-managed node groups demonstrating different configurations:
|
||||
|
||||
- `eks-al2.tf` demonstrates an EKS cluster using self-managed node group that utilizes the EKS Amazon Linux 2 optimized AMI
|
||||
- `eks-al2023.tf` demonstrates an EKS cluster using self-managed node group that utilizes the EKS Amazon Linux 2023 optimized AMI
|
||||
- `eks-bottlerocket.tf` demonstrates an EKS cluster using self-managed node group that utilizes the Bottlerocket EKS optimized AMI
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
module "eks_al2" {
|
||||
source = "terraform-aws-modules/eks/aws"
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "${local.name}-al2"
|
||||
cluster_version = "1.31"
|
||||
|
||||
# EKS Addons
|
||||
cluster_addons = {
|
||||
coredns = {}
|
||||
eks-pod-identity-agent = {}
|
||||
kube-proxy = {}
|
||||
vpc-cni = {}
|
||||
}
|
||||
|
||||
vpc_id = module.vpc.vpc_id
|
||||
subnet_ids = module.vpc.private_subnets
|
||||
|
||||
self_managed_node_groups = {
|
||||
example = {
|
||||
ami_type = "AL2_x86_64"
|
||||
instance_type = "m6i.large"
|
||||
|
||||
min_size = 2
|
||||
max_size = 5
|
||||
# This value is ignored after the initial creation
|
||||
# https://github.com/bryantbiggs/eks-desired-size-hack
|
||||
desired_size = 2
|
||||
}
|
||||
}
|
||||
|
||||
tags = local.tags
|
||||
}
|
||||
@@ -3,7 +3,7 @@ module "eks_al2023" {
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "${local.name}-al2023"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# EKS Addons
|
||||
cluster_addons = {
|
||||
|
||||
@@ -3,7 +3,7 @@ module "eks_bottlerocket" {
|
||||
version = "~> 20.0"
|
||||
|
||||
cluster_name = "${local.name}-bottlerocket"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
|
||||
# EKS Addons
|
||||
cluster_addons = {
|
||||
|
||||
@@ -12,7 +12,7 @@ data "aws_availability_zones" "available" {
|
||||
|
||||
locals {
|
||||
name = "ex-${basename(path.cwd)}"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
region = "eu-west-1"
|
||||
|
||||
vpc_cidr = "10.0.0.0/16"
|
||||
|
||||
@@ -14,7 +14,7 @@ data "aws_availability_zones" "available" {
|
||||
|
||||
locals {
|
||||
name = "ex-${replace(basename(path.cwd), "_", "-")}"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
region = "eu-west-1"
|
||||
|
||||
vpc_cidr = "10.0.0.0/16"
|
||||
|
||||
@@ -4,7 +4,7 @@ provider "aws" {
|
||||
|
||||
locals {
|
||||
name = "ex-${basename(path.cwd)}"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
region = "eu-west-1"
|
||||
|
||||
tags = {
|
||||
|
||||
@@ -14,7 +14,7 @@ data "aws_availability_zones" "available" {
|
||||
|
||||
locals {
|
||||
name = "ex-${replace(basename(path.cwd), "_", "-")}"
|
||||
cluster_version = "1.31"
|
||||
cluster_version = "1.33"
|
||||
region = "eu-west-1"
|
||||
|
||||
vpc_cidr = "10.0.0.0/16"
|
||||
|
||||
Reference in New Issue
Block a user