Merge pull request #204 from keenangraham/working

fix: failing build

.projenrc.js

@@ -17,6 +17,10 @@ const project = new awscdk.AwsCdkConstructLibrary({
     '@aws-cdk/lambda-layer-kubectl-v25',
     '@aws-cdk/lambda-layer-kubectl-v26',
     '@aws-cdk/lambda-layer-kubectl-v27',
+    '@aws-cdk/lambda-layer-kubectl-v28',
+    '@aws-cdk/lambda-layer-kubectl-v29',
+    '@aws-cdk/lambda-layer-kubectl-v30',
+    '@aws-cdk/lambda-layer-kubectl-v31',
   ],
   bundledDeps: [
     'semver',
@@ -59,4 +63,4 @@ project.addTask('test:synth', {
   exec: 'npx cdk synth -a "npx ts-node -P tsconfig.dev.json --prefer-ts-exts test/integ.karpenter.ts"',
 });
 
-project.synth();
+project.synth();

src/index.ts

@@ -126,7 +126,7 @@ export class Karpenter extends Construct {
       name: this.serviceAccountName,
       namespace: this.namespace,
     });
-    
+
 
     // Setup the controller IAM Policy statements
     this.addControllerPolicyIAMPolicyStatements();
@@ -191,7 +191,7 @@ export class Karpenter extends Construct {
       // will override the dynamic values.
       values: { ...this.helmExtraValues, ...this.helmChartValues },
     });
-    
+
 
     // If we are not installing it in the `kube-system` namespace:
     // Note: We should be installing it in kube-system, please see: https://github.com/aws/karpenter-provider-aws/blob/fd2b60759f81dc0c868810cc44443103067c4880/website/content/en/v0.36/upgrading/upgrade-guide.md?plain=1#L91
@@ -204,7 +204,7 @@ export class Karpenter extends Construct {
           name: this.namespace,
         },
       });
-      // If we are creating a namespace, we need to link it to the service account and the chart, so they are deployed in the correct order. 
+      // If we are creating a namespace, we need to link it to the service account and the chart, so they are deployed in the correct order.
       this.serviceAccount.node.addDependency(namespace);
       this.chart.node.addDependency(namespace);
     }
@@ -230,7 +230,7 @@ export class Karpenter extends Construct {
     ]);
 
     return this.addManifest(id, {
-      apiVersion: 'karpenter.k8s.aws/v1beta1',
+      apiVersion: 'karpenter.k8s.aws/v1',
       kind: 'EC2NodeClass',
       metadata: {
         name: id,
@@ -258,7 +258,7 @@ export class Karpenter extends Construct {
     Utils.hasRequiredKeys(nodePoolSpec.template.spec, ['nodeClassRef', 'requirements']);
 
     return this.addManifest(id, {
-      apiVersion: 'karpenter.sh/v1beta1',
+      apiVersion: 'karpenter.sh/v1',
       kind: 'NodePool',
       metadata: {
         name: id,
@@ -698,4 +698,4 @@ export class Karpenter extends Construct {
       actions: ['eks:DescribeCluster'],
     }));
   }
-}
+}

test/versions.test.ts

@@ -114,7 +114,7 @@ describe('Karpenter Versions', () => {
     ).toThrowError();
   });
 
-  it('should allow for creation of v1beta1 APIs', () => {
+  it('should allow for creation of v1 APIs', () => {
     const app = new cdk.App();
     const stack = new cdk.Stack(app, 'test-stack');
 
@@ -139,7 +139,7 @@ describe('Karpenter Versions', () => {
       template: {
         spec: {
           nodeClassRef: {
-            apiVersion: 'karpenter.k8s.aws/v1beta1',
+            apiVersion: 'karpenter.k8s.aws/v1',
             kind: 'EC2NodeClass',
             name: nodeClass.name,
           },
@@ -162,15 +162,15 @@ describe('Karpenter Versions', () => {
         'Fn::Join': [
           '',
           Match.arrayWith([
-            Match.stringLikeRegexp('\"apiVersion\":\"karpenter.k8s.aws\/v1beta1\",\"kind\":\"EC2NodeClass\",\"metadata\":{\"name\":\"ec2nodeclass\",\"namespace\":\"karpenter\"'),
+            Match.stringLikeRegexp('\"apiVersion\":\"karpenter.k8s.aws\/v1\",\"kind\":\"EC2NodeClass\",\"metadata\":{\"name\":\"ec2nodeclass\",\"namespace\":\"karpenter\"'),
           ]),
         ],
       }),
     }));
 
     // NodePool manifest
     t.hasResourceProperties('Custom::AWSCDK-EKS-KubernetesResource', Match.objectLike({
-      Manifest: Match.stringLikeRegexp('\"apiVersion\":\"karpenter.sh\/v1beta1\",\"kind\":\"NodePool\",\"metadata\":{\"name\":\"nodepool\",\"namespace\":\"karpenter\"'),
+      Manifest: Match.stringLikeRegexp('\"apiVersion\":\"karpenter.sh\/v1\",\"kind\":\"NodePool\",\"metadata\":{\"name\":\"nodepool\",\"namespace\":\"karpenter\"'),
     }));
   });
 
@@ -202,4 +202,4 @@ describe('Karpenter Versions', () => {
       }),
     );
   });
-});
+});