Skip to content
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

fix(eks): in place updates for EKS security group and Subnets #30114

Merged
merged 7 commits into from
May 10, 2024
Merged

fix(eks): in place updates for EKS security group and Subnets #30114

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2726eb
in place SG and VPC udpates
mrlikl May 8, 2024
2bf6a75
Merge branch 'main' into eks-vpc
mrlikl May 8, 2024
f521015
integ test
mrlikl May 8, 2024
2e0f57b
Merge branch 'eks-vpc' of https://github.com/mrlikl/aws-cdk into eks-vpc
mrlikl May 8, 2024
e8caa80
update unit tests
mrlikl May 8, 2024
44733be
fix unit test
mrlikl May 8, 2024
2ee56ab
Merge branch 'main' into eks-vpc
mergify[bot] May 10, 2024
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
22 changes: 13 additions & 9 deletions packages/@aws-cdk/custom-resource-handlers/lib/aws-eks/cluster-resource-handler/cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export class ClusterResourceHandler extends ResourceHandler {
// if there is an update that requires replacement, go ahead and just create
// a new cluster with the new config. The old cluster will automatically be
// deleted by cloudformation upon success.
if (updates.replaceName || updates.replaceRole || updates.replaceVpc) {
if (updates.replaceName || updates.replaceRole ) {

// if we are replacing this cluster and the cluster has an explicit
// physical name, the creation of the new cluster will fail with "there is
Expand All @@ -138,27 +138,31 @@ export class ClusterResourceHandler extends ResourceHandler {
return this.updateClusterVersion(this.newProps.version);
}

if (updates.updateLogging && updates.updateAccess) {
throw new Error('Cannot update logging and access at the same time');
if ((updates.updateLogging && updates.updateAccess) || (updates.updateLogging && updates.updateVpc) ||
(updates.updateVpc && updates.updateAccess)) {
throw new Error('Only one type of update - VpcConfigUpdate, LoggingUpdate or EndpointAccessUpdate can be allowed');
}

if (updates.updateLogging || updates.updateAccess) {
if (updates.updateLogging || updates.updateAccess || updates.updateVpc) {
const config: EKS.UpdateClusterConfigCommandInput = {
name: this.clusterName,
};
if (updates.updateLogging) {
config.logging = this.newProps.logging;
};
if (updates.updateAccess) {
// Updating the cluster with securityGroupIds and subnetIds (as specified in the warning here:
// https://awscli.amazonaws.com/v2/documentation/api/latest/reference/eks/update-cluster-config.html)
// will fail, therefore we take only the access fields explicitly
config.resourcesVpcConfig = {
endpointPrivateAccess: this.newProps.resourcesVpcConfig?.endpointPrivateAccess,
endpointPublicAccess: this.newProps.resourcesVpcConfig?.endpointPublicAccess,
publicAccessCidrs: this.newProps.resourcesVpcConfig?.publicAccessCidrs,
};
}
if (updates.updateVpc) {
config.resourcesVpcConfig = {
subnetIds: this.newProps.resourcesVpcConfig?.subnetIds,
securityGroupIds: this.newProps.resourcesVpcConfig?.securityGroupIds,
};
}
const updateResponse = await this.eks.updateClusterConfig(config);

return { EksUpdateId: updateResponse.update?.id };
Expand Down Expand Up @@ -304,13 +308,13 @@ function parseProps(props: any): EKS.CreateClusterCommandInput {

interface UpdateMap {
replaceName: boolean; // name
replaceVpc: boolean; // resourcesVpcConfig.subnetIds and securityGroupIds
replaceRole: boolean; // roleArn

updateVersion: boolean; // version
updateLogging: boolean; // logging
updateEncryption: boolean; // encryption (cannot be updated)
updateAccess: boolean; // resourcesVpcConfig.endpointPrivateAccess and endpointPublicAccess
updateVpc: boolean; // resourcesVpcConfig.subnetIds and securityGroupIds
}

function analyzeUpdate(oldProps: Partial<EKS.CreateClusterCommandInput>, newProps: EKS.CreateClusterCommandInput): UpdateMap {
Expand All @@ -327,7 +331,7 @@ function analyzeUpdate(oldProps: Partial<EKS.CreateClusterCommandInput>, newProp

return {
replaceName: newProps.name !== oldProps.name,
replaceVpc:
updateVpc:
JSON.stringify(newVpcProps.subnetIds?.sort()) !== JSON.stringify(oldVpcProps.subnetIds?.sort()) ||
JSON.stringify(newVpcProps.securityGroupIds?.sort()) !== JSON.stringify(oldVpcProps.securityGroupIds?.sort()),
updateAccess:
Expand Down
Loading