From 9bf0fa628c0c6ed2443798711d1298f9cf987c62 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Thu, 17 Oct 2024 19:12:30 +0200 Subject: [PATCH 1/3] Test updating examples to pulumi-eks v3.0.0-beta.2 --- aws-java-eks-minimal/pom.xml | 2 +- .../src/main/java/com/pulumi/example/eksminimal/App.java | 3 ++- aws-ts-eks-hello-world/index.ts | 2 +- aws-ts-eks-hello-world/package.json | 2 +- aws-ts-eks-migrate-nodegroups/index.ts | 1 - aws-ts-eks-migrate-nodegroups/package.json | 2 +- aws-ts-eks-migrate-nodegroups/utils.ts | 4 ++-- aws-ts-eks/index.ts | 2 +- aws-ts-eks/package.json | 2 +- aws-yaml-eks/Pulumi.yaml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aws-java-eks-minimal/pom.xml b/aws-java-eks-minimal/pom.xml index f546d2cfd..be205d259 100644 --- a/aws-java-eks-minimal/pom.xml +++ b/aws-java-eks-minimal/pom.xml @@ -36,7 +36,7 @@ com.pulumi eks - [2.0,3.0) + 3.0.0-beta.2 diff --git a/aws-java-eks-minimal/src/main/java/com/pulumi/example/eksminimal/App.java b/aws-java-eks-minimal/src/main/java/com/pulumi/example/eksminimal/App.java index 97af9557a..7b048152d 100644 --- a/aws-java-eks-minimal/src/main/java/com/pulumi/example/eksminimal/App.java +++ b/aws-java-eks-minimal/src/main/java/com/pulumi/example/eksminimal/App.java @@ -12,6 +12,7 @@ import com.pulumi.aws.ec2.outputs.GetVpcResult; import com.pulumi.eks.Cluster; import com.pulumi.eks.ClusterArgs; +import com.pulumi.eks.enums.AuthenticationMode; public class App { public static void main(String[] args) { @@ -40,8 +41,8 @@ private static void stack(Context ctx) { var cluster = new Cluster("my-cluster", ClusterArgs.builder() .vpcId(vpcIdOutput) + .authenticationMode(AuthenticationMode.ApiAndConfigMap) .subnetIds(subnetIdsOutput) - .instanceType("t2.micro") .minSize(1) .maxSize(2) .build()); diff --git a/aws-ts-eks-hello-world/index.ts b/aws-ts-eks-hello-world/index.ts index 5c4d054a4..0edd20a79 100644 --- a/aws-ts-eks-hello-world/index.ts +++ b/aws-ts-eks-hello-world/index.ts @@ -13,11 +13,11 @@ const vpc = new awsx.ec2.Vpc("vpc", { numberOfAvailabilityZones: 2 }); const cluster = new eks.Cluster(name, { vpcId: vpc.vpcId, subnetIds: vpc.publicSubnetIds, + authenticationMode: eks.AuthenticationMode.Api, desiredCapacity: 2, minSize: 1, maxSize: 2, storageClasses: "gp2", - deployDashboard: false, }); // Export the clusters' kubeconfig. diff --git a/aws-ts-eks-hello-world/package.json b/aws-ts-eks-hello-world/package.json index 0bbd34bf8..08189c511 100644 --- a/aws-ts-eks-hello-world/package.json +++ b/aws-ts-eks-hello-world/package.json @@ -3,7 +3,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "^2.0.0", + "@pulumi/eks": "^v3.0.0-beta.2", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", "@types/node": "^18.0.0" diff --git a/aws-ts-eks-migrate-nodegroups/index.ts b/aws-ts-eks-migrate-nodegroups/index.ts index 8fffd06a0..5a1f73067 100644 --- a/aws-ts-eks-migrate-nodegroups/index.ts +++ b/aws-ts-eks-migrate-nodegroups/index.ts @@ -35,7 +35,6 @@ const myCluster = new eks.Cluster(`${projectName}`, { subnetIds: allVpcSubnets, nodeAssociatePublicIpAddress: false, skipDefaultNodeGroup: true, - deployDashboard: false, instanceRoles: roles, enabledClusterLogTypes: ["api", "audit", "authenticator", "controllerManager", "scheduler"], diff --git a/aws-ts-eks-migrate-nodegroups/package.json b/aws-ts-eks-migrate-nodegroups/package.json index d7abf1eee..41cf3c948 100644 --- a/aws-ts-eks-migrate-nodegroups/package.json +++ b/aws-ts-eks-migrate-nodegroups/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "^2.0.0", + "@pulumi/eks": "^v3.0.0-beta.2", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-eks-migrate-nodegroups/utils.ts b/aws-ts-eks-migrate-nodegroups/utils.ts index 70d963183..0254b184e 100644 --- a/aws-ts-eks-migrate-nodegroups/utils.ts +++ b/aws-ts-eks-migrate-nodegroups/utils.ts @@ -19,8 +19,8 @@ export function createNodeGroup( ): eks.NodeGroup { return new eks.NodeGroup(name, { cluster: args.cluster, - nodeSecurityGroup: args.cluster.nodeSecurityGroup, - clusterIngressRule: args.cluster.eksClusterIngressRule, + nodeSecurityGroupId: args.cluster.nodeSecurityGroupId, + clusterIngressRuleId: args.cluster.clusterIngressRuleId, instanceType: args.instanceType, amiId: args.ami, nodeAssociatePublicIpAddress: false, diff --git a/aws-ts-eks/index.ts b/aws-ts-eks/index.ts index cc3ba0a75..51299c809 100644 --- a/aws-ts-eks/index.ts +++ b/aws-ts-eks/index.ts @@ -9,8 +9,8 @@ const vpc = new awsx.ec2.Vpc("vpc", { numberOfAvailabilityZones: 2 }); // Create the EKS cluster itself and a deployment of the Kubernetes dashboard. const cluster = new eks.Cluster("cluster", { vpcId: vpc.vpcId, + authenticationMode: eks.AuthenticationMode.Api, subnetIds: vpc.publicSubnetIds, - instanceType: "t2.medium", desiredCapacity: 2, minSize: 1, maxSize: 2, diff --git a/aws-ts-eks/package.json b/aws-ts-eks/package.json index dfb179402..819941c78 100644 --- a/aws-ts-eks/package.json +++ b/aws-ts-eks/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "^2.0.0", + "@pulumi/eks": "3.0.0-beta.2", "@pulumi/pulumi": "^3.32.1" } } diff --git a/aws-yaml-eks/Pulumi.yaml b/aws-yaml-eks/Pulumi.yaml index b61fa1c5f..98f831332 100644 --- a/aws-yaml-eks/Pulumi.yaml +++ b/aws-yaml-eks/Pulumi.yaml @@ -21,9 +21,9 @@ resources: cluster: type: eks:Cluster properties: + authenticationMode: API_AND_CONFIG_MAP vpcId: ${vpcId} subnetIds: ${subnetIds} - instanceType: "t2.medium" desiredCapacity: 2 minSize: 1 maxSize: 2 From b42b47ecc40700b6b7ceb19ea976489636d2e06b Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Fri, 25 Oct 2024 10:17:25 -0700 Subject: [PATCH 2/3] Update to release version --- aws-java-eks-minimal/pom.xml | 2 +- aws-ts-eks-hello-world/package.json | 2 +- aws-ts-eks-migrate-nodegroups/package.json | 2 +- aws-ts-eks/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aws-java-eks-minimal/pom.xml b/aws-java-eks-minimal/pom.xml index be205d259..4f9a0f4e1 100644 --- a/aws-java-eks-minimal/pom.xml +++ b/aws-java-eks-minimal/pom.xml @@ -36,7 +36,7 @@ com.pulumi eks - 3.0.0-beta.2 + (3.0,4.0] diff --git a/aws-ts-eks-hello-world/package.json b/aws-ts-eks-hello-world/package.json index 08189c511..8c3cc7f78 100644 --- a/aws-ts-eks-hello-world/package.json +++ b/aws-ts-eks-hello-world/package.json @@ -3,7 +3,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "^v3.0.0-beta.2", + "@pulumi/eks": "^3.0.0", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0", "@types/node": "^18.0.0" diff --git a/aws-ts-eks-migrate-nodegroups/package.json b/aws-ts-eks-migrate-nodegroups/package.json index 41cf3c948..68a511530 100644 --- a/aws-ts-eks-migrate-nodegroups/package.json +++ b/aws-ts-eks-migrate-nodegroups/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "^v3.0.0-beta.2", + "@pulumi/eks": "^3.0.0", "@pulumi/kubernetes": "^4.0.0", "@pulumi/pulumi": "^3.0.0" } diff --git a/aws-ts-eks/package.json b/aws-ts-eks/package.json index 819941c78..bb00def2a 100644 --- a/aws-ts-eks/package.json +++ b/aws-ts-eks/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/aws": "^6.0.0", "@pulumi/awsx": "^2.0.2", - "@pulumi/eks": "3.0.0-beta.2", + "@pulumi/eks": "^3.0.0", "@pulumi/pulumi": "^3.32.1" } } From 108af21d7d1f882fe58603b7ad2b0d760f29ad21 Mon Sep 17 00:00:00 2001 From: Florian Stadler Date: Fri, 25 Oct 2024 10:29:55 -0700 Subject: [PATCH 3/3] Correct maven version range --- aws-java-eks-minimal/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-java-eks-minimal/pom.xml b/aws-java-eks-minimal/pom.xml index 4f9a0f4e1..27eb9557e 100644 --- a/aws-java-eks-minimal/pom.xml +++ b/aws-java-eks-minimal/pom.xml @@ -36,7 +36,7 @@ com.pulumi eks - (3.0,4.0] + [3.0,4.0)