(eks): EKS v1.33 support

[paulhcsun]

Describe the feature

Add support for EKS v1.33 https://docs.aws.amazon.com/eks/latest/userguide/platform-versions.html

Use Case

Latest version is recommended

Proposed Solution

Create PRs to add support for the new version, similar to these two PRs done for v1.32 in the past:

• feat(eks): support eks with k8s 1.32 #33339
• feat(eks-v2-alpha): support eks with k8s 1.32 #33344

Latest version of lambda-layer-kubectl-v33 is available: https://github.com/cdklabs/awscdk-asset-kubectl/releases/tag/kubectl-v33v2.0.0

Other Information

No response

Acknowledgements

• I may be able to implement this feature request
• This feature might incur a breaking change

AWS CDK Library version (aws-cdk-lib)

2.197.0

AWS CDK CLI version

v2.1016.1-alpha.0

Environment details (OS name and version, etc.)

macOS

[phuhung273]

Hi @paulhcsun, @pahud, @xazhao, I'm working on a PR for this and run into this error. It would be great if you guys can give me a help

Unable to fetch parameters [/aws/service/eks/optimized-ami/1.33/amazon-linux-2023-arm64/recommended/image_id,/aws/service/eks/optimized-ami/1.33/amazon-linux-2023/recommended/image_id] from parameter store for this account

Checked my personal and company account, this parameter stopped being published since 1.18, making integ test like this impossible to run

aws-cdk/packages/@aws-cdk/aws-eks-v2-alpha/test/integ.eks-cluster.ts

Lines 248 to 250 in 1418204

	imageId: new eks.EksOptimizedImage({
	kubernetesVersion: eks.KubernetesVersion.V1_25.version,
	}).getImage(this).imageId,

Do we actually need to upgrade all integ test to 1.33 ?

[guessi]

@phuhung273 I thought it is because EksOptimizedImage() is pointed to AL2 only.

@aws-cdk/aws-eks-v2-alpha

aws-cdk/packages/@aws-cdk/aws-eks-v2-alpha/lib/cluster.ts

Lines 2009 to 2034 in a10b089

	/**
	* Construct an Amazon Linux 2 image from the latest EKS Optimized AMI published in SSM
	*/
	export class EksOptimizedImage implements ec2.IMachineImage {
	private readonly nodeType?: NodeType;
	private readonly cpuArch?: CpuArch;
	private readonly kubernetesVersion?: string;
	private readonly amiParameterName: string;
	/**
	* Constructs a new instance of the EcsOptimizedAmi class.
	*/
	public constructor(props: EksOptimizedImageProps = {}) {
	this.nodeType = props.nodeType ?? NodeType.STANDARD;
	this.cpuArch = props.cpuArch ?? CpuArch.X86_64;
	this.kubernetesVersion = props.kubernetesVersion ?? LATEST_KUBERNETES_VERSION;
	// set the SSM parameter name
	this.amiParameterName = `/aws/service/eks/optimized-ami/${this.kubernetesVersion}/`
	+ (this.nodeType === NodeType.STANDARD ? this.cpuArch === CpuArch.X86_64 ?
	'amazon-linux-2/' : 'amazon-linux-2-arm64/' : '')
	+ (this.nodeType === NodeType.GPU ? 'amazon-linux-2-gpu/' : '')
	+ (this.nodeType === NodeType.INFERENTIA ? 'amazon-linux-2-gpu/' : '')
	+ (this.nodeType === NodeType.TRAINIUM ? 'amazon-linux-2-gpu/' : '')
	+ 'recommended/image_id';
	}

aws-cdk-lib/aws-eks

aws-cdk/packages/aws-cdk-lib/aws-eks/lib/cluster.ts

Lines 2659 to 2684 in a10b089

	/**
	* Construct an Amazon Linux 2 image from the latest EKS Optimized AMI published in SSM
	*/
	export class EksOptimizedImage implements ec2.IMachineImage {
	private readonly nodeType?: NodeType;
	private readonly cpuArch?: CpuArch;
	private readonly kubernetesVersion?: string;
	private readonly amiParameterName: string;
	/**
	* Constructs a new instance of the EcsOptimizedAmi class.
	*/
	public constructor(props: EksOptimizedImageProps = {}) {
	this.nodeType = props.nodeType ?? NodeType.STANDARD;
	this.cpuArch = props.cpuArch ?? CpuArch.X86_64;
	this.kubernetesVersion = props.kubernetesVersion ?? LATEST_KUBERNETES_VERSION;
	// set the SSM parameter name
	this.amiParameterName = `/aws/service/eks/optimized-ami/${this.kubernetesVersion}/`
	+ (this.nodeType === NodeType.STANDARD ? this.cpuArch === CpuArch.X86_64 ?
	'amazon-linux-2/' : 'amazon-linux-2-arm64/' : '')
	+ (this.nodeType === NodeType.GPU ? 'amazon-linux-2-gpu/' : '')
	+ (this.nodeType === NodeType.INFERENTIA ? 'amazon-linux-2-gpu/' : '')
	+ (this.nodeType === NodeType.TRAINIUM ? 'amazon-linux-2-gpu/' : '')
	+ 'recommended/image_id';
	}

Might need some logic like how ECS do

aws-cdk/packages/aws-cdk-lib/aws-ecs/lib/amis.ts

Lines 119 to 156 in a10b089

	/**
	* Constructs a new instance of the EcsOptimizedAmi class.
	*/
	constructor(props?: EcsOptimizedAmiProps) {
	this.hwType = (props && props.hardwareType) || AmiHardwareType.STANDARD;
	if (props && props.generation) { // generation defined in the props object
	if (props.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX && this.hwType !== AmiHardwareType.STANDARD) {
	throw new UnscopedValidationError('Amazon Linux does not support special hardware type. Use Amazon Linux 2 instead');
	} else if (props.windowsVersion) {
	throw new UnscopedValidationError('"windowsVersion" and Linux image "generation" cannot be both set');
	} else {
	this.generation = props.generation;
	}
	} else if (props && props.windowsVersion) {
	if (this.hwType !== AmiHardwareType.STANDARD) {
	throw new UnscopedValidationError('Windows Server does not support special hardware type');
	} else {
	this.windowsVersion = props.windowsVersion;
	}
	} else { // generation not defined in props object
	// always default to Amazon Linux v2 regardless of HW
	this.generation = ec2.AmazonLinuxGeneration.AMAZON_LINUX_2;
	}
	// set the SSM parameter name
	this.amiParameterName = '/aws/service/'
	+ (this.windowsVersion ? 'ami-windows-latest/' : 'ecs/optimized-ami/')
	+ (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX ? 'amazon-linux/' : '')
	+ (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX_2 ? 'amazon-linux-2/' : '')
	+ (this.generation === ec2.AmazonLinuxGeneration.AMAZON_LINUX_2023 ? 'amazon-linux-2023/' : '')
	+ (this.windowsVersion ? `Windows_Server-${this.windowsVersion}-English-Full-ECS_Optimized/` : '')
	+ (this.hwType === AmiHardwareType.GPU ? 'gpu/' : '')
	+ (this.hwType === AmiHardwareType.ARM ? 'arm64/' : '')
	+ (this.hwType === AmiHardwareType.NEURON ? 'inf/' : '')
	+ (this.windowsVersion ? 'image_id' : 'recommended/image_id');
	this.cachedInContext = props?.cachedInContext ?? false;
	}

And the path for AL2023 should be as follow (defined HERE)

Latest:

• /aws/service/eks/optimized-ami/1.31/amazon-linux-2023/x86_64/standard/recommended/image_id

[phuhung273]

Thanks for taking a look @guessi. Turn out that the search bar on SSM console doesn't query all items in DB

But running awscli with correct name works. Thanks mate.