Skip to content

Commit 0b89ecc

Browse files
authored
Merge pull request #18 from volcengine/Feat/vke-irsa
Feat/vke irsa
2 parents 60df602 + 1f35e3c commit 0b89ecc

37 files changed

Lines changed: 4826 additions & 1426 deletions

provider/cmd/pulumi-resource-volcengine/schema.json

Lines changed: 336 additions & 5 deletions
Large diffs are not rendered by default.

provider/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/hashicorp/terraform-plugin-sdk v1.9.1
1313
github.com/pulumi/pulumi-terraform-bridge/v3 v3.81.0
1414
github.com/pulumi/pulumi/sdk/v3 v3.113.0
15-
github.com/volcengine/terraform-provider-volcengine v0.0.177
15+
github.com/volcengine/terraform-provider-volcengine v0.0.178
1616
)
1717

1818
require (

provider/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,8 +1795,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21
17951795
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
17961796
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
17971797
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
1798-
github.com/volcengine/terraform-provider-volcengine v0.0.177 h1:6Hr/ODqKDNU34hY3sIKuteyHwsBgDa2xvm/q/GIhwMk=
1799-
github.com/volcengine/terraform-provider-volcengine v0.0.177/go.mod h1:nHE+W7UPw526nvKfFuuUbxRPhzFOmz2Gt37FhaYXYnI=
1798+
github.com/volcengine/terraform-provider-volcengine v0.0.178 h1:J+50K08gTqkSriB4DCJmn2ORqcrBX0x/pLah8IGrZuY=
1799+
github.com/volcengine/terraform-provider-volcengine v0.0.178/go.mod h1:nHE+W7UPw526nvKfFuuUbxRPhzFOmz2Gt37FhaYXYnI=
18001800
github.com/volcengine/volc-sdk-golang v1.0.23 h1:anOslb2Qp6ywnsbyq9jqR0ljuO63kg9PY+4OehIk5R8=
18011801
github.com/volcengine/volc-sdk-golang v1.0.23/go.mod h1:AfG/PZRUkHJ9inETvbjNifTDgut25Wbkm2QoYBTbvyU=
18021802
github.com/volcengine/volcengine-go-sdk v1.0.75 h1:FLNABNe7D5adaul3hLs4Co3oFC4xqIK5+QpKAdW/49Y=

provider/resources.go

Lines changed: 1166 additions & 1166 deletions
Large diffs are not rendered by default.

sdk/dotnet/Vke/Cluster.cs

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ namespace Pulumi.Volcengine.Vke
5252
/// Description = "created by terraform",
5353
/// ProjectName = "default",
5454
/// DeleteProtectionEnabled = false,
55+
/// IrsaEnabled = false,
5556
/// ClusterConfig = new Volcengine.Vke.Inputs.ClusterClusterConfigArgs
5657
/// {
5758
/// SubnetIds = new[]
@@ -106,6 +107,10 @@ namespace Pulumi.Volcengine.Vke
106107
/// var fooNodePool = new Volcengine.Vke.NodePool("fooNodePool", new()
107108
/// {
108109
/// ClusterId = fooCluster.Id,
110+
/// Management = new Volcengine.Vke.Inputs.NodePoolManagementArgs
111+
/// {
112+
/// Enabled = false,
113+
/// },
109114
/// AutoScaling = new Volcengine.Vke.Inputs.NodePoolAutoScalingArgs
110115
/// {
111116
/// Enabled = true,
@@ -292,6 +297,18 @@ public partial class Cluster : global::Pulumi.CustomResource
292297
[Output("eipAllocationId")]
293298
public Output<string> EipAllocationId { get; private set; } = null!;
294299

300+
/// <summary>
301+
/// The IRSA configuration.
302+
/// </summary>
303+
[Output("irsaConfigs")]
304+
public Output<ImmutableArray<Outputs.ClusterIrsaConfig>> IrsaConfigs { get; private set; } = null!;
305+
306+
/// <summary>
307+
/// Whether to enable IRSA for the cluster. This field is valid only when modifying the cluster.
308+
/// </summary>
309+
[Output("irsaEnabled")]
310+
public Output<bool?> IrsaEnabled { get; private set; } = null!;
311+
295312
/// <summary>
296313
/// Kubeconfig data with private network access, returned in BASE64 encoding, it is suggested to use vke_kubeconfig instead.
297314
/// </summary>
@@ -417,6 +434,12 @@ public sealed class ClusterArgs : global::Pulumi.ResourceArgs
417434
[Input("description")]
418435
public Input<string>? Description { get; set; }
419436

437+
/// <summary>
438+
/// Whether to enable IRSA for the cluster. This field is valid only when modifying the cluster.
439+
/// </summary>
440+
[Input("irsaEnabled")]
441+
public Input<bool>? IrsaEnabled { get; set; }
442+
420443
/// <summary>
421444
/// The version of Kubernetes specified when creating a VKE cluster (specified to patch version), with an example value of `1.24`. If not specified, the latest Kubernetes version supported by VKE is used by default, which is a 3-segment version format starting with a lowercase v, that is, KubernetesVersion with IsLatestVersion=True in the return value of ListSupportedVersions.
422445
/// </summary>
@@ -503,6 +526,24 @@ public sealed class ClusterState : global::Pulumi.ResourceArgs
503526
[Input("eipAllocationId")]
504527
public Input<string>? EipAllocationId { get; set; }
505528

529+
[Input("irsaConfigs")]
530+
private InputList<Inputs.ClusterIrsaConfigGetArgs>? _irsaConfigs;
531+
532+
/// <summary>
533+
/// The IRSA configuration.
534+
/// </summary>
535+
public InputList<Inputs.ClusterIrsaConfigGetArgs> IrsaConfigs
536+
{
537+
get => _irsaConfigs ?? (_irsaConfigs = new InputList<Inputs.ClusterIrsaConfigGetArgs>());
538+
set => _irsaConfigs = value;
539+
}
540+
541+
/// <summary>
542+
/// Whether to enable IRSA for the cluster. This field is valid only when modifying the cluster.
543+
/// </summary>
544+
[Input("irsaEnabled")]
545+
public Input<bool>? IrsaEnabled { get; set; }
546+
506547
/// <summary>
507548
/// Kubeconfig data with private network access, returned in BASE64 encoding, it is suggested to use vke_kubeconfig instead.
508549
/// </summary>
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
2+
// *** Do not edit by hand unless you're certain you know what you are doing! ***
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Collections.Immutable;
7+
using System.Threading.Tasks;
8+
using Pulumi.Serialization;
9+
10+
namespace Pulumi.Volcengine.Vke.Inputs
11+
{
12+
13+
public sealed class ClusterIrsaConfigArgs : global::Pulumi.ResourceArgs
14+
{
15+
/// <summary>
16+
/// The audience of the IRSA.
17+
/// </summary>
18+
[Input("audience")]
19+
public Input<string>? Audience { get; set; }
20+
21+
/// <summary>
22+
/// Whether to enable IRSA for the cluster.
23+
/// </summary>
24+
[Input("enabled")]
25+
public Input<bool>? Enabled { get; set; }
26+
27+
/// <summary>
28+
/// The issuer of the IRSA.
29+
/// </summary>
30+
[Input("issuer")]
31+
public Input<string>? Issuer { get; set; }
32+
33+
/// <summary>
34+
/// The JWKS URL of the IRSA.
35+
/// </summary>
36+
[Input("jwksUrl")]
37+
public Input<string>? JwksUrl { get; set; }
38+
39+
/// <summary>
40+
/// The OIDC trn of the IRSA.
41+
/// </summary>
42+
[Input("oidcTrn")]
43+
public Input<string>? OidcTrn { get; set; }
44+
45+
/// <summary>
46+
/// The OpenID Connect configuration URL of the IRSA.
47+
/// </summary>
48+
[Input("openIdConfigUrl")]
49+
public Input<string>? OpenIdConfigUrl { get; set; }
50+
51+
public ClusterIrsaConfigArgs()
52+
{
53+
}
54+
public static new ClusterIrsaConfigArgs Empty => new ClusterIrsaConfigArgs();
55+
}
56+
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
2+
// *** Do not edit by hand unless you're certain you know what you are doing! ***
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Collections.Immutable;
7+
using System.Threading.Tasks;
8+
using Pulumi.Serialization;
9+
10+
namespace Pulumi.Volcengine.Vke.Inputs
11+
{
12+
13+
public sealed class ClusterIrsaConfigGetArgs : global::Pulumi.ResourceArgs
14+
{
15+
/// <summary>
16+
/// The audience of the IRSA.
17+
/// </summary>
18+
[Input("audience")]
19+
public Input<string>? Audience { get; set; }
20+
21+
/// <summary>
22+
/// Whether to enable IRSA for the cluster.
23+
/// </summary>
24+
[Input("enabled")]
25+
public Input<bool>? Enabled { get; set; }
26+
27+
/// <summary>
28+
/// The issuer of the IRSA.
29+
/// </summary>
30+
[Input("issuer")]
31+
public Input<string>? Issuer { get; set; }
32+
33+
/// <summary>
34+
/// The JWKS URL of the IRSA.
35+
/// </summary>
36+
[Input("jwksUrl")]
37+
public Input<string>? JwksUrl { get; set; }
38+
39+
/// <summary>
40+
/// The OIDC trn of the IRSA.
41+
/// </summary>
42+
[Input("oidcTrn")]
43+
public Input<string>? OidcTrn { get; set; }
44+
45+
/// <summary>
46+
/// The OpenID Connect configuration URL of the IRSA.
47+
/// </summary>
48+
[Input("openIdConfigUrl")]
49+
public Input<string>? OpenIdConfigUrl { get; set; }
50+
51+
public ClusterIrsaConfigGetArgs()
52+
{
53+
}
54+
public static new ClusterIrsaConfigGetArgs Empty => new ClusterIrsaConfigGetArgs();
55+
}
56+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
2+
// *** Do not edit by hand unless you're certain you know what you are doing! ***
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Collections.Immutable;
7+
using System.Threading.Tasks;
8+
using Pulumi.Serialization;
9+
10+
namespace Pulumi.Volcengine.Vke.Inputs
11+
{
12+
13+
public sealed class NodePoolManagementArgs : global::Pulumi.ResourceArgs
14+
{
15+
/// <summary>
16+
/// Whether to enable the management function of the node pool. Default is `false`.
17+
/// </summary>
18+
[Input("enabled")]
19+
public Input<bool>? Enabled { get; set; }
20+
21+
/// <summary>
22+
/// The Remedy Config of NodePool. This field is valid when the value of `enabled` is `true`.
23+
/// </summary>
24+
[Input("remedyConfig")]
25+
public Input<Inputs.NodePoolManagementRemedyConfigArgs>? RemedyConfig { get; set; }
26+
27+
public NodePoolManagementArgs()
28+
{
29+
}
30+
public static new NodePoolManagementArgs Empty => new NodePoolManagementArgs();
31+
}
32+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
2+
// *** Do not edit by hand unless you're certain you know what you are doing! ***
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Collections.Immutable;
7+
using System.Threading.Tasks;
8+
using Pulumi.Serialization;
9+
10+
namespace Pulumi.Volcengine.Vke.Inputs
11+
{
12+
13+
public sealed class NodePoolManagementGetArgs : global::Pulumi.ResourceArgs
14+
{
15+
/// <summary>
16+
/// Whether to enable the management function of the node pool. Default is `false`.
17+
/// </summary>
18+
[Input("enabled")]
19+
public Input<bool>? Enabled { get; set; }
20+
21+
/// <summary>
22+
/// The Remedy Config of NodePool. This field is valid when the value of `enabled` is `true`.
23+
/// </summary>
24+
[Input("remedyConfig")]
25+
public Input<Inputs.NodePoolManagementRemedyConfigGetArgs>? RemedyConfig { get; set; }
26+
27+
public NodePoolManagementGetArgs()
28+
{
29+
}
30+
public static new NodePoolManagementGetArgs Empty => new NodePoolManagementGetArgs();
31+
}
32+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
2+
// *** Do not edit by hand unless you're certain you know what you are doing! ***
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Collections.Immutable;
7+
using System.Threading.Tasks;
8+
using Pulumi.Serialization;
9+
10+
namespace Pulumi.Volcengine.Vke.Inputs
11+
{
12+
13+
public sealed class NodePoolManagementRemedyConfigArgs : global::Pulumi.ResourceArgs
14+
{
15+
/// <summary>
16+
/// Whether to enable the remedy function of the node pool. Default is `false`.
17+
/// </summary>
18+
[Input("enabled")]
19+
public Input<bool>? Enabled { get; set; }
20+
21+
/// <summary>
22+
/// The ID of the remedy policy. This field is valid when the value of `enabled` is `true`.
23+
/// </summary>
24+
[Input("id")]
25+
public Input<string>? Id { get; set; }
26+
27+
public NodePoolManagementRemedyConfigArgs()
28+
{
29+
}
30+
public static new NodePoolManagementRemedyConfigArgs Empty => new NodePoolManagementRemedyConfigArgs();
31+
}
32+
}

0 commit comments

Comments
 (0)