Skip to content

Commit

Permalink
Upgrade terraform-provider-rke to v1.3.0 (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkodroff authored May 3, 2022
1 parent f70864b commit 8e5c518
Show file tree
Hide file tree
Showing 14 changed files with 608 additions and 115 deletions.
36 changes: 36 additions & 0 deletions provider/cmd/pulumi-resource-rke/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@
}
}
},
"ignoreProxyEnvVars": {
"type": "boolean",
"description": "Ignore proxy env vars at Bastion Host? Default: `false` (bool)\n",
"language": {
"python": {
"mapCase": false
}
}
},
"port": {
"type": "string",
"description": "Port used for SSH communication (string)\n",
Expand Down Expand Up @@ -2979,6 +2988,33 @@
}
}
},
"httpPort": {
"type": "integer",
"description": "Ingress controller http port (int)\n",
"language": {
"python": {
"mapCase": false
}
}
},
"httpsPort": {
"type": "integer",
"description": "Ingress controller https port (int)\n",
"language": {
"python": {
"mapCase": false
}
}
},
"networkMode": {
"type": "string",
"description": "Networt mode for the ingress controller. `hostNetwork`, `hostPort` and `none` are supported (string)\n",
"language": {
"python": {
"mapCase": false
}
}
},
"nodeSelector": {
"type": "object",
"additionalProperties": {
Expand Down
6 changes: 1 addition & 5 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,4 @@ require (
github.com/rancher/terraform-provider-rke v1.2.2
)

replace (
github.com/rancher/terraform-provider-rke => github.com/pulumi/terraform-provider-rke v1.2.3-0.20211203121652-e3d88620727a
google.golang.org/grpc => google.golang.org/grpc v1.29.1
k8s.io/client-go => k8s.io/client-go v0.20.0
)
replace github.com/rancher/terraform-provider-rke => github.com/pulumi/terraform-provider-rke v1.2.3-0.20220503203333-1a50633ebbbf
375 changes: 266 additions & 109 deletions provider/go.sum

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions sdk/dotnet/Inputs/ClusterBastionHostArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public sealed class ClusterBastionHostArgs : Pulumi.ResourceArgs
[Input("address", required: true)]
public Input<string> Address { get; set; } = null!;

/// <summary>
/// Ignore proxy env vars at Bastion Host? Default: `false` (bool)
/// </summary>
[Input("ignoreProxyEnvVars")]
public Input<bool>? IgnoreProxyEnvVars { get; set; }

/// <summary>
/// Port used for SSH communication (string)
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Inputs/ClusterBastionHostGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public sealed class ClusterBastionHostGetArgs : Pulumi.ResourceArgs
[Input("address", required: true)]
public Input<string> Address { get; set; } = null!;

/// <summary>
/// Ignore proxy env vars at Bastion Host? Default: `false` (bool)
/// </summary>
[Input("ignoreProxyEnvVars")]
public Input<bool>? IgnoreProxyEnvVars { get; set; }

/// <summary>
/// Port used for SSH communication (string)
/// </summary>
Expand Down
18 changes: 18 additions & 0 deletions sdk/dotnet/Inputs/ClusterIngressArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ public InputMap<object> ExtraArgs
set => _extraArgs = value;
}

/// <summary>
/// Ingress controller http port (int)
/// </summary>
[Input("httpPort")]
public Input<int>? HttpPort { get; set; }

/// <summary>
/// Ingress controller https port (int)
/// </summary>
[Input("httpsPort")]
public Input<int>? HttpsPort { get; set; }

/// <summary>
/// Networt mode for the ingress controller. `hostNetwork`, `hostPort` and `none` are supported (string)
/// </summary>
[Input("networkMode")]
public Input<string>? NetworkMode { get; set; }

[Input("nodeSelector")]
private InputMap<object>? _nodeSelector;

Expand Down
18 changes: 18 additions & 0 deletions sdk/dotnet/Inputs/ClusterIngressGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ public InputMap<object> ExtraArgs
set => _extraArgs = value;
}

/// <summary>
/// Ingress controller http port (int)
/// </summary>
[Input("httpPort")]
public Input<int>? HttpPort { get; set; }

/// <summary>
/// Ingress controller https port (int)
/// </summary>
[Input("httpsPort")]
public Input<int>? HttpsPort { get; set; }

/// <summary>
/// Networt mode for the ingress controller. `hostNetwork`, `hostPort` and `none` are supported (string)
/// </summary>
[Input("networkMode")]
public Input<string>? NetworkMode { get; set; }

[Input("nodeSelector")]
private InputMap<object>? _nodeSelector;

Expand Down
7 changes: 7 additions & 0 deletions sdk/dotnet/Outputs/ClusterBastionHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ public sealed class ClusterBastionHost
/// </summary>
public readonly string Address;
/// <summary>
/// Ignore proxy env vars at Bastion Host? Default: `false` (bool)
/// </summary>
public readonly bool? IgnoreProxyEnvVars;
/// <summary>
/// Port used for SSH communication (string)
/// </summary>
public readonly string? Port;
Expand Down Expand Up @@ -50,6 +54,8 @@ public sealed class ClusterBastionHost
private ClusterBastionHost(
string address,

bool? ignoreProxyEnvVars,

string? port,

bool? sshAgentAuth,
Expand All @@ -65,6 +71,7 @@ private ClusterBastionHost(
string user)
{
Address = address;
IgnoreProxyEnvVars = ignoreProxyEnvVars;
Port = port;
SshAgentAuth = sshAgentAuth;
SshCert = sshCert;
Expand Down
21 changes: 21 additions & 0 deletions sdk/dotnet/Outputs/ClusterIngress.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ public sealed class ClusterIngress
/// </summary>
public readonly ImmutableDictionary<string, object>? ExtraArgs;
/// <summary>
/// Ingress controller http port (int)
/// </summary>
public readonly int? HttpPort;
/// <summary>
/// Ingress controller https port (int)
/// </summary>
public readonly int? HttpsPort;
/// <summary>
/// Networt mode for the ingress controller. `hostNetwork`, `hostPort` and `none` are supported (string)
/// </summary>
public readonly string? NetworkMode;
/// <summary>
/// Node selector key pair (map)
/// </summary>
public readonly ImmutableDictionary<string, object>? NodeSelector;
Expand All @@ -43,6 +55,12 @@ private ClusterIngress(

ImmutableDictionary<string, object>? extraArgs,

int? httpPort,

int? httpsPort,

string? networkMode,

ImmutableDictionary<string, object>? nodeSelector,

ImmutableDictionary<string, object>? options,
Expand All @@ -52,6 +70,9 @@ private ClusterIngress(
DefaultBackend = defaultBackend;
DnsPolicy = dnsPolicy;
ExtraArgs = extraArgs;
HttpPort = httpPort;
HttpsPort = httpsPort;
NetworkMode = networkMode;
NodeSelector = nodeSelector;
Options = options;
Provider = provider;
Expand Down
76 changes: 76 additions & 0 deletions sdk/go/rke/pulumiTypes.go

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

16 changes: 16 additions & 0 deletions sdk/nodejs/types/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ export interface ClusterBastionHost {
* Address ip for node (string)
*/
address: pulumi.Input<string>;
/**
* Ignore proxy env vars at Bastion Host? Default: `false` (bool)
*/
ignoreProxyEnvVars?: pulumi.Input<boolean>;
/**
* Port used for SSH communication (string)
*/
Expand Down Expand Up @@ -1212,6 +1216,18 @@ export interface ClusterIngress {
* Extra arguments for scheduler service (map)
*/
extraArgs?: pulumi.Input<{[key: string]: any}>;
/**
* Ingress controller http port (int)
*/
httpPort?: pulumi.Input<number>;
/**
* Ingress controller https port (int)
*/
httpsPort?: pulumi.Input<number>;
/**
* Networt mode for the ingress controller. `hostNetwork`, `hostPort` and `none` are supported (string)
*/
networkMode?: pulumi.Input<string>;
/**
* Node selector key pair (map)
*/
Expand Down
16 changes: 16 additions & 0 deletions sdk/nodejs/types/output.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ export interface ClusterBastionHost {
* Address ip for node (string)
*/
address: string;
/**
* Ignore proxy env vars at Bastion Host? Default: `false` (bool)
*/
ignoreProxyEnvVars?: boolean;
/**
* Port used for SSH communication (string)
*/
Expand Down Expand Up @@ -1212,6 +1216,18 @@ export interface ClusterIngress {
* Extra arguments for scheduler service (map)
*/
extraArgs?: {[key: string]: any};
/**
* Ingress controller http port (int)
*/
httpPort?: number;
/**
* Ingress controller https port (int)
*/
httpsPort?: number;
/**
* Networt mode for the ingress controller. `hostNetwork`, `hostPort` and `none` are supported (string)
*/
networkMode?: string;
/**
* Node selector key pair (map)
*/
Expand Down
Loading

0 comments on commit 8e5c518

Please sign in to comment.