From 347ae0450e7a629f500bc0bd11ae6db945cdaf5d Mon Sep 17 00:00:00 2001 From: Sean Holung Date: Tue, 16 Apr 2024 14:46:52 -0700 Subject: [PATCH] add missing descriptions --- provider/cmd/pulumi-gen-eks/main.go | 28 +++-- provider/cmd/pulumi-resource-eks/schema.json | 42 ++++--- sdk/dotnet/Cluster.cs | 3 + sdk/dotnet/Inputs/CoreDataArgs.cs | 46 ++++++++ sdk/dotnet/Outputs/CoreData.cs | 39 +++++++ sdk/go/eks/cluster.go | 2 + sdk/go/eks/pulumiTypes.go | 115 +++++++++++++------ sdk/python/pulumi_eks/_inputs.py | 52 +++++++++ sdk/python/pulumi_eks/cluster.py | 3 + sdk/python/pulumi_eks/outputs.py | 52 +++++++++ 10 files changed, 323 insertions(+), 59 deletions(-) diff --git a/provider/cmd/pulumi-gen-eks/main.go b/provider/cmd/pulumi-gen-eks/main.go index e0573e352..ae07b3725 100644 --- a/provider/cmd/pulumi-gen-eks/main.go +++ b/provider/cmd/pulumi-gen-eks/main.go @@ -136,7 +136,8 @@ func generateSchema() schema.PackageSpec { Outputs: &schema.ObjectTypeSpec{ Properties: map[string]schema.PropertySpec{ "result": { - TypeSpec: schema.TypeSpec{Type: "string"}, + TypeSpec: schema.TypeSpec{Type: "string"}, + Description: "The kubeconfig for the cluster.", }, }, Required: []string{"result"}, @@ -972,16 +973,19 @@ func generateSchema() schema.PackageSpec { TypeSpec: schema.TypeSpec{Ref: awsRef("#/resources/aws:eks%2Fcluster:Cluster")}, }, "vpcId": { - TypeSpec: schema.TypeSpec{Type: "string"}, + TypeSpec: schema.TypeSpec{Type: "string"}, + Description: "ID of the cluster's VPC.", }, "subnetIds": { TypeSpec: schema.TypeSpec{ Type: "array", Items: &schema.TypeSpec{Type: "string"}, }, + Description: "List of subnet IDs for the EKS cluster.", }, "endpoint": { - TypeSpec: schema.TypeSpec{Type: "string"}, + TypeSpec: schema.TypeSpec{Type: "string"}, + Description: "The EKS cluster's Kubernetes API server endpoint.", }, "clusterSecurityGroup": { TypeSpec: schema.TypeSpec{Ref: awsRef("#/resources/aws:ec2%2FsecurityGroup:SecurityGroup")}, @@ -994,9 +998,11 @@ func generateSchema() schema.PackageSpec { Type: "array", Items: &schema.TypeSpec{Ref: awsRef("#/resources/aws:iam%2Frole:Role")}, }, + Description: "The IAM instance roles for the cluster's nodes.", }, "nodeGroupOptions": { - TypeSpec: schema.TypeSpec{Ref: "#/types/eks:index:ClusterNodeGroupOptions"}, + TypeSpec: schema.TypeSpec{Ref: "#/types/eks:index:ClusterNodeGroupOptions"}, + Description: "The cluster's node group options.", }, "awsProvider": { TypeSpec: schema.TypeSpec{Ref: awsRef("#/provider")}, @@ -1006,12 +1012,14 @@ func generateSchema() schema.PackageSpec { Type: "array", Items: &schema.TypeSpec{Type: "string"}, }, + Description: "List of subnet IDs for the public subnets.", }, "privateSubnetIds": { TypeSpec: schema.TypeSpec{ Type: "array", Items: &schema.TypeSpec{Type: "string"}, }, + Description: "List of subnet IDs for the private subnets.", }, "eksNodeAccess": { TypeSpec: schema.TypeSpec{Ref: k8sRef("#/resources/kubernetes:core%2Fv1:ConfigMap")}, @@ -1021,27 +1029,33 @@ func generateSchema() schema.PackageSpec { Type: "object", AdditionalProperties: &schema.TypeSpec{Ref: k8sRef("#/resources/kubernetes:storage.k8s.io%2Fv1:StorageClass")}, }, + Description: "The storage class used for persistent storage by the cluster.", }, "kubeconfig": { - TypeSpec: schema.TypeSpec{Ref: "pulumi.json#/Any"}, + TypeSpec: schema.TypeSpec{Ref: "pulumi.json#/Any"}, + Description: "The kubeconfig file for the cluster.", }, "vpcCni": { - TypeSpec: schema.TypeSpec{Ref: "#/resources/eks:index:VpcCni"}, + TypeSpec: schema.TypeSpec{Ref: "#/resources/eks:index:VpcCni"}, + Description: "The VPC CNI for the cluster.", }, "tags": { TypeSpec: schema.TypeSpec{ Type: "object", AdditionalProperties: &schema.TypeSpec{Type: "string"}, }, + Description: "A map of tags assigned to the EKS cluster.", }, "nodeSecurityGroupTags": { TypeSpec: schema.TypeSpec{ Type: "object", AdditionalProperties: &schema.TypeSpec{Type: "string"}, }, + Description: "Tags attached to the security groups associated with the cluster's worker nodes.", }, "fargateProfile": { - TypeSpec: schema.TypeSpec{Ref: awsRef("#/resources/aws:eks%2FfargateProfile:FargateProfile")}, + TypeSpec: schema.TypeSpec{Ref: awsRef("#/resources/aws:eks%2FfargateProfile:FargateProfile")}, + Description: "The Fargate profile used to manage which pods run on Fargate.", }, "oidcProvider": { TypeSpec: schema.TypeSpec{Ref: awsRef("#/resources/aws:iam%2FopenIdConnectProvider:OpenIdConnectProvider")}, diff --git a/provider/cmd/pulumi-resource-eks/schema.json b/provider/cmd/pulumi-resource-eks/schema.json index ea81903b0..ebd44365e 100644 --- a/provider/cmd/pulumi-resource-eks/schema.json +++ b/provider/cmd/pulumi-resource-eks/schema.json @@ -209,28 +209,34 @@ "$ref": "/aws/v6.5.0/schema.json#/types/aws:eks%2FClusterEncryptionConfig:ClusterEncryptionConfig" }, "endpoint": { - "type": "string" + "type": "string", + "description": "The EKS cluster's Kubernetes API server endpoint." }, "fargateProfile": { - "$ref": "/aws/v6.5.0/schema.json#/resources/aws:eks%2FfargateProfile:FargateProfile" + "$ref": "/aws/v6.5.0/schema.json#/resources/aws:eks%2FfargateProfile:FargateProfile", + "description": "The Fargate profile used to manage which pods run on Fargate." }, "instanceRoles": { "type": "array", "items": { "$ref": "/aws/v6.5.0/schema.json#/resources/aws:iam%2Frole:Role" - } + }, + "description": "The IAM instance roles for the cluster's nodes." }, "kubeconfig": { - "$ref": "pulumi.json#/Any" + "$ref": "pulumi.json#/Any", + "description": "The kubeconfig file for the cluster." }, "nodeGroupOptions": { - "$ref": "#/types/eks:index:ClusterNodeGroupOptions" + "$ref": "#/types/eks:index:ClusterNodeGroupOptions", + "description": "The cluster's node group options." }, "nodeSecurityGroupTags": { "type": "object", "additionalProperties": { "type": "string" - } + }, + "description": "Tags attached to the security groups associated with the cluster's worker nodes." }, "oidcProvider": { "$ref": "/aws/v6.5.0/schema.json#/resources/aws:iam%2FopenIdConnectProvider:OpenIdConnectProvider" @@ -239,7 +245,8 @@ "type": "array", "items": { "type": "string" - } + }, + "description": "List of subnet IDs for the private subnets." }, "provider": { "$ref": "/kubernetes/v4.4.0/schema.json#/provider" @@ -248,31 +255,37 @@ "type": "array", "items": { "type": "string" - } + }, + "description": "List of subnet IDs for the public subnets." }, "storageClasses": { "type": "object", "additionalProperties": { "$ref": "/kubernetes/v4.4.0/schema.json#/resources/kubernetes:storage.k8s.io%2Fv1:StorageClass" - } + }, + "description": "The storage class used for persistent storage by the cluster." }, "subnetIds": { "type": "array", "items": { "type": "string" - } + }, + "description": "List of subnet IDs for the EKS cluster." }, "tags": { "type": "object", "additionalProperties": { "type": "string" - } + }, + "description": "A map of tags assigned to the EKS cluster." }, "vpcCni": { - "$ref": "#/resources/eks:index:VpcCni" + "$ref": "#/resources/eks:index:VpcCni", + "description": "The VPC CNI for the cluster." }, "vpcId": { - "type": "string" + "type": "string", + "description": "ID of the cluster's VPC." } }, "type": "object", @@ -1607,7 +1620,8 @@ "outputs": { "properties": { "result": { - "type": "string" + "type": "string", + "description": "The kubeconfig for the cluster." } }, "required": [ diff --git a/sdk/dotnet/Cluster.cs b/sdk/dotnet/Cluster.cs index 52d4b7cb9..64b4af4fe 100644 --- a/sdk/dotnet/Cluster.cs +++ b/sdk/dotnet/Cluster.cs @@ -671,6 +671,9 @@ public ClusterGetKubeconfigArgs() [OutputType] internal sealed class ClusterGetKubeconfigResult { + /// + /// The kubeconfig for the cluster. + /// public readonly string Result; [OutputConstructor] diff --git a/sdk/dotnet/Inputs/CoreDataArgs.cs b/sdk/dotnet/Inputs/CoreDataArgs.cs index 224cf2b13..3688f7751 100644 --- a/sdk/dotnet/Inputs/CoreDataArgs.cs +++ b/sdk/dotnet/Inputs/CoreDataArgs.cs @@ -36,28 +36,48 @@ public sealed class CoreDataArgs : global::Pulumi.ResourceArgs [Input("encryptionConfig")] public Input? EncryptionConfig { get; set; } + /// + /// The EKS cluster's Kubernetes API server endpoint. + /// [Input("endpoint", required: true)] public Input Endpoint { get; set; } = null!; + /// + /// The Fargate profile used to manage which pods run on Fargate. + /// [Input("fargateProfile")] public Input? FargateProfile { get; set; } [Input("instanceRoles", required: true)] private InputList? _instanceRoles; + + /// + /// The IAM instance roles for the cluster's nodes. + /// public InputList InstanceRoles { get => _instanceRoles ?? (_instanceRoles = new InputList()); set => _instanceRoles = value; } + /// + /// The kubeconfig file for the cluster. + /// [Input("kubeconfig")] public Input? Kubeconfig { get; set; } + /// + /// The cluster's node group options. + /// [Input("nodeGroupOptions", required: true)] public Input NodeGroupOptions { get; set; } = null!; [Input("nodeSecurityGroupTags")] private InputMap? _nodeSecurityGroupTags; + + /// + /// Tags attached to the security groups associated with the cluster's worker nodes. + /// public InputMap NodeSecurityGroupTags { get => _nodeSecurityGroupTags ?? (_nodeSecurityGroupTags = new InputMap()); @@ -69,6 +89,10 @@ public InputMap NodeSecurityGroupTags [Input("privateSubnetIds")] private InputList? _privateSubnetIds; + + /// + /// List of subnet IDs for the private subnets. + /// public InputList PrivateSubnetIds { get => _privateSubnetIds ?? (_privateSubnetIds = new InputList()); @@ -80,6 +104,10 @@ public InputList PrivateSubnetIds [Input("publicSubnetIds")] private InputList? _publicSubnetIds; + + /// + /// List of subnet IDs for the public subnets. + /// public InputList PublicSubnetIds { get => _publicSubnetIds ?? (_publicSubnetIds = new InputList()); @@ -88,6 +116,10 @@ public InputList PublicSubnetIds [Input("storageClasses")] private InputMap? _storageClasses; + + /// + /// The storage class used for persistent storage by the cluster. + /// public InputMap StorageClasses { get => _storageClasses ?? (_storageClasses = new InputMap()); @@ -96,6 +128,10 @@ public InputMap StorageClasses [Input("subnetIds", required: true)] private InputList? _subnetIds; + + /// + /// List of subnet IDs for the EKS cluster. + /// public InputList SubnetIds { get => _subnetIds ?? (_subnetIds = new InputList()); @@ -104,15 +140,25 @@ public InputList SubnetIds [Input("tags")] private InputMap? _tags; + + /// + /// A map of tags assigned to the EKS cluster. + /// public InputMap Tags { get => _tags ?? (_tags = new InputMap()); set => _tags = value; } + /// + /// The VPC CNI for the cluster. + /// [Input("vpcCni")] public Input? VpcCni { get; set; } + /// + /// ID of the cluster's VPC. + /// [Input("vpcId", required: true)] public Input VpcId { get; set; } = null!; diff --git a/sdk/dotnet/Outputs/CoreData.cs b/sdk/dotnet/Outputs/CoreData.cs index db41300ab..d6cf94df8 100644 --- a/sdk/dotnet/Outputs/CoreData.cs +++ b/sdk/dotnet/Outputs/CoreData.cs @@ -25,20 +25,59 @@ public sealed class CoreData public readonly Pulumi.Aws.Ec2.SecurityGroup ClusterSecurityGroup; public readonly Pulumi.Kubernetes.Core.V1.ConfigMap? EksNodeAccess; public readonly Pulumi.Aws.Eks.Outputs.ClusterEncryptionConfig? EncryptionConfig; + /// + /// The EKS cluster's Kubernetes API server endpoint. + /// public readonly string Endpoint; + /// + /// The Fargate profile used to manage which pods run on Fargate. + /// public readonly Pulumi.Aws.Eks.FargateProfile? FargateProfile; + /// + /// The IAM instance roles for the cluster's nodes. + /// public readonly ImmutableArray InstanceRoles; + /// + /// The kubeconfig file for the cluster. + /// public readonly object? Kubeconfig; + /// + /// The cluster's node group options. + /// public readonly Outputs.ClusterNodeGroupOptions NodeGroupOptions; + /// + /// Tags attached to the security groups associated with the cluster's worker nodes. + /// public readonly ImmutableDictionary? NodeSecurityGroupTags; public readonly Pulumi.Aws.Iam.OpenIdConnectProvider? OidcProvider; + /// + /// List of subnet IDs for the private subnets. + /// public readonly ImmutableArray PrivateSubnetIds; public readonly Pulumi.Kubernetes.Provider Provider; + /// + /// List of subnet IDs for the public subnets. + /// public readonly ImmutableArray PublicSubnetIds; + /// + /// The storage class used for persistent storage by the cluster. + /// public readonly ImmutableDictionary? StorageClasses; + /// + /// List of subnet IDs for the EKS cluster. + /// public readonly ImmutableArray SubnetIds; + /// + /// A map of tags assigned to the EKS cluster. + /// public readonly ImmutableDictionary? Tags; + /// + /// The VPC CNI for the cluster. + /// public readonly Pulumi.Eks.VpcCni? VpcCni; + /// + /// ID of the cluster's VPC. + /// public readonly string VpcId; [OutputConstructor] diff --git a/sdk/go/eks/cluster.go b/sdk/go/eks/cluster.go index 9d0de0738..c51597172 100644 --- a/sdk/go/eks/cluster.go +++ b/sdk/go/eks/cluster.go @@ -571,6 +571,7 @@ func (ClusterGetKubeconfigArgs) ElementType() reflect.Type { } type clusterGetKubeconfigResult struct { + // The kubeconfig for the cluster. Result string `pulumi:"result"` } @@ -580,6 +581,7 @@ func (clusterGetKubeconfigResultOutput) ElementType() reflect.Type { return reflect.TypeOf((*clusterGetKubeconfigResult)(nil)).Elem() } +// The kubeconfig for the cluster. func (o clusterGetKubeconfigResultOutput) Result() pulumi.StringOutput { return o.ApplyT(func(v clusterGetKubeconfigResult) string { return v.Result }).(pulumi.StringOutput) } diff --git a/sdk/go/eks/pulumiTypes.go b/sdk/go/eks/pulumiTypes.go index aaed3489d..7dc71473f 100644 --- a/sdk/go/eks/pulumiTypes.go +++ b/sdk/go/eks/pulumiTypes.go @@ -821,25 +821,38 @@ type CoreData struct { AwsProvider *aws.Provider `pulumi:"awsProvider"` Cluster *eks.Cluster `pulumi:"cluster"` // The IAM Role attached to the EKS Cluster - ClusterIamRole *iam.Role `pulumi:"clusterIamRole"` - ClusterSecurityGroup *ec2.SecurityGroup `pulumi:"clusterSecurityGroup"` - EksNodeAccess *corev1.ConfigMap `pulumi:"eksNodeAccess"` - EncryptionConfig *eks.ClusterEncryptionConfig `pulumi:"encryptionConfig"` - Endpoint string `pulumi:"endpoint"` - FargateProfile *eks.FargateProfile `pulumi:"fargateProfile"` - InstanceRoles []*iam.Role `pulumi:"instanceRoles"` - Kubeconfig interface{} `pulumi:"kubeconfig"` - NodeGroupOptions ClusterNodeGroupOptions `pulumi:"nodeGroupOptions"` - NodeSecurityGroupTags map[string]string `pulumi:"nodeSecurityGroupTags"` - OidcProvider *iam.OpenIdConnectProvider `pulumi:"oidcProvider"` - PrivateSubnetIds []string `pulumi:"privateSubnetIds"` - Provider *kubernetes.Provider `pulumi:"provider"` - PublicSubnetIds []string `pulumi:"publicSubnetIds"` - StorageClasses map[string]*storagev1.StorageClass `pulumi:"storageClasses"` - SubnetIds []string `pulumi:"subnetIds"` - Tags map[string]string `pulumi:"tags"` - VpcCni *VpcCni `pulumi:"vpcCni"` - VpcId string `pulumi:"vpcId"` + ClusterIamRole *iam.Role `pulumi:"clusterIamRole"` + ClusterSecurityGroup *ec2.SecurityGroup `pulumi:"clusterSecurityGroup"` + EksNodeAccess *corev1.ConfigMap `pulumi:"eksNodeAccess"` + EncryptionConfig *eks.ClusterEncryptionConfig `pulumi:"encryptionConfig"` + // The EKS cluster's Kubernetes API server endpoint. + Endpoint string `pulumi:"endpoint"` + // The Fargate profile used to manage which pods run on Fargate. + FargateProfile *eks.FargateProfile `pulumi:"fargateProfile"` + // The IAM instance roles for the cluster's nodes. + InstanceRoles []*iam.Role `pulumi:"instanceRoles"` + // The kubeconfig file for the cluster. + Kubeconfig interface{} `pulumi:"kubeconfig"` + // The cluster's node group options. + NodeGroupOptions ClusterNodeGroupOptions `pulumi:"nodeGroupOptions"` + // Tags attached to the security groups associated with the cluster's worker nodes. + NodeSecurityGroupTags map[string]string `pulumi:"nodeSecurityGroupTags"` + OidcProvider *iam.OpenIdConnectProvider `pulumi:"oidcProvider"` + // List of subnet IDs for the private subnets. + PrivateSubnetIds []string `pulumi:"privateSubnetIds"` + Provider *kubernetes.Provider `pulumi:"provider"` + // List of subnet IDs for the public subnets. + PublicSubnetIds []string `pulumi:"publicSubnetIds"` + // The storage class used for persistent storage by the cluster. + StorageClasses map[string]*storagev1.StorageClass `pulumi:"storageClasses"` + // List of subnet IDs for the EKS cluster. + SubnetIds []string `pulumi:"subnetIds"` + // A map of tags assigned to the EKS cluster. + Tags map[string]string `pulumi:"tags"` + // The VPC CNI for the cluster. + VpcCni *VpcCni `pulumi:"vpcCni"` + // ID of the cluster's VPC. + VpcId string `pulumi:"vpcId"` } // CoreDataInput is an input type that accepts CoreDataArgs and CoreDataOutput values. @@ -858,25 +871,38 @@ type CoreDataArgs struct { AwsProvider aws.ProviderInput `pulumi:"awsProvider"` Cluster eks.ClusterInput `pulumi:"cluster"` // The IAM Role attached to the EKS Cluster - ClusterIamRole iam.RoleInput `pulumi:"clusterIamRole"` - ClusterSecurityGroup ec2.SecurityGroupInput `pulumi:"clusterSecurityGroup"` - EksNodeAccess corev1.ConfigMapInput `pulumi:"eksNodeAccess"` - EncryptionConfig eks.ClusterEncryptionConfigPtrInput `pulumi:"encryptionConfig"` - Endpoint pulumi.StringInput `pulumi:"endpoint"` - FargateProfile eks.FargateProfileInput `pulumi:"fargateProfile"` - InstanceRoles iam.RoleArrayInput `pulumi:"instanceRoles"` - Kubeconfig pulumi.Input `pulumi:"kubeconfig"` - NodeGroupOptions ClusterNodeGroupOptionsInput `pulumi:"nodeGroupOptions"` - NodeSecurityGroupTags pulumi.StringMapInput `pulumi:"nodeSecurityGroupTags"` - OidcProvider iam.OpenIdConnectProviderInput `pulumi:"oidcProvider"` - PrivateSubnetIds pulumi.StringArrayInput `pulumi:"privateSubnetIds"` - Provider kubernetes.ProviderInput `pulumi:"provider"` - PublicSubnetIds pulumi.StringArrayInput `pulumi:"publicSubnetIds"` - StorageClasses storagev1.StorageClassMapInput `pulumi:"storageClasses"` - SubnetIds pulumi.StringArrayInput `pulumi:"subnetIds"` - Tags pulumi.StringMapInput `pulumi:"tags"` - VpcCni VpcCniInput `pulumi:"vpcCni"` - VpcId pulumi.StringInput `pulumi:"vpcId"` + ClusterIamRole iam.RoleInput `pulumi:"clusterIamRole"` + ClusterSecurityGroup ec2.SecurityGroupInput `pulumi:"clusterSecurityGroup"` + EksNodeAccess corev1.ConfigMapInput `pulumi:"eksNodeAccess"` + EncryptionConfig eks.ClusterEncryptionConfigPtrInput `pulumi:"encryptionConfig"` + // The EKS cluster's Kubernetes API server endpoint. + Endpoint pulumi.StringInput `pulumi:"endpoint"` + // The Fargate profile used to manage which pods run on Fargate. + FargateProfile eks.FargateProfileInput `pulumi:"fargateProfile"` + // The IAM instance roles for the cluster's nodes. + InstanceRoles iam.RoleArrayInput `pulumi:"instanceRoles"` + // The kubeconfig file for the cluster. + Kubeconfig pulumi.Input `pulumi:"kubeconfig"` + // The cluster's node group options. + NodeGroupOptions ClusterNodeGroupOptionsInput `pulumi:"nodeGroupOptions"` + // Tags attached to the security groups associated with the cluster's worker nodes. + NodeSecurityGroupTags pulumi.StringMapInput `pulumi:"nodeSecurityGroupTags"` + OidcProvider iam.OpenIdConnectProviderInput `pulumi:"oidcProvider"` + // List of subnet IDs for the private subnets. + PrivateSubnetIds pulumi.StringArrayInput `pulumi:"privateSubnetIds"` + Provider kubernetes.ProviderInput `pulumi:"provider"` + // List of subnet IDs for the public subnets. + PublicSubnetIds pulumi.StringArrayInput `pulumi:"publicSubnetIds"` + // The storage class used for persistent storage by the cluster. + StorageClasses storagev1.StorageClassMapInput `pulumi:"storageClasses"` + // List of subnet IDs for the EKS cluster. + SubnetIds pulumi.StringArrayInput `pulumi:"subnetIds"` + // A map of tags assigned to the EKS cluster. + Tags pulumi.StringMapInput `pulumi:"tags"` + // The VPC CNI for the cluster. + VpcCni VpcCniInput `pulumi:"vpcCni"` + // ID of the cluster's VPC. + VpcId pulumi.StringInput `pulumi:"vpcId"` } func (CoreDataArgs) ElementType() reflect.Type { @@ -931,26 +957,32 @@ func (o CoreDataOutput) EncryptionConfig() eks.ClusterEncryptionConfigPtrOutput return o.ApplyT(func(v CoreData) *eks.ClusterEncryptionConfig { return v.EncryptionConfig }).(eks.ClusterEncryptionConfigPtrOutput) } +// The EKS cluster's Kubernetes API server endpoint. func (o CoreDataOutput) Endpoint() pulumi.StringOutput { return o.ApplyT(func(v CoreData) string { return v.Endpoint }).(pulumi.StringOutput) } +// The Fargate profile used to manage which pods run on Fargate. func (o CoreDataOutput) FargateProfile() eks.FargateProfileOutput { return o.ApplyT(func(v CoreData) *eks.FargateProfile { return v.FargateProfile }).(eks.FargateProfileOutput) } +// The IAM instance roles for the cluster's nodes. func (o CoreDataOutput) InstanceRoles() iam.RoleArrayOutput { return o.ApplyT(func(v CoreData) []*iam.Role { return v.InstanceRoles }).(iam.RoleArrayOutput) } +// The kubeconfig file for the cluster. func (o CoreDataOutput) Kubeconfig() pulumi.AnyOutput { return o.ApplyT(func(v CoreData) interface{} { return v.Kubeconfig }).(pulumi.AnyOutput) } +// The cluster's node group options. func (o CoreDataOutput) NodeGroupOptions() ClusterNodeGroupOptionsOutput { return o.ApplyT(func(v CoreData) ClusterNodeGroupOptions { return v.NodeGroupOptions }).(ClusterNodeGroupOptionsOutput) } +// Tags attached to the security groups associated with the cluster's worker nodes. func (o CoreDataOutput) NodeSecurityGroupTags() pulumi.StringMapOutput { return o.ApplyT(func(v CoreData) map[string]string { return v.NodeSecurityGroupTags }).(pulumi.StringMapOutput) } @@ -959,6 +991,7 @@ func (o CoreDataOutput) OidcProvider() iam.OpenIdConnectProviderOutput { return o.ApplyT(func(v CoreData) *iam.OpenIdConnectProvider { return v.OidcProvider }).(iam.OpenIdConnectProviderOutput) } +// List of subnet IDs for the private subnets. func (o CoreDataOutput) PrivateSubnetIds() pulumi.StringArrayOutput { return o.ApplyT(func(v CoreData) []string { return v.PrivateSubnetIds }).(pulumi.StringArrayOutput) } @@ -967,26 +1000,32 @@ func (o CoreDataOutput) Provider() kubernetes.ProviderOutput { return o.ApplyT(func(v CoreData) *kubernetes.Provider { return v.Provider }).(kubernetes.ProviderOutput) } +// List of subnet IDs for the public subnets. func (o CoreDataOutput) PublicSubnetIds() pulumi.StringArrayOutput { return o.ApplyT(func(v CoreData) []string { return v.PublicSubnetIds }).(pulumi.StringArrayOutput) } +// The storage class used for persistent storage by the cluster. func (o CoreDataOutput) StorageClasses() storagev1.StorageClassMapOutput { return o.ApplyT(func(v CoreData) map[string]*storagev1.StorageClass { return v.StorageClasses }).(storagev1.StorageClassMapOutput) } +// List of subnet IDs for the EKS cluster. func (o CoreDataOutput) SubnetIds() pulumi.StringArrayOutput { return o.ApplyT(func(v CoreData) []string { return v.SubnetIds }).(pulumi.StringArrayOutput) } +// A map of tags assigned to the EKS cluster. func (o CoreDataOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v CoreData) map[string]string { return v.Tags }).(pulumi.StringMapOutput) } +// The VPC CNI for the cluster. func (o CoreDataOutput) VpcCni() VpcCniOutput { return o.ApplyT(func(v CoreData) *VpcCni { return v.VpcCni }).(VpcCniOutput) } +// ID of the cluster's VPC. func (o CoreDataOutput) VpcId() pulumi.StringOutput { return o.ApplyT(func(v CoreData) string { return v.VpcId }).(pulumi.StringOutput) } diff --git a/sdk/python/pulumi_eks/_inputs.py b/sdk/python/pulumi_eks/_inputs.py index ac2de5e97..538a6a539 100644 --- a/sdk/python/pulumi_eks/_inputs.py +++ b/sdk/python/pulumi_eks/_inputs.py @@ -572,6 +572,19 @@ def __init__(__self__, *, """ Defines the core set of data associated with an EKS cluster, including the network in which it runs. :param pulumi.Input['pulumi_aws.iam.Role'] cluster_iam_role: The IAM Role attached to the EKS Cluster + :param pulumi.Input[str] endpoint: The EKS cluster's Kubernetes API server endpoint. + :param pulumi.Input[Sequence[pulumi.Input['pulumi_aws.iam.Role']]] instance_roles: The IAM instance roles for the cluster's nodes. + :param pulumi.Input['ClusterNodeGroupOptionsArgs'] node_group_options: The cluster's node group options. + :param pulumi.Input[Sequence[pulumi.Input[str]]] subnet_ids: List of subnet IDs for the EKS cluster. + :param pulumi.Input[str] vpc_id: ID of the cluster's VPC. + :param pulumi.Input['pulumi_aws.eks.FargateProfile'] fargate_profile: The Fargate profile used to manage which pods run on Fargate. + :param Any kubeconfig: The kubeconfig file for the cluster. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] node_security_group_tags: Tags attached to the security groups associated with the cluster's worker nodes. + :param pulumi.Input[Sequence[pulumi.Input[str]]] private_subnet_ids: List of subnet IDs for the private subnets. + :param pulumi.Input[Sequence[pulumi.Input[str]]] public_subnet_ids: List of subnet IDs for the public subnets. + :param pulumi.Input[Mapping[str, pulumi.Input['pulumi_kubernetes.storage.v1.StorageClass']]] storage_classes: The storage class used for persistent storage by the cluster. + :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A map of tags assigned to the EKS cluster. + :param pulumi.Input['VpcCni'] vpc_cni: The VPC CNI for the cluster. """ pulumi.set(__self__, "cluster", cluster) pulumi.set(__self__, "cluster_iam_role", cluster_iam_role) @@ -640,6 +653,9 @@ def cluster_security_group(self, value: pulumi.Input['pulumi_aws.ec2.SecurityGro @property @pulumi.getter def endpoint(self) -> pulumi.Input[str]: + """ + The EKS cluster's Kubernetes API server endpoint. + """ return pulumi.get(self, "endpoint") @endpoint.setter @@ -649,6 +665,9 @@ def endpoint(self, value: pulumi.Input[str]): @property @pulumi.getter(name="instanceRoles") def instance_roles(self) -> pulumi.Input[Sequence[pulumi.Input['pulumi_aws.iam.Role']]]: + """ + The IAM instance roles for the cluster's nodes. + """ return pulumi.get(self, "instance_roles") @instance_roles.setter @@ -658,6 +677,9 @@ def instance_roles(self, value: pulumi.Input[Sequence[pulumi.Input['pulumi_aws.i @property @pulumi.getter(name="nodeGroupOptions") def node_group_options(self) -> pulumi.Input['ClusterNodeGroupOptionsArgs']: + """ + The cluster's node group options. + """ return pulumi.get(self, "node_group_options") @node_group_options.setter @@ -676,6 +698,9 @@ def provider(self, value: pulumi.Input['pulumi_kubernetes.Provider']): @property @pulumi.getter(name="subnetIds") def subnet_ids(self) -> pulumi.Input[Sequence[pulumi.Input[str]]]: + """ + List of subnet IDs for the EKS cluster. + """ return pulumi.get(self, "subnet_ids") @subnet_ids.setter @@ -685,6 +710,9 @@ def subnet_ids(self, value: pulumi.Input[Sequence[pulumi.Input[str]]]): @property @pulumi.getter(name="vpcId") def vpc_id(self) -> pulumi.Input[str]: + """ + ID of the cluster's VPC. + """ return pulumi.get(self, "vpc_id") @vpc_id.setter @@ -721,6 +749,9 @@ def encryption_config(self, value: Optional[pulumi.Input['pulumi_aws.eks.Cluster @property @pulumi.getter(name="fargateProfile") def fargate_profile(self) -> Optional[pulumi.Input['pulumi_aws.eks.FargateProfile']]: + """ + The Fargate profile used to manage which pods run on Fargate. + """ return pulumi.get(self, "fargate_profile") @fargate_profile.setter @@ -730,6 +761,9 @@ def fargate_profile(self, value: Optional[pulumi.Input['pulumi_aws.eks.FargatePr @property @pulumi.getter def kubeconfig(self) -> Optional[Any]: + """ + The kubeconfig file for the cluster. + """ return pulumi.get(self, "kubeconfig") @kubeconfig.setter @@ -739,6 +773,9 @@ def kubeconfig(self, value: Optional[Any]): @property @pulumi.getter(name="nodeSecurityGroupTags") def node_security_group_tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: + """ + Tags attached to the security groups associated with the cluster's worker nodes. + """ return pulumi.get(self, "node_security_group_tags") @node_security_group_tags.setter @@ -757,6 +794,9 @@ def oidc_provider(self, value: Optional[pulumi.Input['pulumi_aws.iam.OpenIdConne @property @pulumi.getter(name="privateSubnetIds") def private_subnet_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]: + """ + List of subnet IDs for the private subnets. + """ return pulumi.get(self, "private_subnet_ids") @private_subnet_ids.setter @@ -766,6 +806,9 @@ def private_subnet_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[ @property @pulumi.getter(name="publicSubnetIds") def public_subnet_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]: + """ + List of subnet IDs for the public subnets. + """ return pulumi.get(self, "public_subnet_ids") @public_subnet_ids.setter @@ -775,6 +818,9 @@ def public_subnet_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[s @property @pulumi.getter(name="storageClasses") def storage_classes(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input['pulumi_kubernetes.storage.v1.StorageClass']]]]: + """ + The storage class used for persistent storage by the cluster. + """ return pulumi.get(self, "storage_classes") @storage_classes.setter @@ -784,6 +830,9 @@ def storage_classes(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input @property @pulumi.getter def tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]: + """ + A map of tags assigned to the EKS cluster. + """ return pulumi.get(self, "tags") @tags.setter @@ -793,6 +842,9 @@ def tags(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]): @property @pulumi.getter(name="vpcCni") def vpc_cni(self) -> Optional[pulumi.Input['VpcCni']]: + """ + The VPC CNI for the cluster. + """ return pulumi.get(self, "vpc_cni") @vpc_cni.setter diff --git a/sdk/python/pulumi_eks/cluster.py b/sdk/python/pulumi_eks/cluster.py index 4f64a0da2..a0ebeb3cd 100644 --- a/sdk/python/pulumi_eks/cluster.py +++ b/sdk/python/pulumi_eks/cluster.py @@ -1526,6 +1526,9 @@ def __init__(__self__, result=None): @property @pulumi.getter def result(self) -> str: + """ + The kubeconfig for the cluster. + """ return pulumi.get(self, "result") def get_kubeconfig(__self__, *, diff --git a/sdk/python/pulumi_eks/outputs.py b/sdk/python/pulumi_eks/outputs.py index 8fe7c8b51..48b47ec92 100644 --- a/sdk/python/pulumi_eks/outputs.py +++ b/sdk/python/pulumi_eks/outputs.py @@ -573,6 +573,19 @@ def __init__(__self__, *, """ Defines the core set of data associated with an EKS cluster, including the network in which it runs. :param 'pulumi_aws.iam.Role' cluster_iam_role: The IAM Role attached to the EKS Cluster + :param str endpoint: The EKS cluster's Kubernetes API server endpoint. + :param Sequence['pulumi_aws.iam.Role'] instance_roles: The IAM instance roles for the cluster's nodes. + :param 'ClusterNodeGroupOptions' node_group_options: The cluster's node group options. + :param Sequence[str] subnet_ids: List of subnet IDs for the EKS cluster. + :param str vpc_id: ID of the cluster's VPC. + :param 'pulumi_aws.eks.FargateProfile' fargate_profile: The Fargate profile used to manage which pods run on Fargate. + :param Any kubeconfig: The kubeconfig file for the cluster. + :param Mapping[str, str] node_security_group_tags: Tags attached to the security groups associated with the cluster's worker nodes. + :param Sequence[str] private_subnet_ids: List of subnet IDs for the private subnets. + :param Sequence[str] public_subnet_ids: List of subnet IDs for the public subnets. + :param Mapping[str, 'pulumi_kubernetes.storage.v1.StorageClass'] storage_classes: The storage class used for persistent storage by the cluster. + :param Mapping[str, str] tags: A map of tags assigned to the EKS cluster. + :param 'VpcCni' vpc_cni: The VPC CNI for the cluster. """ pulumi.set(__self__, "cluster", cluster) pulumi.set(__self__, "cluster_iam_role", cluster_iam_role) @@ -629,16 +642,25 @@ def cluster_security_group(self) -> 'pulumi_aws.ec2.SecurityGroup': @property @pulumi.getter def endpoint(self) -> str: + """ + The EKS cluster's Kubernetes API server endpoint. + """ return pulumi.get(self, "endpoint") @property @pulumi.getter(name="instanceRoles") def instance_roles(self) -> Sequence['pulumi_aws.iam.Role']: + """ + The IAM instance roles for the cluster's nodes. + """ return pulumi.get(self, "instance_roles") @property @pulumi.getter(name="nodeGroupOptions") def node_group_options(self) -> 'outputs.ClusterNodeGroupOptions': + """ + The cluster's node group options. + """ return pulumi.get(self, "node_group_options") @property @@ -649,11 +671,17 @@ def provider(self) -> 'pulumi_kubernetes.Provider': @property @pulumi.getter(name="subnetIds") def subnet_ids(self) -> Sequence[str]: + """ + List of subnet IDs for the EKS cluster. + """ return pulumi.get(self, "subnet_ids") @property @pulumi.getter(name="vpcId") def vpc_id(self) -> str: + """ + ID of the cluster's VPC. + """ return pulumi.get(self, "vpc_id") @property @@ -674,16 +702,25 @@ def encryption_config(self) -> Optional['pulumi_aws.eks.outputs.ClusterEncryptio @property @pulumi.getter(name="fargateProfile") def fargate_profile(self) -> Optional['pulumi_aws.eks.FargateProfile']: + """ + The Fargate profile used to manage which pods run on Fargate. + """ return pulumi.get(self, "fargate_profile") @property @pulumi.getter def kubeconfig(self) -> Optional[Any]: + """ + The kubeconfig file for the cluster. + """ return pulumi.get(self, "kubeconfig") @property @pulumi.getter(name="nodeSecurityGroupTags") def node_security_group_tags(self) -> Optional[Mapping[str, str]]: + """ + Tags attached to the security groups associated with the cluster's worker nodes. + """ return pulumi.get(self, "node_security_group_tags") @property @@ -694,26 +731,41 @@ def oidc_provider(self) -> Optional['pulumi_aws.iam.OpenIdConnectProvider']: @property @pulumi.getter(name="privateSubnetIds") def private_subnet_ids(self) -> Optional[Sequence[str]]: + """ + List of subnet IDs for the private subnets. + """ return pulumi.get(self, "private_subnet_ids") @property @pulumi.getter(name="publicSubnetIds") def public_subnet_ids(self) -> Optional[Sequence[str]]: + """ + List of subnet IDs for the public subnets. + """ return pulumi.get(self, "public_subnet_ids") @property @pulumi.getter(name="storageClasses") def storage_classes(self) -> Optional[Mapping[str, 'pulumi_kubernetes.storage.v1.StorageClass']]: + """ + The storage class used for persistent storage by the cluster. + """ return pulumi.get(self, "storage_classes") @property @pulumi.getter def tags(self) -> Optional[Mapping[str, str]]: + """ + A map of tags assigned to the EKS cluster. + """ return pulumi.get(self, "tags") @property @pulumi.getter(name="vpcCni") def vpc_cni(self) -> Optional['VpcCni']: + """ + The VPC CNI for the cluster. + """ return pulumi.get(self, "vpc_cni")