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

Jump to bottom

kms key made Optional #36

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

kms key made Optional #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dc30fb
Update eks-cluster.ts
hkv24 Aug 26, 2024
0059ab2
Update hello.test.ts
hkv24 Aug 26, 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
128 changes: 7 additions & 121 deletions src/constructs/eks-cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export interface ArgoCD {
export interface EKSClusterProps {
readonly availabilityZones: string[];
readonly clusterVPC?: ec2.IVpc;
readonly kmsKey: kms.Key;
readonly kmsKey?: kms.Key; // Made optional
readonly workerSecurityGroup: ec2.SecurityGroup;
readonly clusterConfig: ClusterConfig;
readonly addonProps?: AddonProps;
Expand Down Expand Up @@ -130,7 +130,7 @@ export class EKSCluster extends Construct {
...props,
};
const commonCompoents: Map<string, ICommonComponentsProps> = this.basicCommonComponents(
props.kmsKey.keyArn,
props.kmsKey?.keyArn,
props.clusterConfig.clusterName,
props.clusterConfig.defaultCommonComponents,
);
Expand Down Expand Up @@ -166,7 +166,7 @@ export class EKSCluster extends Construct {
defaultCapacity: props.clusterConfig.defaultCapacity,
vpc: props.clusterVPC,
securityGroup: props.workerSecurityGroup,
secretsEncryptionKey: props.kmsKey,
secretsEncryptionKey: props.kmsKey ? props.kmsKey : undefined, // Use KMS key if provided
kubectlLayer: props.clusterConfig.kubectlLayer,
endpointAccess:
subnets.get('publicSubnetGroupName') != undefined
Expand All @@ -178,17 +178,14 @@ export class EKSCluster extends Construct {
subnets.get('publicSubnetGroupName') != undefined
? [
{
// subnetType: SubnetType.PRIVATE,
subnetGroupName: subnets.get('privateSubnetGroupName'),
},
{
// subnetType: SubnetType.PUBLIC,
subnetGroupName: subnets.get('publicSubnetGroupName'),
},
]
: [
{
// subnetType: SubnetType.PRIVATE,
subnetGroupName: subnets.get('privateSubnetGroupName'),
},
],
Expand Down Expand Up @@ -513,7 +510,8 @@ export class EKSCluster extends Construct {

}

private basicCommonComponents(kmsKeyArn: string, clusterName: string, props?: DefaultCommonComponents): Map<string, ICommonComponentsProps> {
private basicCommonComponents(kmsKeyArn: string | undefined, clusterName: string,
props?: DefaultCommonComponents): Map<string, ICommonComponentsProps> {
let helmChartMap: Map<string, ICommonComponentsProps> = ObjToStrMap({
'aws-ebs-csi-driver': {
iamPolicyPath: [`${__dirname}/../../assets/policy/aws-ebs-csi-driver-policy.json`],
Expand Down Expand Up @@ -549,7 +547,7 @@ export class EKSCluster extends Construct {
parameters: {
type: 'gp3',
encrypted: 'true',
kmsKeyId: kmsKeyArn,
...(kmsKeyArn ? { kmsKeyId: kmsKeyArn } : {}), // Conditionally add kmsKeyId if present
},
},
{
Expand All @@ -567,125 +565,13 @@ export class EKSCluster extends Construct {
parameters: {
type: 'gp2',
encrypted: 'true',
kmsKeyId: kmsKeyArn,
...(kmsKeyArn ? { kmsKeyId: kmsKeyArn } : {}), // Conditionally add kmsKeyId if present
},
},
],
},
},
},
'aws-efs-csi-driver': {
iamPolicyPath: [`${__dirname}/../../assets/policy/aws-efs-csi-driver-policy.json`],
serviceAccounts: ['efs-csi-controller-sa', 'efs-csi-node-sa'],
helm: {
chartName: 'aws-efs-csi-driver',
chartVersion: '2.3.6',
helmRepository: 'https://kubernetes-sigs.github.io/aws-efs-csi-driver/',
namespace: props?.awsEfsCsiDriver?.namespace ?? 'kube-system',
helmValues: {
controller: {
serviceAccount: {
create: false,
name: 'efs-csi-controller-sa',
},
},
node: {
serviceAccount: {
create: false,
name: 'efs-csi-node-sa',
},
},
},
},
},
'node-problem-detector': {
helm: {
chartName: 'node-problem-detector',
chartVersion: '2.3.12',
localHelmChart: `${__dirname}/../../assets/helmCharts/node-problem-detector`,
namespace: 'kube-system',
helmValues: {
serviceAccount: {
create: true,
},
},
},
},
'private-external-dns': {
iamPolicyPath: [`${__dirname}/../../assets/policy/aws-external-dns-policy.json`],
serviceAccounts: ['private-external-dns'],
helm: {
chartName: 'external-dns',
chartReleaseName: 'private-external-dns',
chartVersion: '1.14.3',
helmRepository: 'https://kubernetes-sigs.github.io/external-dns/',
namespace: props?.externalDns?.namespace ?? 'internal-system',
helmValues: {
interval: '5m',
triggerLoopOnEvent: true,
extraArgs: [
'--aws-zone-type=private',
'--annotation-filter=external-dns.alpha.kubernetes.io/dns-type in (private)',
`--txt-owner-id=${clusterName}`,
'--aws-zones-cache-duration=1h',
'--aws-batch-change-size=4000',
'--aws-batch-change-interval=10s',
],
serviceAccount: {
create: false,
name: 'private-external-dns',
},
},
},
},
'public-external-dns': {
iamPolicyPath: [`${__dirname}/../../assets/policy/aws-external-dns-policy.json`],
serviceAccounts: ['public-external-dns'],
helm: {
chartName: 'external-dns',
chartReleaseName: 'public-external-dns',
chartVersion: '1.14.3',
helmRepository: 'https://kubernetes-sigs.github.io/external-dns/',
namespace: props?.externalDns?.namespace ?? 'internal-system',
helmValues: {
interval: '5m',
triggerLoopOnEvent: true,
extraArgs: [
'--annotation-filter=external-dns.alpha.kubernetes.io/dns-type in (public)',
`--txt-owner-id=${clusterName}`,
'--aws-zones-cache-duration=1h',
'--aws-batch-change-size=4000',
'--aws-batch-change-interval=10s',
],
serviceAccount: {
create: false,
name: 'public-external-dns',
},
},
},
},
'cluster-autoscaler': {
iamPolicyPath: [`${__dirname}/../../assets/policy/aws-cluster-autoscaler-policy.json`],
serviceAccounts: ['cluster-autoscaler'],
helm: {
chartName: 'cluster-autoscaler',
chartVersion: '9.21.1',
helmRepository: 'https://kubernetes.github.io/autoscaler',
namespace: props?.clusterAutoscaler?.namespace ?? 'internal-system',
helmValues: {
awsRegion: 'ap-south-1',
autoDiscovery: {
clusterName: clusterName,
},
rbac: {
serviceAccount: {
create: false,
name: 'cluster-autoscaler',
},
},
},
},
},
});
return helmChartMap;
}
Expand Down
Loading
Loading