Skip to content

Commit

Permalink
Update to v1.18-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lblackstone committed Mar 17, 2020
1 parent a1ec3fb commit e603062
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PROVIDER := pulumi-resource-${PACK}
CODEGEN := pulumi-gen-${PACK}
VERSION ?= $(shell scripts/get-version)
PYPI_VERSION := $(shell scripts/get-py-version)
KUBE_VERSION ?= v1.18.0-beta.2
KUBE_VERSION ?= v1.18.0-rc.1
SWAGGER_URL ?= https://github.com/kubernetes/kubernetes/raw/${KUBE_VERSION}/api/openapi-spec/swagger.json
OPENAPI_DIR := pkg/gen/openapi-specs
OPENAPI_FILE := ${OPENAPI_DIR}/swagger-${KUBE_VERSION}.json
Expand Down
8 changes: 6 additions & 2 deletions sdk/dotnet/Networking/V1Beta1/IngressClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public partial class IngressClass : KubernetesResource
/// <param name="args">The arguments used to populate this resource's properties</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public IngressClass(string name, Types.Inputs.Networking.V1Beta1.IngressClassArgs? args = null, CustomResourceOptions? options = null)
: base("kubernetes:networking.k8s.io/v1beta1:IngressClass", name, SetAPIKindAndVersion(args), options)
: base("kubernetes:networking.k8s.io/v1beta1:IngressClass", name, SetAPIKindAndVersion(args), MakeOptions(options))
{
}

Expand All @@ -73,6 +73,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Networking.V1Beta1
return args;
}

private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
{
return options;
}

/// <summary>
/// Get an existing IngressClass resource's state with the given name and ID.
/// </summary>
Expand All @@ -84,6 +89,5 @@ public static IngressClass Get(string name, Input<string> id, CustomResourceOpti
return new IngressClass(name, default(Types.Inputs.Networking.V1Beta1.IngressClassArgs),
CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
}

}
}
8 changes: 6 additions & 2 deletions sdk/dotnet/Networking/V1Beta1/IngressClassList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public partial class IngressClassList : KubernetesResource
/// <param name="args">The arguments used to populate this resource's properties</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public IngressClassList(string name, Types.Inputs.Networking.V1Beta1.IngressClassListArgs? args = null, CustomResourceOptions? options = null)
: base("kubernetes:networking.k8s.io/v1beta1:IngressClassList", name, SetAPIKindAndVersion(args), options)
: base("kubernetes:networking.k8s.io/v1beta1:IngressClassList", name, SetAPIKindAndVersion(args), MakeOptions(options))
{
}

Expand All @@ -67,6 +67,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Networking.V1Beta1
return args;
}

private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
{
return options;
}

/// <summary>
/// Get an existing IngressClassList resource's state with the given name and ID.
/// </summary>
Expand All @@ -78,6 +83,5 @@ public static IngressClassList Get(string name, Input<string> id, CustomResource
return new IngressClassList(name, default(Types.Inputs.Networking.V1Beta1.IngressClassListArgs),
CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
}

}
}
16 changes: 14 additions & 2 deletions sdk/dotnet/Storage/V1/CSIDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public partial class CSIDriver : KubernetesResource
/// <param name="args">The arguments used to populate this resource's properties</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public CSIDriver(string name, Types.Inputs.Storage.V1.CSIDriverArgs? args = null, CustomResourceOptions? options = null)
: base("kubernetes:storage.k8s.io/v1:CSIDriver", name, SetAPIKindAndVersion(args), options)
: base("kubernetes:storage.k8s.io/v1:CSIDriver", name, SetAPIKindAndVersion(args), MakeOptions(options))
{
}

Expand All @@ -75,6 +75,19 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Storage.V1.CSIDriv
return args;
}

private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
{
var extraOptions = new CustomResourceOptions
{
Aliases =
{
new Alias { Type = "kubernetes:storage.k8s.io/v1beta1:CSIDriver" },
}
};

return CustomResourceOptions.Merge(options, extraOptions);
}

/// <summary>
/// Get an existing CSIDriver resource's state with the given name and ID.
/// </summary>
Expand All @@ -86,6 +99,5 @@ public static CSIDriver Get(string name, Input<string> id, CustomResourceOptions
return new CSIDriver(name, default(Types.Inputs.Storage.V1.CSIDriverArgs),
CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
}

}
}
8 changes: 6 additions & 2 deletions sdk/dotnet/Storage/V1/CSIDriverList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public partial class CSIDriverList : KubernetesResource
/// <param name="args">The arguments used to populate this resource's properties</param>
/// <param name="options">A bag of options that control this resource's behavior</param>
public CSIDriverList(string name, Types.Inputs.Storage.V1.CSIDriverListArgs? args = null, CustomResourceOptions? options = null)
: base("kubernetes:storage.k8s.io/v1:CSIDriverList", name, SetAPIKindAndVersion(args), options)
: base("kubernetes:storage.k8s.io/v1:CSIDriverList", name, SetAPIKindAndVersion(args), MakeOptions(options))
{
}

Expand All @@ -68,6 +68,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Storage.V1.CSIDriv
return args;
}

private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
{
return options;
}

/// <summary>
/// Get an existing CSIDriverList resource's state with the given name and ID.
/// </summary>
Expand All @@ -79,6 +84,5 @@ public static CSIDriverList Get(string name, Input<string> id, CustomResourceOpt
return new CSIDriverList(name, default(Types.Inputs.Storage.V1.CSIDriverListArgs),
CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
}

}
}
10 changes: 9 additions & 1 deletion sdk/dotnet/Storage/V1Beta1/CSIDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,15 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Storage.V1Beta1.CS

private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
{
return options;
var extraOptions = new CustomResourceOptions
{
Aliases =
{
new Alias { Type = "kubernetes:storage.k8s.io/v1:CSIDriver" },
}
};

return CustomResourceOptions.Merge(options, extraOptions);
}

/// <summary>
Expand Down
4 changes: 1 addition & 3 deletions sdk/dotnet/Types/Input.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25293,10 +25293,8 @@ public class IngressClassSpecArgs : Pulumi.ResourceArgs
public Input<string>? Controller { get; set; }

/// <summary>
/// Parameters is a link to a resource containing additional configuration for the
/// Parameters is a link to a custom resource containing additional configuration for the
/// controller. This is optional if the controller does not require extra parameters.
/// Example configuration resources include `core.ConfigMap` or a controller specific Custom
/// Resource.
/// </summary>
[Input("parameters")]
public Input<Core.V1.TypedLocalObjectReferenceArgs>? Parameters { get; set; }
Expand Down
4 changes: 1 addition & 3 deletions sdk/dotnet/Types/Output.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28740,10 +28740,8 @@ public sealed class IngressClassSpec
public readonly string Controller;

/// <summary>
/// Parameters is a link to a resource containing additional configuration for the
/// Parameters is a link to a custom resource containing additional configuration for the
/// controller. This is optional if the controller does not require extra parameters.
/// Example configuration resources include `core.ConfigMap` or a controller specific Custom
/// Resource.
/// </summary>
public readonly Core.V1.TypedLocalObjectReference Parameters;

Expand Down
5 changes: 2 additions & 3 deletions sdk/nodejs/types/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20872,9 +20872,8 @@ export namespace networking {
controller?: pulumi.Input<string>

/**
* Parameters is a link to a resource containing additional configuration for the controller.
* This is optional if the controller does not require extra parameters. Example configuration
* resources include `core.ConfigMap` or a controller specific Custom Resource.
* Parameters is a link to a custom resource containing additional configuration for the
* controller. This is optional if the controller does not require extra parameters.
*/
parameters?: pulumi.Input<core.v1.TypedLocalObjectReference>

Expand Down
5 changes: 2 additions & 3 deletions sdk/nodejs/types/output.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20181,9 +20181,8 @@ export namespace networking {
readonly controller: string

/**
* Parameters is a link to a resource containing additional configuration for the controller.
* This is optional if the controller does not require extra parameters. Example configuration
* resources include `core.ConfigMap` or a controller specific Custom Resource.
* Parameters is a link to a custom resource containing additional configuration for the
* controller. This is optional if the controller does not require extra parameters.
*/
readonly parameters: core.v1.TypedLocalObjectReference

Expand Down

0 comments on commit e603062

Please sign in to comment.