diff --git a/examples/aws-profile-role/package.json b/examples/aws-profile-role/package.json index 56d4568b2..2840b8d2d 100644 --- a/examples/aws-profile-role/package.json +++ b/examples/aws-profile-role/package.json @@ -5,7 +5,7 @@ "@types/node": "^22" }, "dependencies": { - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/awsx": "^3.0.0", "@pulumi/kubernetes": "4.19.0", "@pulumi/eks": "latest" diff --git a/examples/cluster/package.json b/examples/cluster/package.json index d84425a75..c94e14156 100644 --- a/examples/cluster/package.json +++ b/examples/cluster/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/pulumi": "3.261.0", "@pulumi/awsx": "^3.0.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" }, "scripts": { diff --git a/examples/deletion-policy/package.json b/examples/deletion-policy/package.json index 661a9cb1f..c0e251d6c 100644 --- a/examples/deletion-policy/package.json +++ b/examples/deletion-policy/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/pulumi": "3.261.0", "@pulumi/awsx": "3.5.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" }, "scripts": { diff --git a/examples/encryption-provider/package.json b/examples/encryption-provider/package.json index 334ec2e93..50f16e6db 100644 --- a/examples/encryption-provider/package.json +++ b/examples/encryption-provider/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/pulumi": "3.261.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/kubernetesx": "0.1.6", "@pulumi/random": "4.16.8", "@pulumi/eks": "latest" diff --git a/examples/ensure-cni-upgrade/package.json b/examples/ensure-cni-upgrade/package.json index 8f9e3be65..57605cb39 100644 --- a/examples/ensure-cni-upgrade/package.json +++ b/examples/ensure-cni-upgrade/package.json @@ -7,7 +7,7 @@ "dependencies": { "@pulumi/pulumi": "3.261.0", "@pulumi/awsx": "^3.0.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" } } diff --git a/examples/extra-sg/package.json b/examples/extra-sg/package.json index 20c17ad01..026c03fcf 100644 --- a/examples/extra-sg/package.json +++ b/examples/extra-sg/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/pulumi": "3.261.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" } } diff --git a/examples/modify-default-eks-sg/package.json b/examples/modify-default-eks-sg/package.json index 980bcccb0..11b32ec12 100644 --- a/examples/modify-default-eks-sg/package.json +++ b/examples/modify-default-eks-sg/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/pulumi": "3.261.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" } } diff --git a/examples/network-policies/package.json b/examples/network-policies/package.json index 7510ae2d2..0ebfe78ba 100644 --- a/examples/network-policies/package.json +++ b/examples/network-policies/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/awsx": "^3.0.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest", "@pulumi/pulumi": "3.261.0" } diff --git a/examples/nodegroup/package.json b/examples/nodegroup/package.json index 5ad8a2828..488e0e8eb 100644 --- a/examples/nodegroup/package.json +++ b/examples/nodegroup/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/pulumi": "3.261.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" } } diff --git a/examples/oidc-iam-sa/package.json b/examples/oidc-iam-sa/package.json index 51ab8c3e6..194b7d8c7 100644 --- a/examples/oidc-iam-sa/package.json +++ b/examples/oidc-iam-sa/package.json @@ -5,7 +5,7 @@ "@types/node": "^22" }, "dependencies": { - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest", "@pulumi/kubernetes": "4.19.0", "@pulumi/pulumi": "3.261.0" diff --git a/examples/pod-security-groups/package.json b/examples/pod-security-groups/package.json index 281b4e07c..c177f909f 100644 --- a/examples/pod-security-groups/package.json +++ b/examples/pod-security-groups/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/awsx": "^3.0.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest", "@pulumi/pulumi": "3.261.0" } diff --git a/examples/scoped-kubeconfigs/package.json b/examples/scoped-kubeconfigs/package.json index 2b4048df6..f34262758 100644 --- a/examples/scoped-kubeconfigs/package.json +++ b/examples/scoped-kubeconfigs/package.json @@ -5,7 +5,7 @@ "@types/node": "^22" }, "dependencies": { - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest", "@pulumi/kubernetes": "4.19.0", "@pulumi/pulumi": "3.261.0" diff --git a/examples/tags/package.json b/examples/tags/package.json index 03aac41c5..63c4bc9e3 100644 --- a/examples/tags/package.json +++ b/examples/tags/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@pulumi/pulumi": "3.261.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/eks": "latest" } } diff --git a/nodejs/eks/nodes/instances.ts b/nodejs/eks/nodes/instances.ts index 8b2eb7e54..66930e3fa 100644 --- a/nodejs/eks/nodes/instances.ts +++ b/nodejs/eks/nodes/instances.ts @@ -19,7 +19,7 @@ export const DEFAULT_INSTANCE_TYPE = "t3.medium"; export interface GetEfaNetworkInterfacesArgs { // The instance types configured for the node group. - instanceTypes: pulumi.Input[]> | undefined; + instanceTypes: pulumi.Input[] | undefined> | undefined; // The security group IDs to associate with the network interfaces. securityGroupIds: pulumi.Input[]>; // The property path to use for the instance type in error messages. @@ -118,7 +118,7 @@ export function getEfaNetworkInterfaces( export function filterEfaSubnets( subnetIds: pulumi.Input[]>, placementGroupAvailabilityZone: pulumi.Input, - instanceTypes: pulumi.Input[]> | undefined, + instanceTypes: pulumi.Input[] | undefined> | undefined, opts: pulumi.InvokeOptions, ): pulumi.Output { const instanceType = getEfaInstanceType(instanceTypes); @@ -199,11 +199,11 @@ function getSupportedAZs( * @returns The first instance type from the list, or "t3.medium" if no instance types are provided */ function getEfaInstanceType( - instanceTypes: pulumi.Input[]> | undefined, + instanceTypes: pulumi.Input[] | undefined> | undefined, ): pulumi.Output { return instanceTypes ? pulumi.output(instanceTypes).apply((types) => { - return types.length > 0 ? types[0] : DEFAULT_INSTANCE_TYPE; + return types && types.length > 0 ? types[0] : DEFAULT_INSTANCE_TYPE; }) : pulumi.output(DEFAULT_INSTANCE_TYPE); } diff --git a/nodejs/eks/nodes/nodegroup.ts b/nodejs/eks/nodes/nodegroup.ts index d80d3a56f..55074336e 100644 --- a/nodejs/eks/nodes/nodegroup.ts +++ b/nodejs/eks/nodes/nodegroup.ts @@ -2159,7 +2159,7 @@ function createMNGCustomLaunchTemplate( const taints = args.taints ? pulumi.output(args.taints).apply((taints) => { - return taints + return (taints ?? []) .map((taint) => { return { [taint.key]: { @@ -2354,7 +2354,7 @@ function getRecommendedAMI( k8sVersion: pulumi.Output, parent: pulumi.Resource | undefined, ): pulumi.Input { - let instanceTypes: pulumi.Input[]> | undefined; + let instanceTypes: pulumi.Input[] | undefined> | undefined; let instanceTypesPropertyPath: string = ""; if ("instanceType" in args && args.instanceType) { instanceTypes = [args.instanceType]; @@ -2372,7 +2372,7 @@ function getRecommendedAMI( const amiType = args.amiType ? pulumi.output(args.amiType).apply((amiType) => { - const resolvedType = toAmiType(amiType); + const resolvedType = amiType === undefined ? undefined : toAmiType(amiType); if (resolvedType === undefined) { throw new pulumi.InputPropertyError({ propertyPath: "amiType", @@ -2384,7 +2384,9 @@ function getRecommendedAMI( : determineAmiType(os, args.gpu, instanceTypes, instanceTypesPropertyPath, parent); // if specified use the version from the args, otherwise use the version from the cluster. - const version = args.version ? args.version : k8sVersion; + const version = pulumi + .all([args.version, k8sVersion]) + .apply(([version, clusterVersion]) => version ?? clusterVersion); return pulumi.all([amiType, version]).apply(([amiType, version]) => { const parameterName = getAmiMetadata(amiType).ssmParameterName(version); @@ -2433,7 +2435,7 @@ export function isGravitonInstance(instanceType: string, propertyPath: string): function determineAmiType( os: pulumi.Input, gpu: pulumi.Input | undefined, - instanceTypes: pulumi.Input[]> | undefined, + instanceTypes: pulumi.Input[] | undefined> | undefined, instanceTypesPropertyPath: string, parent: pulumi.Resource | undefined, ): pulumi.Output { diff --git a/nodejs/eks/package.json b/nodejs/eks/package.json index 804101ea0..68b88c945 100644 --- a/nodejs/eks/package.json +++ b/nodejs/eks/package.json @@ -26,7 +26,7 @@ "bugs": "https://github.com/pulumi/pulumi-eks/issues", "dependencies": { "@iarna/toml": "^3.0.0", - "@pulumi/aws": "7.25.0", + "@pulumi/aws": "7.43.0", "@pulumi/kubernetes": "4.19.0", "@pulumi/pulumi": "3.261.0", "https-proxy-agent": "^7.0.6", diff --git a/nodejs/eks/yarn.lock b/nodejs/eks/yarn.lock index c42f20823..8cfc8452e 100644 --- a/nodejs/eks/yarn.lock +++ b/nodejs/eks/yarn.lock @@ -2424,10 +2424,10 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.2.tgz#78d476333d85d5b1c792e257bca74ba080da49a4" integrity sha512-b1UQwcEZ4yCnMCD8DAL1VlbvBJE9/IX4FTIp7BG1xYpf29SLazLSrqUkj4w7Y5y7cCVP6E5tcqqcI0xemPkHug== -"@pulumi/aws@7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-7.25.0.tgz#d831f99e4e5faac496d36b3f3726b50cc1bba818" - integrity sha512-qP2ikhFJrw/NrizaOBWiAGkHe003+fPT5Blsc4X1q8uQ0CpmjnPAbbsotpI13hVBU4a2sflIX4GkHcXzRU9QQw== +"@pulumi/aws@7.43.0": + version "7.43.0" + resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-7.43.0.tgz#84e4d90e83ebf32e05c64a2bf15c51aeee86d1ae" + integrity sha512-UCZCrOBn1xVu5CSfd9I3FNZCPkdEcXaB6XNacTj0wVB9iPj8Ma6dLnbfLsUT2ceGsmSMrhwOMvnacOrrhG722A== dependencies: "@pulumi/pulumi" "^3.142.0" mime "^2.0.0"