The amazon-vpc-cni is not created by default so we need to override t…

…he value for windows
aws-samples · Apr 2, 2024 · 25e709f · 25e709f
1 parent b210cca
commit 25e709f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/lib/windows-construct/index.ts b/lib/windows-construct/index.ts
@@ -24,7 +24,7 @@ export default class WindowsConstruct {
             kubernetesVersion: eks.KubernetesVersion.of("1.27"),
             instanceClass: ec2.InstanceClass.T3,
             instanceSize: ec2.InstanceSize.MEDIUM,
-            desiredNodeCount: 1,
+            desiredNodeSize: 1,
             minNodeSize: 1,
             maxNodeSize: 3,
             blockDeviceSize: 50,
@@ -33,17 +33,13 @@ export default class WindowsConstruct {
                 "Name": "blueprints-windows-eks-cluster",
                 "Type": "generic-windows-cluster"
             },
-            genericNodeGroupOptions: {
-                nodegroupName: "Mng-linux",
-                tags: {
-                    "kubernetes.io/cluster/windows-eks-blueprint": "owned"
-                },
+            genericNodeGroupTags: {
+                "Name": "Mng-linux",
+                "kubernetes.io/cluster/windows-eks-blueprint": "owned"
             },
-            windowsNodeGroupOptions: {
-                nodegroupName: "Mng-windows",
-                tags: {
-                    "kubernetes.io/cluster/windows-eks-blueprint": "owned"
-                }
+            windowsNodeGroupTags: {
+                "Name" : "Mng-windows",
+                "kubernetes.io/cluster/windows-eks-blueprint": "owned"
             }
         };
 

diff --git a/lib/windows-construct/vpc-cni/index.ts b/lib/windows-construct/vpc-cni/index.ts
@@ -1,22 +1,24 @@
 import * as blueprints from '@aws-quickstart/eks-blueprints';
+import { KubernetesManifest } from 'aws-cdk-lib/aws-eks';
 import { Construct } from 'constructs';
 
 export class WindowsVpcCni implements blueprints.ClusterAddOn {
     id: "amazon-vpc-cni";
 
     deploy(clusterInfo: blueprints.ClusterInfo): void | Promise<Construct> {
         const cluster = clusterInfo.cluster;
-        const configmap = cluster.addManifest("amazon-vpc-cni", {
-            apiVersion: "v1",
-            kind: "ConfigMap",
-            metadata: {
-                name: "amazon-vpc-cni",
-                namespace: "kube-system",
-            },
-            data:{
-                "enable-windows-ipam": "true"
-            },
-        });
+        const configmap = new KubernetesManifest(cluster, 'amazon-vpc-cni', { cluster: cluster,
+            manifest : [{
+                apiVersion: "v1",
+                kind: "ConfigMap",
+                metadata: {
+                    name: "amazon-vpc-cni",
+                    namespace: "kube-system",
+                },
+                data:{
+                    "enable-windows-ipam": "true"
+                },
+            }], overwrite: true });
 
         return Promise.resolve(configmap);
     }