Skip to content

Commit

Permalink
add missing cluster version input
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaxxstorm
jaxxstorm committed Feb 1, 2024
1 parent 09ae0ee commit 5c9e8e7
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 0 deletions.
4 changes: 4 additions & 0 deletions go.work.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@ github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGE
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo=
github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
Expand Down Expand Up @@ -815,6 +816,7 @@ github.com/google/go-replayers/httpreplay v0.1.2/go.mod h1:YKZViNhiGgqdBlUbI2MwG
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20230111200839-76d1ae5aea2b/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
github.com/google/pprof v0.0.0-20230406165453-00490a63f317/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
Expand Down Expand Up @@ -939,6 +941,7 @@ github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47
github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0=
github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
Expand Down Expand Up @@ -1287,6 +1290,7 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhkl
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
mvdan.cc/editorconfig v0.2.0/go.mod h1:lvnnD3BNdBYkhq+B4uBuFFKatfp02eB6HixDvEz91C0=
mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48=
mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
Expand Down
3 changes: 3 additions & 0 deletions schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ resources:
lbrlabs-eks:index:Cluster:
isComponent: true
inputProperties:
clusterVersion:
type: string
description: The version of the EKS cluster to create.
letsEncryptEmail:
type: string
description: The email address to use to issue certificates from Lets Encrypt.
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Eks/Cluster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ public InputList<string> ClusterSubnetIds
set => _clusterSubnetIds = value;
}

/// <summary>
/// The version of the EKS cluster to create.
/// </summary>
[Input("clusterVersion")]
public Input<string>? ClusterVersion { get; set; }

/// <summary>
/// The version of the eks-iam-auth-controller helm chart to deploy.
/// </summary>
Expand Down
4 changes: 4 additions & 0 deletions sdk/go/eks/cluster.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions sdk/go/eks/x/cluster.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions sdk/nodejs/cluster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export class Cluster extends pulumi.ComponentResource {
resourceInputs["certManagerVersion"] = args ? args.certManagerVersion : undefined;
resourceInputs["certificateArn"] = args ? args.certificateArn : undefined;
resourceInputs["clusterSubnetIds"] = args ? args.clusterSubnetIds : undefined;
resourceInputs["clusterVersion"] = args ? args.clusterVersion : undefined;
resourceInputs["eksIamAuthControllerVersion"] = args ? args.eksIamAuthControllerVersion : undefined;
resourceInputs["enableCertManager"] = (args ? args.enableCertManager : undefined) ?? true;
resourceInputs["enableCloudWatchAgent"] = (args ? args.enableCloudWatchAgent : undefined) ?? false;
Expand Down Expand Up @@ -114,6 +115,10 @@ export interface ClusterArgs {
*/
certificateArn?: pulumi.Input<string>;
clusterSubnetIds: pulumi.Input<pulumi.Input<string>[]>;
/**
* The version of the EKS cluster to create.
*/
clusterVersion?: pulumi.Input<string>;
/**
* The version of the eks-iam-auth-controller helm chart to deploy.
*/
Expand Down
20 changes: 20 additions & 0 deletions sdk/python/lbrlabs_pulumi_eks/cluster.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def __init__(__self__, *,
system_node_subnet_ids: pulumi.Input[Sequence[pulumi.Input[str]]],
cert_manager_version: Optional[pulumi.Input[str]] = None,
certificate_arn: Optional[pulumi.Input[str]] = None,
cluster_version: Optional[pulumi.Input[str]] = None,
eks_iam_auth_controller_version: Optional[pulumi.Input[str]] = None,
enable_cert_manager: Optional[bool] = None,
enable_cloud_watch_agent: Optional[bool] = None,
Expand All @@ -38,6 +39,7 @@ def __init__(__self__, *,
The set of arguments for constructing a Cluster resource.
:param pulumi.Input[str] cert_manager_version: The version of the cert-manager helm chart to deploy.
:param pulumi.Input[str] certificate_arn: The ARN of the certificate to use for the ingress controller.
:param pulumi.Input[str] cluster_version: The version of the EKS cluster to create.
:param pulumi.Input[str] eks_iam_auth_controller_version: The version of the eks-iam-auth-controller helm chart to deploy.
:param bool enable_cert_manager: Whether to enable cert-manager with route 53 integration.
:param bool enable_cloud_watch_agent: Whether to enable cloudwatch container insights for EKS.
Expand All @@ -59,6 +61,8 @@ def __init__(__self__, *,
pulumi.set(__self__, "cert_manager_version", cert_manager_version)
if certificate_arn is not None:
pulumi.set(__self__, "certificate_arn", certificate_arn)
if cluster_version is not None:
pulumi.set(__self__, "cluster_version", cluster_version)
if eks_iam_auth_controller_version is not None:
pulumi.set(__self__, "eks_iam_auth_controller_version", eks_iam_auth_controller_version)
if enable_cert_manager is None:
Expand Down Expand Up @@ -144,6 +148,18 @@ def certificate_arn(self) -> Optional[pulumi.Input[str]]:
def certificate_arn(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "certificate_arn", value)

@property
@pulumi.getter(name="clusterVersion")
def cluster_version(self) -> Optional[pulumi.Input[str]]:
"""
The version of the EKS cluster to create.
"""
return pulumi.get(self, "cluster_version")

@cluster_version.setter
def cluster_version(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "cluster_version", value)

@property
@pulumi.getter(name="eksIamAuthControllerVersion")
def eks_iam_auth_controller_version(self) -> Optional[pulumi.Input[str]]:
Expand Down Expand Up @@ -330,6 +346,7 @@ def __init__(__self__,
cert_manager_version: Optional[pulumi.Input[str]] = None,
certificate_arn: Optional[pulumi.Input[str]] = None,
cluster_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
cluster_version: Optional[pulumi.Input[str]] = None,
eks_iam_auth_controller_version: Optional[pulumi.Input[str]] = None,
enable_cert_manager: Optional[bool] = None,
enable_cloud_watch_agent: Optional[bool] = None,
Expand All @@ -353,6 +370,7 @@ def __init__(__self__,
:param pulumi.ResourceOptions opts: Options for the resource.
:param pulumi.Input[str] cert_manager_version: The version of the cert-manager helm chart to deploy.
:param pulumi.Input[str] certificate_arn: The ARN of the certificate to use for the ingress controller.
:param pulumi.Input[str] cluster_version: The version of the EKS cluster to create.
:param pulumi.Input[str] eks_iam_auth_controller_version: The version of the eks-iam-auth-controller helm chart to deploy.
:param bool enable_cert_manager: Whether to enable cert-manager with route 53 integration.
:param bool enable_cloud_watch_agent: Whether to enable cloudwatch container insights for EKS.
Expand Down Expand Up @@ -394,6 +412,7 @@ def _internal_init(__self__,
cert_manager_version: Optional[pulumi.Input[str]] = None,
certificate_arn: Optional[pulumi.Input[str]] = None,
cluster_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
cluster_version: Optional[pulumi.Input[str]] = None,
eks_iam_auth_controller_version: Optional[pulumi.Input[str]] = None,
enable_cert_manager: Optional[bool] = None,
enable_cloud_watch_agent: Optional[bool] = None,
Expand Down Expand Up @@ -426,6 +445,7 @@ def _internal_init(__self__,
if cluster_subnet_ids is None and not opts.urn:
raise TypeError("Missing required property 'cluster_subnet_ids'")
__props__.__dict__["cluster_subnet_ids"] = cluster_subnet_ids
__props__.__dict__["cluster_version"] = cluster_version
__props__.__dict__["eks_iam_auth_controller_version"] = eks_iam_auth_controller_version
if enable_cert_manager is None:
enable_cert_manager = True
Expand Down

0 comments on commit 5c9e8e7

Please sign in to comment.